diff --git a/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.html b/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.html
index fd0a7de51..7c83f1191 100644
--- a/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.html
+++ b/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.html
@@ -26,108 +26,97 @@
18 package org.owasp.dependencycheck.taskdefs;
19
20 import java.io.File;
-21 import static junit.framework.TestCase.assertTrue;
-22 import org.apache.tools.ant.BuildFileTest;
-23 import org.junit.After;
-24 import org.junit.AfterClass;
-25 import org.junit.Before;
-26 import org.junit.BeforeClass;
-27 import org.junit.Test;
-28 import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase;
-29
-30
-31
-32
-33
-34 public class DependencyCheckTaskTest extends BuildFileTest {
-35
-36 public DependencyCheckTaskTest () {
-37 }
-38
-39 @BeforeClass
-40 public static void setUpClass() {
+21 import org.apache.tools.ant.BuildFileTest;
+22 import org.junit.After;
+23 import org.junit.Before;
+24 import org.junit.Test;
+25 import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase;
+26 import org.owasp.dependencycheck.utils.Settings;
+27
+28
+29
+30
+31
+32 public class DependencyCheckTaskTest extends BuildFileTest {
+33
+34 @Before
+35 @Override
+36 public void setUp() throws Exception {
+37 Settings.initialize();
+38 BaseDBTestCase.ensureDBExists();
+39 final String buildFile = this .getClass().getClassLoader().getResource("build.xml" ).getPath();
+40 configureProject(buildFile);
41 }
42
-43 @AfterClass
-44 public static void tearDownClass() {
-45 }
-46
-47 @Before
-48 @Override
-49 public void setUp() throws Exception {
-50 BaseDBTestCase.ensureDBExists();
-51 final String buildFile = this .getClass().getClassLoader().getResource("build.xml" ).getPath();
-52 configureProject(buildFile);
-53 }
-54
-55 @After
-56 @Override
-57 public void tearDown() {
-58
-59
-60 }
-61
-62
-63
-64
-65 @Test
-66 public void testAddFileSet() throws Exception {
-67 File report = new File("target/dependency-check-report.html" );
-68 if (report.exists()) {
-69 if (!report.delete()) {
-70 throw new Exception("Unable to delete 'target/DependencyCheck-Report.html' prior to test." );
-71 }
-72 }
-73 executeTarget("test.fileset" );
-74
-75 assertTrue("DependencyCheck report was not generated" , report.exists());
-76
-77 }
-78
-79
-80
-81
-82
-83
-84 @Test
-85 public void testAddFileList() throws Exception {
-86 File report = new File("target/dependency-check-report.xml" );
-87 if (report.exists()) {
-88 if (!report.delete()) {
-89 throw new Exception("Unable to delete 'target/DependencyCheck-Report.xml' prior to test." );
-90 }
-91 }
-92 executeTarget("test.filelist" );
-93
-94 assertTrue("DependencyCheck report was not generated" , report.exists());
-95 }
-96
-97
-98
-99
-100
-101
-102 @Test
-103 public void testAddDirSet() throws Exception {
-104 File report = new File("target/dependency-check-vulnerability.html" );
-105 if (report.exists()) {
-106 if (!report.delete()) {
-107 throw new Exception("Unable to delete 'target/DependencyCheck-Vulnerability.html' prior to test." );
-108 }
-109 }
-110 executeTarget("test.dirset" );
-111 assertTrue("DependencyCheck report was not generated" , report.exists());
-112 }
-113
-114
-115
-116
-117 @Test
-118 public void testGetFailBuildOnCVSS() {
-119 expectBuildException("failCVSS" , "asdfasdfscore" );
-120 System.out.println(this .getOutput());
-121 }
-122 }
+43 @After
+44 @Override
+45 public void tearDown() {
+46
+47
+48 Settings.cleanup();
+49 }
+50
+51
+52
+53
+54 @Test
+55 public void testAddFileSet() throws Exception {
+56 File report = new File("target/dependency-check-report.html" );
+57 if (report.exists()) {
+58 if (!report.delete()) {
+59 throw new Exception("Unable to delete 'target/DependencyCheck-Report.html' prior to test." );
+60 }
+61 }
+62 executeTarget("test.fileset" );
+63
+64 assertTrue("DependencyCheck report was not generated" , report.exists());
+65
+66 }
+67
+68
+69
+70
+71
+72
+73 @Test
+74 public void testAddFileList() throws Exception {
+75 File report = new File("target/dependency-check-report.xml" );
+76 if (report.exists()) {
+77 if (!report.delete()) {
+78 throw new Exception("Unable to delete 'target/DependencyCheck-Report.xml' prior to test." );
+79 }
+80 }
+81 executeTarget("test.filelist" );
+82
+83 assertTrue("DependencyCheck report was not generated" , report.exists());
+84 }
+85
+86
+87
+88
+89
+90
+91 @Test
+92 public void testAddDirSet() throws Exception {
+93 File report = new File("target/dependency-check-vulnerability.html" );
+94 if (report.exists()) {
+95 if (!report.delete()) {
+96 throw new Exception("Unable to delete 'target/DependencyCheck-Vulnerability.html' prior to test." );
+97 }
+98 }
+99 executeTarget("test.dirset" );
+100 assertTrue("DependencyCheck report was not generated" , report.exists());
+101 }
+102
+103
+104
+105
+106 @Test
+107 public void testGetFailBuildOnCVSS() {
+108 expectBuildException("failCVSS" , "asdfasdfscore" );
+109 System.out.println(this .getOutput());
+110 }
+111 }
Dependency-Check Ant Task 1.1.4 Reference Package org.owasp.dependencycheck.taskdefs
+ Dependency-Check Ant Task 1.2.0 Reference Package org.owasp.dependencycheck.taskdefs
Dependency-Check Ant Task 1.1.4 Reference Package org.owasp.dependencycheck.taskdefs
+ Dependency-Check Ant Task 1.2.0 Reference Package org.owasp.dependencycheck.taskdefs
Dependency-Check Ant Task 1.1.4 Reference
+ Dependency-Check Ant Task 1.2.0 Reference
Dependency-Check Ant Task 1.1.4 Reference
+ Dependency-Check Ant Task 1.2.0 Reference
Dependency-Check Ant Task 1.1.4 Reference
+ Dependency-Check Ant Task 1.2.0 Reference
diff --git a/dependency-check-ant/xref/index.html b/dependency-check-ant/xref/index.html
index 477f86fc3..8c3abdb04 100644
--- a/dependency-check-ant/xref/index.html
+++ b/dependency-check-ant/xref/index.html
@@ -4,7 +4,7 @@
Dependency-Check Ant Task 1.1.4 Reference
+ Dependency-Check Ant Task 1.2.0 Reference
diff --git a/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html b/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html
index 53028c1eb..56da81a43 100644
--- a/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html
+++ b/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html
@@ -70,1082 +70,1085 @@
62
63
64 private static final String NEW_LINE = System.getProperty("line.separator" , "\n" ).intern();
-65
-66
-67
-68
-69 public DependencyCheckTask () {
-70 super ();
-71 }
-72
-73
-74
-75
-76
-77 private Resources path = null ;
+65
+66
+67
+68 private static final Logger LOGGER = Logger.getLogger(DependencyCheckTask.class .getName());
+69
+70
+71
+72
+73 public DependencyCheckTask () {
+74 super ();
+75 }
+76
+77
78
-79
+79
80
-81 private Reference refid = null ;
-82
-83
-84
-85
-86
-87
-88
-89 public void add(ResourceCollection rc) {
-90 if (isReference()) {
-91 throw new BuildException("Nested elements are not allowed when using the refid attribute." );
-92 }
-93 getPath().add(rc);
-94 }
-95
-96
-97
-98
-99
-100
-101
-102 private synchronized Resources getPath() {
-103 if (path == null ) {
-104 path = new Resources(getProject());
-105 path.setCache(true );
-106 }
-107 return path;
-108 }
-109
-110
-111
-112
-113
-114
-115 public boolean isReference() {
-116 return refid != null ;
-117 }
-118
-119
-120
-121
-122
-123
-124 public void setRefid(Reference r) {
-125 if (path != null ) {
-126 throw new BuildException("Nested elements are not allowed when using the refid attribute." );
-127 }
-128 refid = r;
-129 }
-130
-131
-132
-133
-134
-135
-136 private void dealWithReferences() throws BuildException {
-137 if (isReference()) {
-138 final Object o = refid.getReferencedObject(getProject());
-139 if (!(o instanceof ResourceCollection)) {
-140 throw new BuildException("refid '" + refid.getRefId()
-141 + "' does not refer to a resource collection." );
-142 }
-143 getPath().add((ResourceCollection) o);
-144 }
-145 }
-146
-147
-148
-149
-150 private String applicationName = "Dependency-Check" ;
-151
-152
-153
-154
-155
-156
-157 public String getApplicationName() {
-158 return applicationName;
-159 }
-160
-161
-162
-163
-164
-165
-166 public void setApplicationName(String applicationName) {
-167 this .applicationName = applicationName;
-168 }
-169
-170
-171
-172 private String dataDirectory = null ;
-173
-174
-175
-176
-177
-178
-179 public String getDataDirectory() {
-180 return dataDirectory;
-181 }
-182
-183
-184
-185
-186
-187
-188 public void setDataDirectory(String dataDirectory) {
-189 this .dataDirectory = dataDirectory;
-190 }
-191
-192
-193
-194 private String reportOutputDirectory = "." ;
-195
-196
-197
-198
-199
-200
-201 public String getReportOutputDirectory() {
-202 return reportOutputDirectory;
-203 }
-204
-205
-206
-207
-208
-209
-210 public void setReportOutputDirectory(String reportOutputDirectory) {
-211 this .reportOutputDirectory = reportOutputDirectory;
-212 }
-213
-214
-215
-216
-217
-218 private float failBuildOnCVSS = 11;
-219
-220
-221
-222
-223
-224
-225 public float getFailBuildOnCVSS() {
-226 return failBuildOnCVSS;
-227 }
-228
-229
-230
-231
-232
-233
-234 public void setFailBuildOnCVSS(float failBuildOnCVSS) {
-235 this .failBuildOnCVSS = failBuildOnCVSS;
-236 }
-237
-238
-239
-240
-241 private boolean autoUpdate = true ;
-242
-243
-244
-245
-246
-247
-248 public boolean isAutoUpdate() {
-249 return autoUpdate;
-250 }
-251
-252
-253
-254
-255
-256
-257 public void setAutoUpdate(boolean autoUpdate) {
-258 this .autoUpdate = autoUpdate;
-259 }
-260
-261
-262
-263
-264 private String reportFormat = "HTML" ;
-265
-266
-267
-268
-269
-270
-271 public String getReportFormat() {
-272 return reportFormat;
-273 }
-274
-275
-276
-277
-278
-279
-280 public void setReportFormat(ReportFormats reportFormat) {
-281 this .reportFormat = reportFormat.getValue();
-282 }
-283
-284
-285
-286 private String proxyUrl;
-287
-288
-289
-290
-291
-292
-293 public String getProxyUrl() {
-294 return proxyUrl;
-295 }
-296
-297
-298
-299
-300
-301
-302 public void setProxyUrl(String proxyUrl) {
-303 this .proxyUrl = proxyUrl;
-304 }
-305
-306
-307
-308 private String proxyPort;
-309
-310
-311
-312
-313
-314
-315 public String getProxyPort() {
-316 return proxyPort;
-317 }
-318
-319
-320
-321
-322
-323
-324 public void setProxyPort(String proxyPort) {
-325 this .proxyPort = proxyPort;
-326 }
-327
-328
-329
-330 private String proxyUsername;
-331
-332
-333
-334
-335
-336
-337 public String getProxyUsername() {
-338 return proxyUsername;
-339 }
-340
-341
-342
-343
-344
-345
-346 public void setProxyUsername(String proxyUsername) {
-347 this .proxyUsername = proxyUsername;
-348 }
-349
-350
-351
-352 private String proxyPassword;
-353
-354
-355
-356
-357
-358
-359 public String getProxyPassword() {
-360 return proxyPassword;
-361 }
-362
-363
-364
-365
-366
-367
-368 public void setProxyPassword(String proxyPassword) {
-369 this .proxyPassword = proxyPassword;
-370 }
-371
-372
-373
-374 private String connectionTimeout;
-375
-376
-377
-378
-379
-380
-381 public String getConnectionTimeout() {
-382 return connectionTimeout;
-383 }
-384
-385
-386
-387
-388
-389
-390 public void setConnectionTimeout(String connectionTimeout) {
-391 this .connectionTimeout = connectionTimeout;
-392 }
-393
-394
-395
-396 private String logFile = null ;
-397
-398
-399
-400
-401
-402
-403 public String getLogFile() {
-404 return logFile;
-405 }
-406
-407
-408
-409
-410
-411
-412 public void setLogFile(String logFile) {
-413 this .logFile = logFile;
-414 }
-415
-416
-417
-418 private String suppressionFile;
-419
-420
-421
-422
-423
-424
-425 public String getSuppressionFile() {
-426 return suppressionFile;
-427 }
-428
-429
-430
-431
-432
-433
-434 public void setSuppressionFile(String suppressionFile) {
-435 this .suppressionFile = suppressionFile;
-436 }
-437
-438
-439
-440 private boolean showSummary = true ;
-441
-442
-443
-444
-445
-446
-447 public boolean isShowSummary() {
-448 return showSummary;
-449 }
-450
-451
-452
-453
-454
-455
-456 public void setShowSummary(boolean showSummary) {
-457 this .showSummary = showSummary;
-458 }
-459
-460
-461
-462
-463
-464
-465 public void setJarAnalyzerEnabled(boolean jarAnalyzerEnabled) {
-466 this .jarAnalyzerEnabled = jarAnalyzerEnabled;
-467 }
-468
-469
-470
-471 private boolean archiveAnalyzerEnabled = true ;
-472
-473
-474
-475
-476
-477
-478 public boolean isArchiveAnalyzerEnabled() {
-479 return archiveAnalyzerEnabled;
-480 }
-481
-482
-483
-484 private boolean assemblyAnalyzerEnabled = true ;
-485
-486
-487
-488
-489
-490
-491 public void setArchiveAnalyzerEnabled(boolean archiveAnalyzerEnabled) {
-492 this .archiveAnalyzerEnabled = archiveAnalyzerEnabled;
-493 }
-494
-495
-496
-497
-498
-499
-500 public boolean isAssemblyAnalyzerEnabled() {
-501 return assemblyAnalyzerEnabled;
-502 }
-503
-504
-505
-506
-507
-508
-509 public void setAssemblyAnalyzerEnabled(boolean assemblyAnalyzerEnabled) {
-510 this .assemblyAnalyzerEnabled = assemblyAnalyzerEnabled;
-511 }
-512
-513
-514
-515 private boolean nuspecAnalyzerEnabled = true ;
-516
-517
-518
-519
-520
-521
-522 public boolean isNuspecAnalyzerEnabled() {
-523 return nuspecAnalyzerEnabled;
-524 }
-525
-526
-527
-528
-529
-530
-531 public void setNuspecAnalyzerEnabled(boolean nuspecAnalyzerEnabled) {
-532 this .nuspecAnalyzerEnabled = nuspecAnalyzerEnabled;
-533 }
-534
-535
-536
-537
-538 private boolean nexusAnalyzerEnabled = true ;
-539
-540
-541
-542
-543
-544
-545 public boolean isNexusAnalyzerEnabled() {
-546 return nexusAnalyzerEnabled;
-547 }
-548
-549
-550
-551
-552
-553
-554 public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
-555 this .nexusAnalyzerEnabled = nexusAnalyzerEnabled;
-556 }
-557
-558
-559
-560
-561 private String nexusUrl;
-562
-563
-564
-565
-566
-567
-568 public String getNexusUrl() {
-569 return nexusUrl;
-570 }
-571
-572
-573
-574
-575
-576
-577 public void setNexusUrl(String nexusUrl) {
-578 this .nexusUrl = nexusUrl;
-579 }
-580
-581
-582
-583 private boolean nexusUsesProxy = true ;
-584
-585
-586
-587
-588
-589
-590 public boolean isNexusUsesProxy() {
-591 return nexusUsesProxy;
-592 }
-593
-594
-595
-596
-597
-598
-599 public void setNexusUsesProxy(boolean nexusUsesProxy) {
-600 this .nexusUsesProxy = nexusUsesProxy;
-601 }
-602
-603
-604
-605
-606 private String databaseDriverName;
-607
-608
-609
-610
-611
-612
-613 public String getDatabaseDriverName() {
-614 return databaseDriverName;
-615 }
-616
-617
-618
-619
-620
-621
-622 public void setDatabaseDriverName(String databaseDriverName) {
-623 this .databaseDriverName = databaseDriverName;
-624 }
-625
-626
-627
-628
-629 private String databaseDriverPath;
-630
-631
-632
-633
-634
-635
-636 public String getDatabaseDriverPath() {
-637 return databaseDriverPath;
-638 }
-639
-640
-641
-642
-643
-644
-645 public void setDatabaseDriverPath(String databaseDriverPath) {
-646 this .databaseDriverPath = databaseDriverPath;
-647 }
-648
-649
-650
-651 private String connectionString;
-652
-653
-654
-655
-656
-657
-658 public String getConnectionString() {
-659 return connectionString;
-660 }
-661
-662
-663
-664
-665
-666
-667 public void setConnectionString(String connectionString) {
-668 this .connectionString = connectionString;
-669 }
-670
-671
-672
-673 private String databaseUser;
-674
-675
-676
-677
-678
-679
-680 public String getDatabaseUser() {
-681 return databaseUser;
-682 }
-683
-684
-685
-686
-687
-688
-689 public void setDatabaseUser(String databaseUser) {
-690 this .databaseUser = databaseUser;
-691 }
-692
-693
-694
-695
-696 private String databasePassword;
-697
-698
-699
-700
-701
-702
-703 public String getDatabasePassword() {
-704 return databasePassword;
-705 }
-706
-707
-708
-709
-710
-711
-712 public void setDatabasePassword(String databasePassword) {
-713 this .databasePassword = databasePassword;
-714 }
-715
-716
-717
-718
-719
-720 private String zipExtensions;
-721
-722
-723
-724
-725
-726
-727 public String getZipExtensions() {
-728 return zipExtensions;
-729 }
-730
-731
-732
-733
-734
-735
-736 public void setZipExtensions(String zipExtensions) {
-737 this .zipExtensions = zipExtensions;
-738 }
-739
-740
-741
-742
-743 private String cveUrl12Modified;
-744
-745
-746
-747
-748
-749
-750 public String getCveUrl12Modified() {
-751 return cveUrl12Modified;
-752 }
-753
-754
-755
-756
-757
-758
-759 public void setCveUrl12Modified(String cveUrl12Modified) {
-760 this .cveUrl12Modified = cveUrl12Modified;
-761 }
-762
-763
-764
-765
-766 private String cveUrl20Modified;
-767
-768
-769
-770
-771
-772
-773 public String getCveUrl20Modified() {
-774 return cveUrl20Modified;
-775 }
-776
-777
-778
-779
-780
-781
-782 public void setCveUrl20Modified(String cveUrl20Modified) {
-783 this .cveUrl20Modified = cveUrl20Modified;
-784 }
-785
-786
-787
-788
-789 private String cveUrl12Base;
-790
-791
-792
-793
-794
-795
-796 public String getCveUrl12Base() {
-797 return cveUrl12Base;
-798 }
-799
-800
-801
-802
-803
-804
-805 public void setCveUrl12Base(String cveUrl12Base) {
-806 this .cveUrl12Base = cveUrl12Base;
-807 }
-808
-809
-810
-811
-812 private String cveUrl20Base;
-813
-814
-815
-816
-817
-818
-819 public String getCveUrl20Base() {
-820 return cveUrl20Base;
-821 }
-822
-823
-824
-825
-826
-827
-828 public void setCveUrl20Base(String cveUrl20Base) {
-829 this .cveUrl20Base = cveUrl20Base;
-830 }
-831
-832
-833
-834 private String pathToMono;
-835
-836
-837
-838
-839
-840
-841 public String getPathToMono() {
-842 return pathToMono;
-843 }
-844
-845
-846
-847
-848
-849
-850 public void setPathToMono(String pathToMono) {
-851 this .pathToMono = pathToMono;
-852 }
-853
-854 @Override
-855 public void execute() throws BuildException {
-856 final InputStream in = DependencyCheckTask.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
-857 LogUtils.prepareLogger(in, logFile);
-858
-859 dealWithReferences();
-860 validateConfiguration();
-861 populateSettings();
+81 private Resources path = null ;
+82
+83
+84
+85 private Reference refid = null ;
+86
+87
+88
+89
+90
+91
+92
+93 public void add(ResourceCollection rc) {
+94 if (isReference()) {
+95 throw new BuildException("Nested elements are not allowed when using the refid attribute." );
+96 }
+97 getPath().add(rc);
+98 }
+99
+100
+101
+102
+103
+104
+105
+106 private synchronized Resources getPath() {
+107 if (path == null ) {
+108 path = new Resources(getProject());
+109 path.setCache(true );
+110 }
+111 return path;
+112 }
+113
+114
+115
+116
+117
+118
+119 public boolean isReference() {
+120 return refid != null ;
+121 }
+122
+123
+124
+125
+126
+127
+128 public void setRefid(Reference r) {
+129 if (path != null ) {
+130 throw new BuildException("Nested elements are not allowed when using the refid attribute." );
+131 }
+132 refid = r;
+133 }
+134
+135
+136
+137
+138
+139
+140 private void dealWithReferences() throws BuildException {
+141 if (isReference()) {
+142 final Object o = refid.getReferencedObject(getProject());
+143 if (!(o instanceof ResourceCollection)) {
+144 throw new BuildException("refid '" + refid.getRefId()
+145 + "' does not refer to a resource collection." );
+146 }
+147 getPath().add((ResourceCollection) o);
+148 }
+149 }
+150
+151
+152
+153
+154 private String applicationName = "Dependency-Check" ;
+155
+156
+157
+158
+159
+160
+161 public String getApplicationName() {
+162 return applicationName;
+163 }
+164
+165
+166
+167
+168
+169
+170 public void setApplicationName(String applicationName) {
+171 this .applicationName = applicationName;
+172 }
+173
+174
+175
+176 private String dataDirectory = null ;
+177
+178
+179
+180
+181
+182
+183 public String getDataDirectory() {
+184 return dataDirectory;
+185 }
+186
+187
+188
+189
+190
+191
+192 public void setDataDirectory(String dataDirectory) {
+193 this .dataDirectory = dataDirectory;
+194 }
+195
+196
+197
+198 private String reportOutputDirectory = "." ;
+199
+200
+201
+202
+203
+204
+205 public String getReportOutputDirectory() {
+206 return reportOutputDirectory;
+207 }
+208
+209
+210
+211
+212
+213
+214 public void setReportOutputDirectory(String reportOutputDirectory) {
+215 this .reportOutputDirectory = reportOutputDirectory;
+216 }
+217
+218
+219
+220
+221
+222 private float failBuildOnCVSS = 11;
+223
+224
+225
+226
+227
+228
+229 public float getFailBuildOnCVSS() {
+230 return failBuildOnCVSS;
+231 }
+232
+233
+234
+235
+236
+237
+238 public void setFailBuildOnCVSS(float failBuildOnCVSS) {
+239 this .failBuildOnCVSS = failBuildOnCVSS;
+240 }
+241
+242
+243
+244
+245 private boolean autoUpdate = true ;
+246
+247
+248
+249
+250
+251
+252 public boolean isAutoUpdate() {
+253 return autoUpdate;
+254 }
+255
+256
+257
+258
+259
+260
+261 public void setAutoUpdate(boolean autoUpdate) {
+262 this .autoUpdate = autoUpdate;
+263 }
+264
+265
+266
+267
+268 private String reportFormat = "HTML" ;
+269
+270
+271
+272
+273
+274
+275 public String getReportFormat() {
+276 return reportFormat;
+277 }
+278
+279
+280
+281
+282
+283
+284 public void setReportFormat(ReportFormats reportFormat) {
+285 this .reportFormat = reportFormat.getValue();
+286 }
+287
+288
+289
+290 private String proxyUrl;
+291
+292
+293
+294
+295
+296
+297 public String getProxyUrl() {
+298 return proxyUrl;
+299 }
+300
+301
+302
+303
+304
+305
+306 public void setProxyUrl(String proxyUrl) {
+307 this .proxyUrl = proxyUrl;
+308 }
+309
+310
+311
+312 private String proxyPort;
+313
+314
+315
+316
+317
+318
+319 public String getProxyPort() {
+320 return proxyPort;
+321 }
+322
+323
+324
+325
+326
+327
+328 public void setProxyPort(String proxyPort) {
+329 this .proxyPort = proxyPort;
+330 }
+331
+332
+333
+334 private String proxyUsername;
+335
+336
+337
+338
+339
+340
+341 public String getProxyUsername() {
+342 return proxyUsername;
+343 }
+344
+345
+346
+347
+348
+349
+350 public void setProxyUsername(String proxyUsername) {
+351 this .proxyUsername = proxyUsername;
+352 }
+353
+354
+355
+356 private String proxyPassword;
+357
+358
+359
+360
+361
+362
+363 public String getProxyPassword() {
+364 return proxyPassword;
+365 }
+366
+367
+368
+369
+370
+371
+372 public void setProxyPassword(String proxyPassword) {
+373 this .proxyPassword = proxyPassword;
+374 }
+375
+376
+377
+378 private String connectionTimeout;
+379
+380
+381
+382
+383
+384
+385 public String getConnectionTimeout() {
+386 return connectionTimeout;
+387 }
+388
+389
+390
+391
+392
+393
+394 public void setConnectionTimeout(String connectionTimeout) {
+395 this .connectionTimeout = connectionTimeout;
+396 }
+397
+398
+399
+400 private String logFile = null ;
+401
+402
+403
+404
+405
+406
+407 public String getLogFile() {
+408 return logFile;
+409 }
+410
+411
+412
+413
+414
+415
+416 public void setLogFile(String logFile) {
+417 this .logFile = logFile;
+418 }
+419
+420
+421
+422 private String suppressionFile;
+423
+424
+425
+426
+427
+428
+429 public String getSuppressionFile() {
+430 return suppressionFile;
+431 }
+432
+433
+434
+435
+436
+437
+438 public void setSuppressionFile(String suppressionFile) {
+439 this .suppressionFile = suppressionFile;
+440 }
+441
+442
+443
+444 private boolean showSummary = true ;
+445
+446
+447
+448
+449
+450
+451 public boolean isShowSummary() {
+452 return showSummary;
+453 }
+454
+455
+456
+457
+458
+459
+460 public void setShowSummary(boolean showSummary) {
+461 this .showSummary = showSummary;
+462 }
+463
+464
+465
+466
+467
+468
+469 public void setJarAnalyzerEnabled(boolean jarAnalyzerEnabled) {
+470 this .jarAnalyzerEnabled = jarAnalyzerEnabled;
+471 }
+472
+473
+474
+475 private boolean archiveAnalyzerEnabled = true ;
+476
+477
+478
+479
+480
+481
+482 public boolean isArchiveAnalyzerEnabled() {
+483 return archiveAnalyzerEnabled;
+484 }
+485
+486
+487
+488 private boolean assemblyAnalyzerEnabled = true ;
+489
+490
+491
+492
+493
+494
+495 public void setArchiveAnalyzerEnabled(boolean archiveAnalyzerEnabled) {
+496 this .archiveAnalyzerEnabled = archiveAnalyzerEnabled;
+497 }
+498
+499
+500
+501
+502
+503
+504 public boolean isAssemblyAnalyzerEnabled() {
+505 return assemblyAnalyzerEnabled;
+506 }
+507
+508
+509
+510
+511
+512
+513 public void setAssemblyAnalyzerEnabled(boolean assemblyAnalyzerEnabled) {
+514 this .assemblyAnalyzerEnabled = assemblyAnalyzerEnabled;
+515 }
+516
+517
+518
+519 private boolean nuspecAnalyzerEnabled = true ;
+520
+521
+522
+523
+524
+525
+526 public boolean isNuspecAnalyzerEnabled() {
+527 return nuspecAnalyzerEnabled;
+528 }
+529
+530
+531
+532
+533
+534
+535 public void setNuspecAnalyzerEnabled(boolean nuspecAnalyzerEnabled) {
+536 this .nuspecAnalyzerEnabled = nuspecAnalyzerEnabled;
+537 }
+538
+539
+540
+541
+542 private boolean nexusAnalyzerEnabled = true ;
+543
+544
+545
+546
+547
+548
+549 public boolean isNexusAnalyzerEnabled() {
+550 return nexusAnalyzerEnabled;
+551 }
+552
+553
+554
+555
+556
+557
+558 public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
+559 this .nexusAnalyzerEnabled = nexusAnalyzerEnabled;
+560 }
+561
+562
+563
+564
+565 private String nexusUrl;
+566
+567
+568
+569
+570
+571
+572 public String getNexusUrl() {
+573 return nexusUrl;
+574 }
+575
+576
+577
+578
+579
+580
+581 public void setNexusUrl(String nexusUrl) {
+582 this .nexusUrl = nexusUrl;
+583 }
+584
+585
+586
+587 private boolean nexusUsesProxy = true ;
+588
+589
+590
+591
+592
+593
+594 public boolean isNexusUsesProxy() {
+595 return nexusUsesProxy;
+596 }
+597
+598
+599
+600
+601
+602
+603 public void setNexusUsesProxy(boolean nexusUsesProxy) {
+604 this .nexusUsesProxy = nexusUsesProxy;
+605 }
+606
+607
+608
+609
+610 private String databaseDriverName;
+611
+612
+613
+614
+615
+616
+617 public String getDatabaseDriverName() {
+618 return databaseDriverName;
+619 }
+620
+621
+622
+623
+624
+625
+626 public void setDatabaseDriverName(String databaseDriverName) {
+627 this .databaseDriverName = databaseDriverName;
+628 }
+629
+630
+631
+632
+633 private String databaseDriverPath;
+634
+635
+636
+637
+638
+639
+640 public String getDatabaseDriverPath() {
+641 return databaseDriverPath;
+642 }
+643
+644
+645
+646
+647
+648
+649 public void setDatabaseDriverPath(String databaseDriverPath) {
+650 this .databaseDriverPath = databaseDriverPath;
+651 }
+652
+653
+654
+655 private String connectionString;
+656
+657
+658
+659
+660
+661
+662 public String getConnectionString() {
+663 return connectionString;
+664 }
+665
+666
+667
+668
+669
+670
+671 public void setConnectionString(String connectionString) {
+672 this .connectionString = connectionString;
+673 }
+674
+675
+676
+677 private String databaseUser;
+678
+679
+680
+681
+682
+683
+684 public String getDatabaseUser() {
+685 return databaseUser;
+686 }
+687
+688
+689
+690
+691
+692
+693 public void setDatabaseUser(String databaseUser) {
+694 this .databaseUser = databaseUser;
+695 }
+696
+697
+698
+699
+700 private String databasePassword;
+701
+702
+703
+704
+705
+706
+707 public String getDatabasePassword() {
+708 return databasePassword;
+709 }
+710
+711
+712
+713
+714
+715
+716 public void setDatabasePassword(String databasePassword) {
+717 this .databasePassword = databasePassword;
+718 }
+719
+720
+721
+722
+723
+724 private String zipExtensions;
+725
+726
+727
+728
+729
+730
+731 public String getZipExtensions() {
+732 return zipExtensions;
+733 }
+734
+735
+736
+737
+738
+739
+740 public void setZipExtensions(String zipExtensions) {
+741 this .zipExtensions = zipExtensions;
+742 }
+743
+744
+745
+746
+747 private String cveUrl12Modified;
+748
+749
+750
+751
+752
+753
+754 public String getCveUrl12Modified() {
+755 return cveUrl12Modified;
+756 }
+757
+758
+759
+760
+761
+762
+763 public void setCveUrl12Modified(String cveUrl12Modified) {
+764 this .cveUrl12Modified = cveUrl12Modified;
+765 }
+766
+767
+768
+769
+770 private String cveUrl20Modified;
+771
+772
+773
+774
+775
+776
+777 public String getCveUrl20Modified() {
+778 return cveUrl20Modified;
+779 }
+780
+781
+782
+783
+784
+785
+786 public void setCveUrl20Modified(String cveUrl20Modified) {
+787 this .cveUrl20Modified = cveUrl20Modified;
+788 }
+789
+790
+791
+792
+793 private String cveUrl12Base;
+794
+795
+796
+797
+798
+799
+800 public String getCveUrl12Base() {
+801 return cveUrl12Base;
+802 }
+803
+804
+805
+806
+807
+808
+809 public void setCveUrl12Base(String cveUrl12Base) {
+810 this .cveUrl12Base = cveUrl12Base;
+811 }
+812
+813
+814
+815
+816 private String cveUrl20Base;
+817
+818
+819
+820
+821
+822
+823 public String getCveUrl20Base() {
+824 return cveUrl20Base;
+825 }
+826
+827
+828
+829
+830
+831
+832 public void setCveUrl20Base(String cveUrl20Base) {
+833 this .cveUrl20Base = cveUrl20Base;
+834 }
+835
+836
+837
+838 private String pathToMono;
+839
+840
+841
+842
+843
+844
+845 public String getPathToMono() {
+846 return pathToMono;
+847 }
+848
+849
+850
+851
+852
+853
+854 public void setPathToMono(String pathToMono) {
+855 this .pathToMono = pathToMono;
+856 }
+857
+858 @Override
+859 public void execute() throws BuildException {
+860 final InputStream in = DependencyCheckTask.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
+861 LogUtils.prepareLogger(in, logFile);
862
-863 Engine engine = null ;
-864 try {
-865 engine = new Engine();
+863 dealWithReferences();
+864 validateConfiguration();
+865 populateSettings();
866
-867 for (Resource resource : path) {
-868 final FileProvider provider = resource.as(FileProvider.class );
-869 if (provider != null ) {
-870 final File file = provider.getFile();
-871 if (file != null && file.exists()) {
-872 engine.scan(file);
-873 }
-874 }
-875 }
-876 try {
-877 engine.analyzeDependencies();
-878 DatabaseProperties prop = null ;
-879 CveDB cve = null ;
-880 try {
-881 cve = new CveDB();
-882 cve.open();
-883 prop = cve.getDatabaseProperties();
-884 } catch (DatabaseException ex) {
-885 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.FINE, "Unable to retrieve DB Properties" , ex);
-886 } finally {
-887 if (cve != null ) {
-888 cve.close();
-889 }
-890 }
-891 final ReportGenerator reporter = new ReportGenerator(applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
-892 reporter.generateReports(reportOutputDirectory, reportFormat);
-893
-894 if (this .failBuildOnCVSS <= 10) {
-895 checkForFailure(engine.getDependencies());
-896 }
-897 if (this .showSummary) {
-898 showSummary(engine.getDependencies());
-899 }
-900 } catch (IOException ex) {
-901 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.FINE,
-902 "Unable to generate dependency-check report" , ex);
-903 throw new BuildException("Unable to generate dependency-check report" , ex);
-904 } catch (Exception ex) {
-905 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.FINE,
-906 "An exception occurred; unable to continue task" , ex);
-907 throw new BuildException("An exception occurred; unable to continue task" , ex);
-908 }
-909 } catch (DatabaseException ex) {
-910 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.SEVERE,
-911 "Unable to connect to the dependency-check database; analysis has stopped" );
-912 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.FINE, "" , ex);
-913 } finally {
-914 if (engine != null ) {
-915 engine.cleanup();
-916 }
-917 }
-918 }
-919
-920
-921
-922
-923
-924
-925 private void validateConfiguration() throws BuildException {
-926 if (path == null ) {
-927 throw new BuildException("No project dependencies have been defined to analyze." );
-928 }
-929 if (failBuildOnCVSS < 0 || failBuildOnCVSS > 11) {
-930 throw new BuildException("Invalid configuration, failBuildOnCVSS must be between 0 and 11." );
-931 }
-932 }
-933
-934
-935
-936
-937
-938 private void populateSettings() {
-939 InputStream taskProperties = null ;
-940 try {
-941 taskProperties = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
-942 Settings.mergeProperties(taskProperties);
-943 } catch (IOException ex) {
-944 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.WARNING, "Unable to load the dependency-check ant task.properties file." );
-945 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.FINE, null , ex);
-946 } finally {
-947 if (taskProperties != null ) {
-948 try {
-949 taskProperties.close();
-950 } catch (IOException ex) {
-951 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.FINEST, null , ex);
-952 }
-953 }
-954 }
-955 if (dataDirectory != null ) {
-956 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
-957 } else {
-958 final File jarPath = new File(DependencyCheckTask.class .getProtectionDomain().getCodeSource().getLocation().getPath());
-959 final File base = jarPath.getParentFile();
-960 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
-961 final File dataDir = new File(base, sub);
-962 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-963 }
-964
-965 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-966
-967 if (proxyUrl != null && !proxyUrl.isEmpty()) {
-968 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
-969 }
-970 if (proxyPort != null && !proxyPort.isEmpty()) {
-971 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+867 Engine engine = null ;
+868 try {
+869 engine = new Engine();
+870
+871 for (Resource resource : path) {
+872 final FileProvider provider = resource.as(FileProvider.class );
+873 if (provider != null ) {
+874 final File file = provider.getFile();
+875 if (file != null && file.exists()) {
+876 engine.scan(file);
+877 }
+878 }
+879 }
+880 try {
+881 engine.analyzeDependencies();
+882 DatabaseProperties prop = null ;
+883 CveDB cve = null ;
+884 try {
+885 cve = new CveDB();
+886 cve.open();
+887 prop = cve.getDatabaseProperties();
+888 } catch (DatabaseException ex) {
+889 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties" , ex);
+890 } finally {
+891 if (cve != null ) {
+892 cve.close();
+893 }
+894 }
+895 final ReportGenerator reporter = new ReportGenerator(applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
+896 reporter.generateReports(reportOutputDirectory, reportFormat);
+897
+898 if (this .failBuildOnCVSS <= 10) {
+899 checkForFailure(engine.getDependencies());
+900 }
+901 if (this .showSummary) {
+902 showSummary(engine.getDependencies());
+903 }
+904 } catch (IOException ex) {
+905 LOGGER.log(Level.FINE, "Unable to generate dependency-check report" , ex);
+906 throw new BuildException("Unable to generate dependency-check report" , ex);
+907 } catch (Exception ex) {
+908 LOGGER.log(Level.FINE, "An exception occurred; unable to continue task" , ex);
+909 throw new BuildException("An exception occurred; unable to continue task" , ex);
+910 }
+911 } catch (DatabaseException ex) {
+912 LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped" );
+913 LOGGER.log(Level.FINE, "" , ex);
+914 } finally {
+915 Settings.cleanup();
+916 if (engine != null ) {
+917 engine.cleanup();
+918 }
+919 }
+920 }
+921
+922
+923
+924
+925
+926
+927 private void validateConfiguration() throws BuildException {
+928 if (path == null ) {
+929 throw new BuildException("No project dependencies have been defined to analyze." );
+930 }
+931 if (failBuildOnCVSS < 0 || failBuildOnCVSS > 11) {
+932 throw new BuildException("Invalid configuration, failBuildOnCVSS must be between 0 and 11." );
+933 }
+934 }
+935
+936
+937
+938
+939
+940 private void populateSettings() {
+941 Settings.initialize();
+942 InputStream taskProperties = null ;
+943 try {
+944 taskProperties = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
+945 Settings.mergeProperties(taskProperties);
+946 } catch (IOException ex) {
+947 LOGGER.log(Level.WARNING, "Unable to load the dependency-check ant task.properties file." );
+948 LOGGER.log(Level.FINE, null , ex);
+949 } finally {
+950 if (taskProperties != null ) {
+951 try {
+952 taskProperties.close();
+953 } catch (IOException ex) {
+954 LOGGER.log(Level.FINEST, null , ex);
+955 }
+956 }
+957 }
+958 if (dataDirectory != null ) {
+959 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
+960 } else {
+961 final File jarPath = new File(DependencyCheckTask.class .getProtectionDomain().getCodeSource().getLocation().getPath());
+962 final File base = jarPath.getParentFile();
+963 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
+964 final File dataDir = new File(base, sub);
+965 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+966 }
+967
+968 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+969
+970 if (proxyUrl != null && !proxyUrl.isEmpty()) {
+971 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
972 }
-973 if (proxyUsername != null && !proxyUsername.isEmpty()) {
-974 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
+973 if (proxyPort != null && !proxyPort.isEmpty()) {
+974 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
975 }
-976 if (proxyPassword != null && !proxyPassword.isEmpty()) {
-977 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
+976 if (proxyUsername != null && !proxyUsername.isEmpty()) {
+977 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
978 }
-979 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
-980 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+979 if (proxyPassword != null && !proxyPassword.isEmpty()) {
+980 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
981 }
-982 if (suppressionFile != null && !suppressionFile.isEmpty()) {
-983 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
+982 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+983 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
984 }
-985
-986
-987
-988 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
-989
-990 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
-991
-992 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
-993 if (nexusUrl != null && !nexusUrl.isEmpty()) {
-994 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
-995 }
-996 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
-997
-998 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
-999 if (zipExtensions != null && !zipExtensions.isEmpty()) {
-1000 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
-1001 }
-1002
-1003 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
-1004 if (pathToMono != null && !pathToMono.isEmpty()) {
-1005 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
-1006 }
-1007
-1008 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
-1009 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
-1010 }
-1011 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
-1012 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+985 if (suppressionFile != null && !suppressionFile.isEmpty()) {
+986 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
+987 }
+988
+989
+990
+991 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
+992
+993 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
+994
+995 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
+996 if (nexusUrl != null && !nexusUrl.isEmpty()) {
+997 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+998 }
+999 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+1000
+1001 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
+1002 if (zipExtensions != null && !zipExtensions.isEmpty()) {
+1003 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
+1004 }
+1005
+1006 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
+1007 if (pathToMono != null && !pathToMono.isEmpty()) {
+1008 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
+1009 }
+1010
+1011 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+1012 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
1013 }
-1014 if (connectionString != null && !connectionString.isEmpty()) {
-1015 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+1014 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+1015 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
1016 }
-1017 if (databaseUser != null && !databaseUser.isEmpty()) {
-1018 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+1017 if (connectionString != null && !connectionString.isEmpty()) {
+1018 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
1019 }
-1020 if (databasePassword != null && !databasePassword.isEmpty()) {
-1021 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
+1020 if (databaseUser != null && !databaseUser.isEmpty()) {
+1021 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
1022 }
-1023 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
-1024 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
+1023 if (databasePassword != null && !databasePassword.isEmpty()) {
+1024 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
1025 }
-1026 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
-1027 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
+1026 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
+1027 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
1028 }
-1029 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
-1030 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
+1029 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
+1030 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
1031 }
-1032 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
-1033 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
+1032 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
+1033 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
1034 }
-1035 }
-1036
-1037
-1038
-1039
-1040
-1041
-1042
-1043
-1044 private void checkForFailure(List<Dependency> dependencies) throws BuildException {
-1045 final StringBuilder ids = new StringBuilder();
-1046 for (Dependency d : dependencies) {
-1047 for (Vulnerability v : d.getVulnerabilities()) {
-1048 if (v.getCvssScore() >= failBuildOnCVSS) {
-1049 if (ids.length() == 0) {
-1050 ids.append(v.getName());
-1051 } else {
-1052 ids.append(", " ).append(v.getName());
-1053 }
-1054 }
-1055 }
-1056 }
-1057 if (ids.length() > 0) {
-1058 final String msg = String.format("%n%nDependency-Check Failure:%n"
-1059 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
-1060 + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
-1061 throw new BuildException(msg);
-1062 }
-1063 }
-1064
-1065
-1066
-1067
-1068
-1069
-1070 private void showSummary(List<Dependency> dependencies) {
-1071 final StringBuilder summary = new StringBuilder();
-1072 for (Dependency d : dependencies) {
-1073 boolean firstEntry = true ;
-1074 final StringBuilder ids = new StringBuilder();
-1075 for (Vulnerability v : d.getVulnerabilities()) {
-1076 if (firstEntry) {
-1077 firstEntry = false;
-1078 } else {
-1079 ids.append(", " );
-1080 }
-1081 ids.append(v.getName());
-1082 }
-1083 if (ids.length() > 0) {
-1084 summary.append(d.getFileName()).append(" (" );
-1085 firstEntry = true ;
-1086 for (Identifier id : d.getIdentifiers()) {
-1087 if (firstEntry) {
-1088 firstEntry = false;
-1089 } else {
-1090 summary.append(", " );
-1091 }
-1092 summary.append(id.getValue());
-1093 }
-1094 summary.append(") : " ).append(ids).append(NEW_LINE);
-1095 }
-1096 }
-1097 if (summary.length() > 0) {
-1098 final String msg = String.format("%n%n"
-1099 + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
-1100 + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString());
-1101 Logger.getLogger(DependencyCheckTask.class .getName()).log(Level.WARNING, msg);
-1102 }
-1103 }
-1104
-1105
-1106
-1107
-1108 public static class ReportFormats extends EnumeratedAttribute {
-1109
-1110
-1111
-1112
-1113
-1114
-1115 @Override
-1116 public String[] getValues() {
-1117 int i = 0;
-1118 final Format[] formats = Format.values();
-1119 final String[] values = new String[formats.length];
-1120 for (Format format : formats) {
-1121 values[i++] = format.name();
-1122 }
-1123 return values;
-1124 }
-1125 }
-1126
-1127
-1128
-1129
-1130 private boolean jarAnalyzerEnabled = true ;
-1131
-1132
-1133
-1134
-1135
-1136
-1137 public boolean isJarAnalyzerEnabled() {
-1138 return jarAnalyzerEnabled;
-1139 }
-1140 }
+1035 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
+1036 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
+1037 }
+1038 }
+1039
+1040
+1041
+1042
+1043
+1044
+1045
+1046
+1047 private void checkForFailure(List<Dependency> dependencies) throws BuildException {
+1048 final StringBuilder ids = new StringBuilder();
+1049 for (Dependency d : dependencies) {
+1050 for (Vulnerability v : d.getVulnerabilities()) {
+1051 if (v.getCvssScore() >= failBuildOnCVSS) {
+1052 if (ids.length() == 0) {
+1053 ids.append(v.getName());
+1054 } else {
+1055 ids.append(", " ).append(v.getName());
+1056 }
+1057 }
+1058 }
+1059 }
+1060 if (ids.length() > 0) {
+1061 final String msg = String.format("%n%nDependency-Check Failure:%n"
+1062 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
+1063 + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
+1064 throw new BuildException(msg);
+1065 }
+1066 }
+1067
+1068
+1069
+1070
+1071
+1072
+1073 private void showSummary(List<Dependency> dependencies) {
+1074 final StringBuilder summary = new StringBuilder();
+1075 for (Dependency d : dependencies) {
+1076 boolean firstEntry = true ;
+1077 final StringBuilder ids = new StringBuilder();
+1078 for (Vulnerability v : d.getVulnerabilities()) {
+1079 if (firstEntry) {
+1080 firstEntry = false;
+1081 } else {
+1082 ids.append(", " );
+1083 }
+1084 ids.append(v.getName());
+1085 }
+1086 if (ids.length() > 0) {
+1087 summary.append(d.getFileName()).append(" (" );
+1088 firstEntry = true ;
+1089 for (Identifier id : d.getIdentifiers()) {
+1090 if (firstEntry) {
+1091 firstEntry = false;
+1092 } else {
+1093 summary.append(", " );
+1094 }
+1095 summary.append(id.getValue());
+1096 }
+1097 summary.append(") : " ).append(ids).append(NEW_LINE);
+1098 }
+1099 }
+1100 if (summary.length() > 0) {
+1101 final String msg = String.format("%n%n"
+1102 + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
+1103 + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString());
+1104 LOGGER.log(Level.WARNING, msg);
+1105 }
+1106 }
+1107
+1108
+1109
+1110
+1111 public static class ReportFormats extends EnumeratedAttribute {
+1112
+1113
+1114
+1115
+1116
+1117
+1118 @Override
+1119 public String[] getValues() {
+1120 int i = 0;
+1121 final Format[] formats = Format.values();
+1122 final String[] values = new String[formats.length];
+1123 for (Format format : formats) {
+1124 values[i++] = format.name();
+1125 }
+1126 return values;
+1127 }
+1128 }
+1129
+1130
+1131
+1132
+1133 private boolean jarAnalyzerEnabled = true ;
+1134
+1135
+1136
+1137
+1138
+1139
+1140 public boolean isJarAnalyzerEnabled() {
+1141 return jarAnalyzerEnabled;
+1142 }
+1143 }
Dependency-Check Ant Task 1.1.4 Reference Package org.owasp.dependencycheck.taskdefs
+ Dependency-Check Ant Task 1.2.0 Reference Package org.owasp.dependencycheck.taskdefs
Dependency-Check Ant Task 1.1.4 Reference Package org.owasp.dependencycheck.taskdefs
+ Dependency-Check Ant Task 1.2.0 Reference Package org.owasp.dependencycheck.taskdefs
Dependency-Check Ant Task 1.1.4 Reference
+ Dependency-Check Ant Task 1.2.0 Reference
Dependency-Check Ant Task 1.1.4 Reference
+ Dependency-Check Ant Task 1.2.0 Reference
Dependency-Check Ant Task 1.1.4 Reference
+ Dependency-Check Ant Task 1.2.0 Reference
diff --git a/dependency-check-cli/apidocs/allclasses-frame.html b/dependency-check-cli/apidocs/allclasses-frame.html
index 0911e8b95..ee5ce0c9a 100644
--- a/dependency-check-cli/apidocs/allclasses-frame.html
+++ b/dependency-check-cli/apidocs/allclasses-frame.html
@@ -2,10 +2,10 @@
-
+
All Classes (Dependency-Check Command Line 1.1.4 API)
-All Classes (Dependency-Check Command Line 1.2.0 API)
+All Classes (Dependency-Check Command Line 1.1.4 API)
-All Classes (Dependency-Check Command Line 1.2.0 API)
+Constant Field Values (Dependency-Check Command Line 1.1.4 API)
-Constant Field Values (Dependency-Check Command Line 1.2.0 API)
+"s"
-
+
public static final String SUPPRESION_FILE SUPPRESSION_FILE "suppression"
diff --git a/dependency-check-cli/apidocs/deprecated-list.html b/dependency-check-cli/apidocs/deprecated-list.html
index b52cad105..931ece1e2 100644
--- a/dependency-check-cli/apidocs/deprecated-list.html
+++ b/dependency-check-cli/apidocs/deprecated-list.html
@@ -2,16 +2,16 @@
-
+
Deprecated List (Dependency-Check Command Line 1.1.4 API)
-Deprecated List (Dependency-Check Command Line 1.2.0 API)
+API Help (Dependency-Check Command Line 1.1.4 API)
-API Help (Dependency-Check Command Line 1.2.0 API)
+Index (Dependency-Check Command Line 1.1.4 API)
-Index (Dependency-Check Command Line 1.2.0 API)
+
The short CLI argument name specifying the directory/file to scan.
-SUPPRESION_FILE CliParser.ArgumentName SUPPRESSION_FILE CliParser.ArgumentName
The CLI argument name for setting the location of the suppression file.
diff --git a/dependency-check-cli/apidocs/index.html b/dependency-check-cli/apidocs/index.html
index 952c12412..4359686f2 100644
--- a/dependency-check-cli/apidocs/index.html
+++ b/dependency-check-cli/apidocs/index.html
@@ -2,9 +2,9 @@
-
+
Dependency-Check Command Line 1.1.4 API
+Dependency-Check Command Line 1.2.0 API
diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/App.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/App.html
index be460ccc7..3ea131be6 100644
--- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/App.html
+++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/App.html
@@ -2,16 +2,16 @@
-
+
Uses of Class org.owasp.dependencycheck.App (Dependency-Check Command Line 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.App (Dependency-Check Command Line 1.2.0 API)
+CliParser.ArgumentName (Dependency-Check Command Line 1.1.4 API)
-CliParser.ArgumentName (Dependency-Check Command Line 1.2.0 API)
+
static String SUPPRESION_FILE SUPPRESSION_FILE The CLI argument name for setting the location of the suppression file.
@@ -752,15 +752,15 @@ extends See Also:Constant Field Values
+
diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/cli/CliParser.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/cli/CliParser.html
index 054e94b12..c4d76071e 100644
--- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/cli/CliParser.html
+++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/cli/CliParser.html
@@ -2,16 +2,16 @@
-
+
CliParser (Dependency-Check Command Line 1.1.4 API)
-CliParser (Dependency-Check Command Line 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.cli.CliParser.ArgumentName (Dependency-Check Command Line 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.cli.CliParser.ArgumentName (Dependency-Check Command Line 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.cli.CliParser (Dependency-Check Command Line 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.cli.CliParser (Dependency-Check Command Line 1.2.0 API)
+org.owasp.dependencycheck.cli (Dependency-Check Command Line 1.1.4 API)
-org.owasp.dependencycheck.cli (Dependency-Check Command Line 1.2.0 API)
+org.owasp.dependencycheck.cli (Dependency-Check Command Line 1.1.4 API)
-org.owasp.dependencycheck.cli (Dependency-Check Command Line 1.2.0 API)
+org.owasp.dependencycheck.cli Class Hierarchy (Dependency-Check Command Line 1.1.4 API)
-org.owasp.dependencycheck.cli Class Hierarchy (Dependency-Check Command Line 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.cli (Dependency-Check Command Line 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.cli (Dependency-Check Command Line 1.2.0 API)
+org.owasp.dependencycheck (Dependency-Check Command Line 1.1.4 API)
-org.owasp.dependencycheck (Dependency-Check Command Line 1.2.0 API)
+org.owasp.dependencycheck (Dependency-Check Command Line 1.1.4 API)
-org.owasp.dependencycheck (Dependency-Check Command Line 1.2.0 API)
+org.owasp.dependencycheck Class Hierarchy (Dependency-Check Command Line 1.1.4 API)
-org.owasp.dependencycheck Class Hierarchy (Dependency-Check Command Line 1.2.0 API)
+Uses of Package org.owasp.dependencycheck (Dependency-Check Command Line 1.1.4 API)
-Uses of Package org.owasp.dependencycheck (Dependency-Check Command Line 1.2.0 API)
+Overview List (Dependency-Check Command Line 1.1.4 API)
-Overview List (Dependency-Check Command Line 1.2.0 API)
+Overview (Dependency-Check Command Line 1.1.4 API)
-Overview (Dependency-Check Command Line 1.2.0 API)
+
diff --git a/dependency-check-cli/apidocs/overview-tree.html b/dependency-check-cli/apidocs/overview-tree.html
index 6102d597d..10d0a0b5e 100644
--- a/dependency-check-cli/apidocs/overview-tree.html
+++ b/dependency-check-cli/apidocs/overview-tree.html
@@ -2,16 +2,16 @@
-
+
Class Hierarchy (Dependency-Check Command Line 1.1.4 API)
-Class Hierarchy (Dependency-Check Command Line 1.2.0 API)
+dependency-check-cli - Command Line Arguments
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -103,7 +103,7 @@
diff --git a/dependency-check-cli/checkstyle.html b/dependency-check-cli/checkstyle.html
index 3f14d1818..7d01089b1 100644
--- a/dependency-check-cli/checkstyle.html
+++ b/dependency-check-cli/checkstyle.html
@@ -1,13 +1,13 @@
dependency-check-cli - Checkstyle Results
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
-
+
@@ -176,16 +176,9 @@
-
+
-
-
-
-
-
-
+ PMD
diff --git a/dependency-check-cli/cobertura/frame-sourcefiles-org.owasp.dependencycheck.cli.html b/dependency-check-cli/cobertura/frame-sourcefiles-org.owasp.dependencycheck.cli.html
index ac8ef5ddd..45a317b79 100644
--- a/dependency-check-cli/cobertura/frame-sourcefiles-org.owasp.dependencycheck.cli.html
+++ b/dependency-check-cli/cobertura/frame-sourcefiles-org.owasp.dependencycheck.cli.html
@@ -15,7 +15,7 @@ org.owasp.dependencycheck.cli
diff --git a/dependency-check-cli/cobertura/frame-sourcefiles.html b/dependency-check-cli/cobertura/frame-sourcefiles.html
index c854a9a55..df9a7066f 100644
--- a/dependency-check-cli/cobertura/frame-sourcefiles.html
+++ b/dependency-check-cli/cobertura/frame-sourcefiles.html
@@ -18,7 +18,7 @@ All Packages
App (0%)
-CliParser (0%) CliParser (65%)
diff --git a/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.cli.html b/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.cli.html
index cc6e891f6..2929c7d91 100644
--- a/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.cli.html
+++ b/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.cli.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.html b/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.html
index 35047cec9..9a93c65b8 100644
--- a/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.html
+++ b/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.html
@@ -16,8 +16,8 @@
-
+
diff --git a/dependency-check-cli/cobertura/frame-summary.html b/dependency-check-cli/cobertura/frame-summary.html
index 8e6809233..9cf8b8c7b 100644
--- a/dependency-check-cli/cobertura/frame-summary.html
+++ b/dependency-check-cli/cobertura/frame-summary.html
@@ -16,9 +16,9 @@
-
+
diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html
index 147a0a05c..9054d639d 100644
--- a/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html
+++ b/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html
@@ -12,7 +12,7 @@
@@ -116,289 +116,302 @@
49
50
-
+
51
-
-
52
-
+
+
52 0 private static final Logger LOGGER = Logger.getLogger(App.class .getName());
53
-
+
54
- public static void main(String[] args) {
-
55 0 final App app = new App();
-
56 0 app.run(args);
-
57 0 }
-
58
-
-
59
-
60
-
-
61
+ 55
+
+
56
-
62
+ 57
+
58
+
+
59
+ public static void main(String[] args) {
+
60 0 final App app = new App();
+
61 0 app.run(args);
+
62 0 }
63
-
+
64
- public void run(String[] args) {
+
65
-
-
66 0 final CliParser cli = new CliParser();
+
+
66
+
67
+
+
68
+
+
69
+ public void run(String[] args) {
+
70
+
+
71 0 final CliParser cli = new CliParser();
+
72
try {
-
68 0 cli.parse(args);
-
69 0 } catch (FileNotFoundException ex) {
-
70 0 System.err.println(ex.getMessage());
-
71 0 cli.printHelp();
-
72 0 return ;
-
73 0 } catch (ParseException ex) {
-
74 0 System.err.println(ex.getMessage());
-
75 0 cli.printHelp();
-
76 0 return ;
-
77 0 }
-
78
+ 73 0 cli.parse(args);
+
74 0 } catch (FileNotFoundException ex) {
+
75 0 System.err.println(ex.getMessage());
+
76 0 cli.printHelp();
+
77 0 return ;
+
78 0 } catch (ParseException ex) {
+
79 0 System.err.println(ex.getMessage());
+
80 0 cli.printHelp();
+
81 0 return ;
+
82 0 }
+
83
-
79 0 final InputStream in = App.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
-
80 0 LogUtils.prepareLogger(in, cli.getVerboseLog());
-
81
-
-
82 0 if (cli.isGetVersion()) {
-
83 0 cli.printVersionInfo();
-
84 0 } else if (cli.isRunScan()) {
-
85 0 updateSettings(cli);
-
86 0 runScan(cli.getReportDirectory(), cli.getReportFormat(), cli.getApplicationName(), cli.getScanFiles());
-
87
- } else {
-
88 0 cli.printHelp();
-
89
- }
-
90 0 }
-
91
+ 84 0 final InputStream in = App.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
+
85 0 LogUtils.prepareLogger(in, cli.getVerboseLog());
+
86
+
87 0 if (cli.isGetVersion()) {
+
88 0 cli.printVersionInfo();
+
89 0 } else if (cli.isRunScan()) {
+
90 0 populateSettings(cli);
+
91 0 runScan(cli.getReportDirectory(), cli.getReportFormat(), cli.getApplicationName(), cli.getScanFiles());
92
-
-
93
-
+
} else {
+
93 0 cli.printHelp();
94
-
-
95
-
+
}
+
95 0 }
96
-
+
97
-
-
98
-
-
99
-
-
100
- private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files) {
-
101 0 Engine scanner = null ;
-
102
- try {
-
103 0 scanner = new Engine();
-
104
-
-
105 0 for (String file : files) {
-
106 0 scanner.scan(file);
-
107
- }
-
108
-
-
109 0 scanner.analyzeDependencies();
-
110 0 final List<Dependency> dependencies = scanner.getDependencies();
-
111 0 DatabaseProperties prop = null ;
-
112 0 CveDB cve = null ;
-
113
- try {
-
114 0 cve = new CveDB();
-
115 0 cve.open();
-
116 0 prop = cve.getDatabaseProperties();
-
117 0 } catch (DatabaseException ex) {
-
118 0 Logger.getLogger(App.class .getName()).log(Level.FINE, "Unable to retrieve DB Properties" , ex);
-
119
- } finally {
-
120 0 if (cve != null ) {
-
121 0 cve.close();
-
122
- }
-
123
- }
-
124 0 final ReportGenerator report = new ReportGenerator(applicationName, dependencies, scanner.getAnalyzers(), prop);
-
125
- try {
-
126 0 report.generateReports(reportDirectory, outputFormat);
-
127 0 } catch (IOException ex) {
-
128 0 Logger.getLogger(App.class .getName()).log(Level.SEVERE, "There was an IO error while attempting to generate the report." );
-
129 0 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-
130 0 } catch (Throwable ex) {
-
131 0 Logger.getLogger(App.class .getName()).log(Level.SEVERE, "There was an error while attempting to generate the report." );
-
132 0 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-
133 0 }
-
134 0 } catch (DatabaseException ex) {
-
135 0 Logger.getLogger(App.class .getName()).log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped" );
-
136 0 Logger.getLogger(App.class .getName()).log(Level.FINE, "" , ex);
-
137
- } finally {
-
138 0 if (scanner != null ) {
-
139 0 scanner.cleanup();
-
140
- }
-
141
- }
-
142 0 }
-
143
-
-
144
-
145
-
-
146
+ 98
+
+
99
-
147
-
-
148
-
-
149
+ 100
+
+
101
+
+
102
+
+
103
+
+
104
-
150
- private void updateSettings(CliParser cli) {
-
151
+ 105
+ private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files) {
+
106 0 Engine scanner = null ;
+
107
+ try {
+
108 0 scanner = new Engine();
+
109
-
152 0 final boolean autoUpdate = cli.isAutoUpdate();
-
153 0 final String connectionTimeout = cli.getConnectionTimeout();
-
154 0 final String proxyUrl = cli.getProxyUrl();
-
155 0 final String proxyPort = cli.getProxyPort();
-
156 0 final String proxyUser = cli.getProxyUsername();
-
157 0 final String proxyPass = cli.getProxyPassword();
-
158 0 final String dataDirectory = cli.getDataDirectory();
-
159 0 final File propertiesFile = cli.getPropertiesFile();
-
160 0 final String suppressionFile = cli.getSuppressionFile();
-
161 0 final boolean jarDisabled = cli.isJarDisabled();
-
162 0 final boolean archiveDisabled = cli.isArchiveDisabled();
-
163 0 final boolean assemblyDisabled = cli.isAssemblyDisabled();
-
164 0 final boolean nuspecDisabled = cli.isNuspecDisabled();
-
165 0 final boolean nexusDisabled = cli.isNexusDisabled();
-
166 0 final String nexusUrl = cli.getNexusUrl();
-
167 0 final String databaseDriverName = cli.getDatabaseDriverName();
-
168 0 final String databaseDriverPath = cli.getDatabaseDriverPath();
-
169 0 final String connectionString = cli.getConnectionString();
-
170 0 final String databaseUser = cli.getDatabaseUser();
-
171 0 final String databasePassword = cli.getDatabasePassword();
-
172 0 final String additionalZipExtensions = cli.getAdditionalZipExtensions();
-
173 0 final String pathToMono = cli.getPathToMono();
-
174
+ 110 0 for (String file : files) {
+
111 0 scanner.scan(file);
+
112
+ }
+
113
-
175 0 if (propertiesFile != null ) {
-
176
+ 114 0 scanner.analyzeDependencies();
+
115 0 final List<Dependency> dependencies = scanner.getDependencies();
+
116 0 DatabaseProperties prop = null ;
+
117 0 CveDB cve = null ;
+
118
try {
-
177 0 Settings.mergeProperties(propertiesFile);
-
178 0 } catch (FileNotFoundException ex) {
-
179 0 final String msg = String.format("Unable to load properties file '%s'" , propertiesFile.getPath());
-
180 0 Logger.getLogger(App.class .getName()).log(Level.SEVERE, msg);
-
181 0 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-
182 0 } catch (IOException ex) {
-
183 0 final String msg = String.format("Unable to find properties file '%s'" , propertiesFile.getPath());
-
184 0 Logger.getLogger(App.class .getName()).log(Level.SEVERE, msg);
-
185 0 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-
186 0 }
-
187
+ 119 0 cve = new CveDB();
+
120 0 cve.open();
+
121 0 prop = cve.getDatabaseProperties();
+
122 0 } catch (DatabaseException ex) {
+
123 0 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties" , ex);
+
124
+ } finally {
+
125 0 if (cve != null ) {
+
126 0 cve.close();
+
127
+ }
+
128
+ }
+
129 0 final ReportGenerator report = new ReportGenerator(applicationName, dependencies, scanner.getAnalyzers(), prop);
+
130
+ try {
+
131 0 report.generateReports(reportDirectory, outputFormat);
+
132 0 } catch (IOException ex) {
+
133 0 LOGGER.log(Level.SEVERE, "There was an IO error while attempting to generate the report." );
+
134 0 LOGGER.log(Level.FINE, null , ex);
+
135 0 } catch (Throwable ex) {
+
136 0 LOGGER.log(Level.SEVERE, "There was an error while attempting to generate the report." );
+
137 0 LOGGER.log(Level.FINE, null , ex);
+
138 0 }
+
139 0 } catch (DatabaseException ex) {
+
140 0 LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped" );
+
141 0 LOGGER.log(Level.FINE, "" , ex);
+
142
+ } finally {
+
143 0 Settings.cleanup();
+
144 0 if (scanner != null ) {
+
145 0 scanner.cleanup();
+
146
+ }
+
147
}
-
188
+ 148 0 }
+
149
+
+
150
+
+
151
+
+
152
+
+
153
+
+
154
+
+
155
+
+
156
+ private void populateSettings(CliParser cli) {
+
157
+
+
158 0 Settings.initialize();
+
159
+
+
160 0 final boolean autoUpdate = cli.isAutoUpdate();
+
161 0 final String connectionTimeout = cli.getConnectionTimeout();
+
162 0 final String proxyUrl = cli.getProxyUrl();
+
163 0 final String proxyPort = cli.getProxyPort();
+
164 0 final String proxyUser = cli.getProxyUsername();
+
165 0 final String proxyPass = cli.getProxyPassword();
+
166 0 final String dataDirectory = cli.getDataDirectory();
+
167 0 final File propertiesFile = cli.getPropertiesFile();
+
168 0 final String suppressionFile = cli.getSuppressionFile();
+
169 0 final boolean jarDisabled = cli.isJarDisabled();
+
170 0 final boolean archiveDisabled = cli.isArchiveDisabled();
+
171 0 final boolean assemblyDisabled = cli.isAssemblyDisabled();
+
172 0 final boolean nuspecDisabled = cli.isNuspecDisabled();
+
173 0 final boolean nexusDisabled = cli.isNexusDisabled();
+
174 0 final String nexusUrl = cli.getNexusUrl();
+
175 0 final String databaseDriverName = cli.getDatabaseDriverName();
+
176 0 final String databaseDriverPath = cli.getDatabaseDriverPath();
+
177 0 final String connectionString = cli.getConnectionString();
+
178 0 final String databaseUser = cli.getDatabaseUser();
+
179 0 final String databasePassword = cli.getDatabasePassword();
+
180 0 final String additionalZipExtensions = cli.getAdditionalZipExtensions();
+
181 0 final String pathToMono = cli.getPathToMono();
+
182
+
+
183 0 if (propertiesFile != null ) {
+
184
+ try {
+
185 0 Settings.mergeProperties(propertiesFile);
+
186 0 } catch (FileNotFoundException ex) {
+
187 0 final String msg = String.format("Unable to load properties file '%s'" , propertiesFile.getPath());
+
188 0 LOGGER.log(Level.SEVERE, msg);
+
189 0 LOGGER.log(Level.FINE, null , ex);
+
190 0 } catch (IOException ex) {
+
191 0 final String msg = String.format("Unable to find properties file '%s'" , propertiesFile.getPath());
+
192 0 LOGGER.log(Level.SEVERE, msg);
+
193 0 LOGGER.log(Level.FINE, null , ex);
+
194 0 }
+
195
+ }
+
196
-
189
+ 197
-
190
+ 198
-
191 0 final boolean nexusUsesProxy = cli.isNexusUsesProxy();
-
192 0 if (dataDirectory != null ) {
-
193 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
-
194 0 } else if (System.getProperty("basedir" ) != null ) {
-
195 0 final File dataDir = new File(System.getProperty("basedir" ), "data" );
-
196 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-
197 0 } else {
-
198 0 final File jarPath = new File(App.class .getProtectionDomain().getCodeSource().getLocation().getPath());
-
199 0 final File base = jarPath.getParentFile();
-
200 0 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
-
201 0 final File dataDir = new File(base, sub);
-
202 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-
203
+ 199 0 final boolean nexusUsesProxy = cli.isNexusUsesProxy();
+
200 0 if (dataDirectory != null ) {
+
201 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
+
202 0 } else if (System.getProperty("basedir" ) != null ) {
+
203 0 final File dataDir = new File(System.getProperty("basedir" ), "data" );
+
204 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+
205 0 } else {
+
206 0 final File jarPath = new File(App.class .getProtectionDomain().getCodeSource().getLocation().getPath());
+
207 0 final File base = jarPath.getParentFile();
+
208 0 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
+
209 0 final File dataDir = new File(base, sub);
+
210 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+
211
}
-
204 0 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-
205 0 if (proxyUrl != null && !proxyUrl.isEmpty()) {
-
206 0 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
-
207
+ 212 0 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+
213 0 if (proxyUrl != null && !proxyUrl.isEmpty()) {
+
214 0 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
+
215
}
-
208 0 if (proxyPort != null && !proxyPort.isEmpty()) {
-
209 0 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
-
210
+ 216 0 if (proxyPort != null && !proxyPort.isEmpty()) {
+
217 0 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+
218
}
-
211 0 if (proxyUser != null && !proxyUser.isEmpty()) {
-
212 0 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUser);
-
213
+ 219 0 if (proxyUser != null && !proxyUser.isEmpty()) {
+
220 0 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUser);
+
221
}
-
214 0 if (proxyPass != null && !proxyPass.isEmpty()) {
-
215 0 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPass);
-
216
- }
-
217 0 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
-
218 0 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
-
219
- }
-
220 0 if (suppressionFile != null && !suppressionFile.isEmpty()) {
-
221 0 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
-
222
- }
-
223
-
+
222 0 if (proxyPass != null && !proxyPass.isEmpty()) {
+
223 0 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPass);
224
-
-
225 0 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, !jarDisabled);
-
226 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, !archiveDisabled);
-
227 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
-
228 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
-
229
+ }
+
225 0 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+
226 0 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+
227
+ }
+
228 0 if (suppressionFile != null && !suppressionFile.isEmpty()) {
+
229 0 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
+
230
+ }
+
231
-
230 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, !nexusDisabled);
-
231 0 if (nexusUrl != null && !nexusUrl.isEmpty()) {
-
232 0 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
-
233
- }
-
234 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
-
235 0 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
-
236 0 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+
232
+
+
233 0 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, !jarDisabled);
+
234 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, !archiveDisabled);
+
235 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
+
236 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
237
+
+
238 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, !nexusDisabled);
+
239 0 if (nexusUrl != null && !nexusUrl.isEmpty()) {
+
240 0 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+
241
}
-
238 0 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
-
239 0 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
-
240
+ 242 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+
243 0 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+
244 0 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+
245
}
-
241 0 if (connectionString != null && !connectionString.isEmpty()) {
-
242 0 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
-
243
+ 246 0 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+
247 0 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+
248
}
-
244 0 if (databaseUser != null && !databaseUser.isEmpty()) {
-
245 0 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
-
246
+ 249 0 if (connectionString != null && !connectionString.isEmpty()) {
+
250 0 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+
251
}
-
247 0 if (databasePassword != null && !databasePassword.isEmpty()) {
-
248 0 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
-
249
+ 252 0 if (databaseUser != null && !databaseUser.isEmpty()) {
+
253 0 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+
254
}
-
250 0 if (additionalZipExtensions != null && !additionalZipExtensions.isEmpty()) {
-
251 0 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, additionalZipExtensions);
-
252
- }
-
253 0 if (pathToMono != null && !pathToMono.isEmpty()) {
-
254 0 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
-
255
- }
-
256 0 }
+
255 0 if (databasePassword != null && !databasePassword.isEmpty()) {
+
256 0 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
257
+ }
+
258 0 if (additionalZipExtensions != null && !additionalZipExtensions.isEmpty()) {
+
259 0 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, additionalZipExtensions);
+
260
+ }
+
261 0 if (pathToMono != null && !pathToMono.isEmpty()) {
+
262 0 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
+
263
+ }
+
264 0 }
+
265
}
-
+
diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.cli.CliParser.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.cli.CliParser.html
index 1e3f35849..4939b9f6f 100644
--- a/dependency-check-cli/cobertura/org.owasp.dependencycheck.cli.CliParser.html
+++ b/dependency-check-cli/cobertura/org.owasp.dependencycheck.cli.CliParser.html
@@ -12,7 +12,7 @@
@@ -134,14 +134,14 @@
58
public void parse(String[] args) throws FileNotFoundException, ParseException {
- 59 0 line = parseArgs(args);
+ 59 9 line = parseArgs(args);
60
- 61 0 if (line != null ) {
- 62 0 validateArgs();
+ 61 8 if (line != null ) {
+ 62 8 validateArgs();
63
}
- 64 0 }
+ 64 7 }
65
66
@@ -160,9 +160,9 @@
73
private CommandLine parseArgs(String[] args) throws ParseException {
- 74 0 final CommandLineParser parser = new PosixParser();
- 75 0 final Options options = createCommandLineOptions();
- 76 0 return parser.parse(options, args);
+ 74 9 final CommandLineParser parser = new PosixParser();
+ 75 9 final Options options = createCommandLineOptions();
+ 76 9 return parser.parse(options, args);
77
}
78
@@ -183,18 +183,18 @@
86
private void validateArgs() throws FileNotFoundException, ParseException {
- 87 0 if (isRunScan()) {
- 88 0 validatePathExists(getScanFiles(), ArgumentName.SCAN);
- 89 0 validatePathExists(getReportDirectory(), ArgumentName.OUT);
- 90 0 if (getPathToMono() != null ) {
+ 87 8 if (isRunScan()) {
+ 88 2 validatePathExists(getScanFiles(), ArgumentName.SCAN);
+ 89 1 validatePathExists(getReportDirectory(), ArgumentName.OUT);
+ 90 1 if (getPathToMono() != null ) {
91 0 validatePathExists(getPathToMono(), ArgumentName.PATH_TO_MONO);
92
}
- 93 0 if (!line.hasOption(ArgumentName.APP_NAME)) {
+ 93 1 if (!line.hasOption(ArgumentName.APP_NAME)) {
94 0 throw new ParseException("Missing 'app' argument; the scan cannot be run without the an application name." );
95
}
- 96 0 if (line.hasOption(ArgumentName.OUTPUT_FORMAT)) {
+ 96 1 if (line.hasOption(ArgumentName.OUTPUT_FORMAT)) {
97 0 final String format = line.getOptionValue(ArgumentName.OUTPUT_FORMAT);
98
try {
@@ -209,7 +209,7 @@
} 106
}
- 107 0 }
+ 107 7 }
108
109
@@ -230,11 +230,11 @@
117
private void validatePathExists(String[] paths, String optType) throws FileNotFoundException {
- 118 0 for (String path : paths) {
- 119 0 validatePathExists(path, optType);
+ 118 3 for (String path : paths) {
+ 119 2 validatePathExists(path, optType);
120
}
- 121 0 }
+ 121 1 }
122
123
@@ -255,17 +255,17 @@
131
private void validatePathExists(String path, String argumentName) throws FileNotFoundException {
- 132 0 if (!path.contains("*." )) {
- 133 0 final File f = new File(path);
- 134 0 if (!f.exists()) {
- 135 0 isValid = false ;
- 136 0 final String msg = String.format("Invalid '%s' argument: '%s'" , argumentName, path);
- 137 0 throw new FileNotFoundException(msg);
+ 132 3 if (!path.contains("*." )) {
+ 133 3 final File f = new File(path);
+ 134 3 if (!f.exists()) {
+ 135 1 isValid = false ;
+ 136 1 final String msg = String.format("Invalid '%s' argument: '%s'" , argumentName, path);
+ 137 1 throw new FileNotFoundException(msg);
138
}
139
}
- 140 0 }
+ 140 2 }
141
142
@@ -284,12 +284,12 @@
private Options createCommandLineOptions() {
149
- 150 0 final Options options = new Options();
- 151 0 addStandardOptions(options);
- 152 0 addAdvancedOptions(options);
+ 150 9 final Options options = new Options();
+ 151 9 addStandardOptions(options);
+ 152 9 addAdvancedOptions(options);
153
- 154 0 return options;
+ 154 9 return options;
155
}
156
@@ -310,34 +310,34 @@
@SuppressWarnings("static-access" )
164
private void addStandardOptions(final Options options) throws IllegalArgumentException {
- 165 0 final Option help = new Option(ArgumentName.HELP_SHORT, ArgumentName.HELP, false ,
+ 165 11 final Option help = new Option(ArgumentName.HELP_SHORT, ArgumentName.HELP, false ,
166
"Print this message." );
167
- 168 0 final Option advancedHelp = OptionBuilder.withLongOpt(ArgumentName.ADVANCED_HELP)
+ 168 11 final Option advancedHelp = OptionBuilder.withLongOpt(ArgumentName.ADVANCED_HELP)
169
.withDescription("Print the advanced help message." ).create();
170
- 171 0 final Option version = new Option(ArgumentName.VERSION_SHORT, ArgumentName.VERSION,
+ 171 11 final Option version = new Option(ArgumentName.VERSION_SHORT, ArgumentName.VERSION,
172
false , "Print the version information." );
173
- 174 0 final Option noUpdate = new Option(ArgumentName.DISABLE_AUTO_UPDATE_SHORT, ArgumentName.DISABLE_AUTO_UPDATE,
+ 174 11 final Option noUpdate = new Option(ArgumentName.DISABLE_AUTO_UPDATE_SHORT, ArgumentName.DISABLE_AUTO_UPDATE,
175
false , "Disables the automatic updating of the CPE data." );
176
- 177 0 final Option appName = OptionBuilder.withArgName("name" ).hasArg().withLongOpt(ArgumentName.APP_NAME)
+ 177 11 final Option appName = OptionBuilder.withArgName("name" ).hasArg().withLongOpt(ArgumentName.APP_NAME)
178
.withDescription("The name of the application being scanned. This is a required argument." )
179
.create(ArgumentName.APP_NAME_SHORT);
180
- 181 0 final Option path = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.SCAN)
+ 181 11 final Option path = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.SCAN)
182
.withDescription("The path to scan - this option can be specified multiple times. To limit the scan"
183
@@ -346,35 +346,35 @@
.create(ArgumentName.SCAN_SHORT);
185
- 186 0 final Option props = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.PROP)
+ 186 11 final Option props = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.PROP)
187
.withDescription("A property file to load." )
188
.create(ArgumentName.PROP_SHORT);
189
- 190 0 final Option out = OptionBuilder.withArgName("folder" ).hasArg().withLongOpt(ArgumentName.OUT)
+ 190 11 final Option out = OptionBuilder.withArgName("folder" ).hasArg().withLongOpt(ArgumentName.OUT)
191
.withDescription("The folder to write reports to. This defaults to the current directory." )
192
.create(ArgumentName.OUT_SHORT);
193
- 194 0 final Option outputFormat = OptionBuilder.withArgName("format" ).hasArg().withLongOpt(ArgumentName.OUTPUT_FORMAT)
+ 194 11 final Option outputFormat = OptionBuilder.withArgName("format" ).hasArg().withLongOpt(ArgumentName.OUTPUT_FORMAT)
195
.withDescription("The output format to write to (XML, HTML, VULN, ALL). The default is HTML." )
196
.create(ArgumentName.OUTPUT_FORMAT_SHORT);
197
- 198 0 final Option verboseLog = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.VERBOSE_LOG)
+ 198 11 final Option verboseLog = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.VERBOSE_LOG)
199
.withDescription("The file path to write verbose logging information." )
200
.create(ArgumentName.VERBOSE_LOG_SHORT);
201
- 202 0 final Option suppressionFile = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.SUPPRESION_FILE)
+ 202 11 final Option suppressionFile = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.SUPPRESSION_FILE)
203
.withDescription("The file path to the suppression XML file." )
204
@@ -383,11 +383,11 @@
206
- 207 0 final OptionGroup og = new OptionGroup();
- 208 0 og.addOption(path);
+ 207 11 final OptionGroup og = new OptionGroup();
+ 208 11 og.addOption(path);
209
- 210 0 options.addOptionGroup(og)
+ 210 11 options.addOptionGroup(og)
211
.addOption(out)
212
@@ -408,7 +408,7 @@
.addOption(verboseLog)
220
.addOption(suppressionFile);
- 221 0 }
+ 221 11 }
222
223
@@ -431,145 +431,145 @@
private void addAdvancedOptions(final Options options) throws IllegalArgumentException {
232
- 233 0 final Option data = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.DATA_DIRECTORY)
+ 233 9 final Option data = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.DATA_DIRECTORY)
234
.withDescription("The location of the H2 Database file. This option should generally not be set." )
235
.create(ArgumentName.DATA_DIRECTORY_SHORT);
236
- 237 0 final Option connectionTimeout = OptionBuilder.withArgName("timeout" ).hasArg().withLongOpt(ArgumentName.CONNECTION_TIMEOUT)
+ 237 9 final Option connectionTimeout = OptionBuilder.withArgName("timeout" ).hasArg().withLongOpt(ArgumentName.CONNECTION_TIMEOUT)
238
.withDescription("The connection timeout (in milliseconds) to use when downloading resources." )
239
.create(ArgumentName.CONNECTION_TIMEOUT_SHORT);
240
- 241 0 final Option proxyUrl = OptionBuilder.withArgName("url" ).hasArg().withLongOpt(ArgumentName.PROXY_URL)
+ 241 9 final Option proxyUrl = OptionBuilder.withArgName("url" ).hasArg().withLongOpt(ArgumentName.PROXY_URL)
242
.withDescription("The proxy url to use when downloading resources." )
243
.create(ArgumentName.PROXY_URL_SHORT);
244
- 245 0 final Option proxyPort = OptionBuilder.withArgName("port" ).hasArg().withLongOpt(ArgumentName.PROXY_PORT)
+ 245 9 final Option proxyPort = OptionBuilder.withArgName("port" ).hasArg().withLongOpt(ArgumentName.PROXY_PORT)
246
.withDescription("The proxy port to use when downloading resources." )
247
.create(ArgumentName.PROXY_PORT_SHORT);
248
- 249 0 final Option proxyUsername = OptionBuilder.withArgName("user" ).hasArg().withLongOpt(ArgumentName.PROXY_USERNAME)
+ 249 9 final Option proxyUsername = OptionBuilder.withArgName("user" ).hasArg().withLongOpt(ArgumentName.PROXY_USERNAME)
250
.withDescription("The proxy username to use when downloading resources." )
251
.create();
252
- 253 0 final Option proxyPassword = OptionBuilder.withArgName("pass" ).hasArg().withLongOpt(ArgumentName.PROXY_PASSWORD)
+ 253 9 final Option proxyPassword = OptionBuilder.withArgName("pass" ).hasArg().withLongOpt(ArgumentName.PROXY_PASSWORD)
254
.withDescription("The proxy password to use when downloading resources." )
255
.create();
256
- 257 0 final Option connectionString = OptionBuilder.withArgName("connStr" ).hasArg().withLongOpt(ArgumentName.CONNECTION_STRING)
+ 257 9 final Option connectionString = OptionBuilder.withArgName("connStr" ).hasArg().withLongOpt(ArgumentName.CONNECTION_STRING)
258
.withDescription("The connection string to the database." )
259
.create();
260
- 261 0 final Option dbUser = OptionBuilder.withArgName("user" ).hasArg().withLongOpt(ArgumentName.DB_NAME)
+ 261 9 final Option dbUser = OptionBuilder.withArgName("user" ).hasArg().withLongOpt(ArgumentName.DB_NAME)
262
.withDescription("The username used to connect to the database." )
263
.create();
264
- 265 0 final Option dbPassword = OptionBuilder.withArgName("password" ).hasArg().withLongOpt(ArgumentName.DB_PASSWORD)
+ 265 9 final Option dbPassword = OptionBuilder.withArgName("password" ).hasArg().withLongOpt(ArgumentName.DB_PASSWORD)
266
.withDescription("The password for connecting to the database." )
267
.create();
268
- 269 0 final Option dbDriver = OptionBuilder.withArgName("driver" ).hasArg().withLongOpt(ArgumentName.DB_DRIVER)
+ 269 9 final Option dbDriver = OptionBuilder.withArgName("driver" ).hasArg().withLongOpt(ArgumentName.DB_DRIVER)
270
.withDescription("The database driver name." )
271
.create();
272
- 273 0 final Option dbDriverPath = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.DB_DRIVER_PATH)
+ 273 9 final Option dbDriverPath = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.DB_DRIVER_PATH)
274
.withDescription("The path to the database driver; note, this does not need to be set unless the JAR is outside of the classpath." )
275
.create();
276
- 277 0 final Option disableJarAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_JAR)
+ 277 9 final Option disableJarAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_JAR)
278
.withDescription("Disable the Jar Analyzer." )
279
.create();
- 280 0 final Option disableArchiveAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_ARCHIVE)
+ 280 9 final Option disableArchiveAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_ARCHIVE)
281
.withDescription("Disable the Archive Analyzer." )
282
.create();
- 283 0 final Option disableNuspecAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_NUSPEC)
+ 283 9 final Option disableNuspecAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_NUSPEC)
284
.withDescription("Disable the Nuspec Analyzer." )
285
.create();
- 286 0 final Option disableAssemblyAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_ASSEMBLY)
+ 286 9 final Option disableAssemblyAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_ASSEMBLY)
287
.withDescription("Disable the .NET Assembly Analyzer." )
288
.create();
289
- 290 0 final Option disableNexusAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_NEXUS)
+ 290 9 final Option disableNexusAnalyzer = OptionBuilder.withLongOpt(ArgumentName.DISABLE_NEXUS)
291
.withDescription("Disable the Nexus Analyzer." )
292
.create();
293
- 294 0 final Option nexusUrl = OptionBuilder.withArgName("url" ).hasArg().withLongOpt(ArgumentName.NEXUS_URL)
+ 294 9 final Option nexusUrl = OptionBuilder.withArgName("url" ).hasArg().withLongOpt(ArgumentName.NEXUS_URL)
295
.withDescription("The url to the Nexus Server." )
296
.create();
297
- 298 0 final Option nexusUsesProxy = OptionBuilder.withArgName("true/false" ).hasArg().withLongOpt(ArgumentName.NEXUS_USES_PROXY)
+ 298 9 final Option nexusUsesProxy = OptionBuilder.withArgName("true/false" ).hasArg().withLongOpt(ArgumentName.NEXUS_USES_PROXY)
299
.withDescription("Whether or not the configured proxy should be used when connecting to Nexus." )
300
.create();
301
- 302 0 final Option additionalZipExtensions = OptionBuilder.withArgName("extensions" ).hasArg()
+ 302 9 final Option additionalZipExtensions = OptionBuilder.withArgName("extensions" ).hasArg()
303
.withLongOpt(ArgumentName.ADDITIONAL_ZIP_EXTENSIONS)
304
- .withDescription("A comma seperated list of additional extensions to be scanned as ZIP files "
+ .withDescription("A comma separated list of additional extensions to be scanned as ZIP files " 305
+ "(ZIP, EAR, WAR are already treated as zip files)" )
306
.create();
307
- 308 0 final Option pathToMono = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.PATH_TO_MONO)
+ 308 9 final Option pathToMono = OptionBuilder.withArgName("path" ).hasArg().withLongOpt(ArgumentName.PATH_TO_MONO)
309
.withDescription("The path to Mono for .NET Assembly analysis on non-windows systems." )
310
.create();
311
- 312 0 options.addOption(proxyPort)
+ 312 9 options.addOption(proxyPort)
313
.addOption(proxyUrl)
314
@@ -608,7 +608,7 @@
.addOption(additionalZipExtensions)
331
.addOption(pathToMono);
- 332 0 }
+ 332 9 }
333
334
@@ -623,7 +623,7 @@
339
public boolean isGetVersion() {
- 340 0 return (line != null ) && line.hasOption(ArgumentName.VERSION);
+ 340 7 return (line != null ) && line.hasOption(ArgumentName.VERSION);
341
}
342
@@ -640,7 +640,7 @@
348
public boolean isGetHelp() {
- 349 0 return (line != null ) && line.hasOption(ArgumentName.HELP);
+ 349 7 return (line != null ) && line.hasOption(ArgumentName.HELP);
350
}
351
@@ -657,7 +657,7 @@
357
public boolean isRunScan() {
- 358 0 return (line != null ) && isValid && line.hasOption(ArgumentName.SCAN);
+ 358 15 return (line != null ) && isValid && line.hasOption(ArgumentName.SCAN);
359
}
360
@@ -813,14 +813,14 @@
442
public void printHelp() {
- 443 0 final HelpFormatter formatter = new HelpFormatter();
- 444 0 final Options options = new Options();
- 445 0 addStandardOptions(options);
- 446 0 if (line != null && line.hasOption(ArgumentName.ADVANCED_HELP)) {
+ 443 2 final HelpFormatter formatter = new HelpFormatter();
+ 444 2 final Options options = new Options();
+ 445 2 addStandardOptions(options);
+ 446 2 if (line != null && line.hasOption(ArgumentName.ADVANCED_HELP)) {
447 0 addAdvancedOptions(options);
448
}
- 449 0 final String helpMsg = String.format("%n%s"
+ 449 2 final String helpMsg = String.format("%n%s"
450
+ " can be used to identify if there are any known CVE vulnerabilities in libraries utilized by an application. "
451
@@ -831,7 +831,7 @@
Settings.getString("application.name" , "DependencyCheck" ));
454
- 455 0 formatter.printHelp(Settings.getString("application.name" , "DependencyCheck" ),
+ 455 2 formatter.printHelp(Settings.getString("application.name" , "DependencyCheck" ),
456
helpMsg,
457
@@ -842,7 +842,7 @@
true );
460
- 461 0 }
+ 461 2 }
462
463
@@ -857,7 +857,7 @@
468
public String[] getScanFiles() {
- 469 0 return line.getOptionValues(ArgumentName.SCAN);
+ 469 3 return line.getOptionValues(ArgumentName.SCAN);
470
}
471
@@ -874,7 +874,7 @@
477
public String getReportDirectory() {
- 478 0 return line.getOptionValue(ArgumentName.OUT, "." );
+ 478 1 return line.getOptionValue(ArgumentName.OUT, "." );
479
}
480
@@ -891,7 +891,7 @@
486
public String getPathToMono() {
- 487 0 return line.getOptionValue(ArgumentName.PATH_TO_MONO);
+ 487 1 return line.getOptionValue(ArgumentName.PATH_TO_MONO);
488
}
489
@@ -1083,7 +1083,7 @@
589
public String getSuppressionFile() {
- 590 0 return line.getOptionValue(ArgumentName.SUPPRESION_FILE);
+ 590 0 return line.getOptionValue(ArgumentName.SUPPRESSION_FILE);
591
}
592
@@ -1102,13 +1102,13 @@
599
public void printVersionInfo() {
- 600 0 final String version = String.format("%s version %s" ,
+ 600 1 final String version = String.format("%s version %s" ,
601
Settings.getString("application.name" , "DependencyCheck" ),
602
Settings.getString("application.version" , "Unknown" ));
- 603 0 System.out.println(version);
- 604 0 }
+ 603 1 System.out.println(version);
+ 604 1 }
605
606
@@ -1481,7 +1481,7 @@
793
794
- public static final String SUPPRESION_FILE = "suppression" ;
+ public static final String SUPPRESSION_FILE = "suppression" ; 795
796
@@ -1600,6 +1600,6 @@
}
-
+
diff --git a/dependency-check-cli/dependency-updates-report.html b/dependency-check-cli/dependency-updates-report.html
index db84e4ec8..6c0b925bd 100644
--- a/dependency-check-cli/dependency-updates-report.html
+++ b/dependency-check-cli/dependency-updates-report.html
@@ -1,13 +1,13 @@
dependency-check-cli - Dependency Updates Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -176,16 +176,9 @@
-
+
-
-
-
-
-
-
+ PMD
@@ -308,7 +301,7 @@
org.owasp
dependency-check-core
-1.1.4
+1.2.0
compile
jar
@@ -393,7 +386,7 @@
dependency-check-core
Current Version
-1.1.4
+1.2.0
Scope
compile
diff --git a/dependency-check-cli/findbugs.html b/dependency-check-cli/findbugs.html
index ea7aaab90..0a6362007 100644
--- a/dependency-check-cli/findbugs.html
+++ b/dependency-check-cli/findbugs.html
@@ -1,13 +1,13 @@
dependency-check-cli - FindBugs Bug Detector Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -178,16 +178,9 @@
-
+
-
-
-
-
-
-
+ PMD
diff --git a/dependency-check-cli/index.html b/dependency-check-cli/index.html
index 6a3b8aa2a..1f171e1b1 100644
--- a/dependency-check-cli/index.html
+++ b/dependency-check-cli/index.html
@@ -1,13 +1,13 @@
dependency-check-cli - About
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -126,7 +126,7 @@
-
+
diff --git a/dependency-check-cli/installation.html b/dependency-check-cli/installation.html
index c8e66fe94..3b6afb41c 100644
--- a/dependency-check-cli/installation.html
+++ b/dependency-check-cli/installation.html
@@ -1,13 +1,13 @@
dependency-check-cli - Installation & Usage
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -103,7 +103,7 @@
-
+
@@ -153,7 +153,7 @@
Installation & Usage
-
Download the dependency-check command line tool here . Extract the zip file to a location on your computer and put the ‘bin’ directory into the path environment variable. On *nix systems you will likely need to make the shell script executable:
+
Download the dependency-check command line tool here . Extract the zip file to a location on your computer and put the ‘bin’ directory into the path environment variable. On *nix systems you will likely need to make the shell script executable:
$ chmod +777 dependency-check.sh
diff --git a/dependency-check-cli/license.html b/dependency-check-cli/license.html
index 2504c0b4b..12c267944 100644
--- a/dependency-check-cli/license.html
+++ b/dependency-check-cli/license.html
@@ -1,13 +1,13 @@
dependency-check-cli - Project License
-
+
/
@@ -67,9 +67,9 @@
-
| Last Published: 2014-03-29
+
| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -126,7 +126,7 @@
-
+
@@ -181,210 +181,7 @@
Project License
The Apache Software License, Version 2.0
-
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
+
Can't read the url [http://www.apache.org/licenses/LICENSE-2.0.txt] : connect timed out
diff --git a/dependency-check-cli/plugin-updates-report.html b/dependency-check-cli/plugin-updates-report.html
index 410d0e92e..02664a95a 100644
--- a/dependency-check-cli/plugin-updates-report.html
+++ b/dependency-check-cli/plugin-updates-report.html
@@ -1,13 +1,13 @@
dependency-check-cli - Plugin Updates Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
-
+
@@ -176,16 +176,9 @@
-
+
-
-
-
-
-
-
+ PMD
diff --git a/dependency-check-cli/pmd.html b/dependency-check-cli/pmd.html
index 76f349c9e..3fcc2f40c 100644
--- a/dependency-check-cli/pmd.html
+++ b/dependency-check-cli/pmd.html
@@ -1,13 +1,13 @@
dependency-check-cli - PMD Results
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -176,16 +176,9 @@
Checkstyle
-
-
-
-
-
-
-
@@ -240,7 +233,7 @@
PMD Results
-
The following document contains the results of PMD 5.0.2.
+The following document contains the results of PMD 5.0.5.
Files
@@ -251,31 +244,31 @@
Line
Useless parentheses.
-340
+
340
Useless parentheses.
-349
+
349
Useless parentheses.
-358
+
358
Useless parentheses.
-367
+
367
Useless parentheses.
-376
+
376
Useless parentheses.
-385
+
385
Useless parentheses.
-394
+
394
Useless parentheses.
-403
+
403
Useless parentheses.
-613
+613
diff --git a/dependency-check-cli/project-info.html b/dependency-check-cli/project-info.html
index 292785d19..3f1bc8dd0 100644
--- a/dependency-check-cli/project-info.html
+++ b/dependency-check-cli/project-info.html
@@ -1,13 +1,13 @@
dependency-check-cli - Project Information
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -126,7 +126,7 @@
-
+
diff --git a/dependency-check-cli/project-reports.html b/dependency-check-cli/project-reports.html
index d8849c3c8..014ed9264 100644
--- a/dependency-check-cli/project-reports.html
+++ b/dependency-check-cli/project-reports.html
@@ -1,13 +1,13 @@
dependency-check-cli - Generated Reports
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
-
+
-
+
-
-
-
-
-
-
+ PMD
@@ -275,12 +268,9 @@
Checkstyle Report on coding style conventions.
-CPD Report Duplicate code detection.
-
-PMD Report PMD Verification of coding rules.
-
+
FindBugs Report Generates a source code report with the FindBugs Library.
diff --git a/dependency-check-cli/project-summary.html b/dependency-check-cli/project-summary.html
index c2a475f8c..010b647bd 100644
--- a/dependency-check-cli/project-summary.html
+++ b/dependency-check-cli/project-summary.html
@@ -1,13 +1,13 @@
dependency-check-cli - Project Summary
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -126,7 +126,7 @@
-
+
@@ -218,7 +218,7 @@
dependency-check-cli
Version
-1.1.4
+1.2.0
Type
jar
diff --git a/dependency-check-cli/surefire-report.html b/dependency-check-cli/surefire-report.html
index 6bf44fbd6..66f6c58d5 100644
--- a/dependency-check-cli/surefire-report.html
+++ b/dependency-check-cli/surefire-report.html
@@ -1,13 +1,13 @@
dependency-check-cli - Surefire Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -176,16 +176,9 @@
-
+
-
-
-
-
-
-
+ PMD
@@ -258,7 +251,8 @@ function toggleDisplay(elementId) {
-
Summary
+
Summary
+
[Summary ] [Package List ] [Test Cases ]
Tests
@@ -268,13 +262,97 @@ function toggleDisplay(elementId) {
Success Rate
Time
+9
0
0
0
-0
-0%
-0
+
100%
+
0.039
Note: failures are anticipated and checked for with assertions while errors are unanticipated.
+
Package List
+
[Summary ] [Package List ] [Test Cases ]
+
+
Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
+
+
org.owasp.dependencycheck.cli
+
+
+Class
+Tests
+Errors
+Failures
+Skipped
+Success Rate
+Time
+
+CliParserTest 9
+0
+0
+0
+100%
+0.039
dependency-check-cli - Tag List report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -176,16 +176,9 @@
-
+
-
-
-
-
-
-
+ PMD
diff --git a/dependency-check-cli/xref-test/index.html b/dependency-check-cli/xref-test/index.html
index 191524f0d..3239dc502 100644
--- a/dependency-check-cli/xref-test/index.html
+++ b/dependency-check-cli/xref-test/index.html
@@ -4,7 +4,7 @@
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
diff --git a/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/CliParserTest.html b/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/CliParserTest.html
index e5982026e..61127e20c 100644
--- a/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/CliParserTest.html
+++ b/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/CliParserTest.html
@@ -37,244 +37,247 @@
29 import org.junit.Before;
30 import org.junit.BeforeClass;
31 import org.junit.Test;
-32
-33
-34
-35
-36
-37 public class CliParserTest {
-38
-39 @BeforeClass
-40 public static void setUpClass() throws Exception {
-41 }
-42
-43 @AfterClass
-44 public static void tearDownClass() throws Exception {
-45 }
-46
-47 @Before
-48 public void setUp() throws Exception {
-49 }
-50
-51 @After
-52 public void tearDown() throws Exception {
-53 }
-54
-55
-56
-57
-58
-59
-60 @Test
-61 public void testParse() throws Exception {
-62
-63 String[] args = {};
-64 PrintStream out = System.out;
+32 import org.owasp.dependencycheck.utils.Settings;
+33
+34
+35
+36
+37
+38 public class CliParserTest {
+39
+40 @BeforeClass
+41 public static void setUpClass() throws Exception {
+42 Settings.initialize();
+43 }
+44
+45 @AfterClass
+46 public static void tearDownClass() throws Exception {
+47 Settings.cleanup();
+48 }
+49
+50 @Before
+51 public void setUp() throws Exception {
+52 }
+53
+54 @After
+55 public void tearDown() throws Exception {
+56 }
+57
+58
+59
+60
+61
+62
+63 @Test
+64 public void testParse() throws Exception {
65
-66 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-67 System.setOut(new PrintStream(baos));
+66 String[] args = {};
+67 PrintStream out = System.out;
68
-69 CliParser instance = new CliParser();
-70 instance.parse(args);
+69 ByteArrayOutputStream baos = new ByteArrayOutputStream();
+70 System.setOut(new PrintStream(baos));
71
-72 Assert.assertFalse(instance.isGetVersion());
-73 Assert.assertFalse(instance.isGetHelp());
-74 Assert.assertFalse(instance.isRunScan());
-75 }
-76
-77
-78
-79
-80
-81
-82 @Test
-83 public void testParse_help() throws Exception {
-84
-85 String[] args = {"-help" };
-86 PrintStream out = System.out;
+72 CliParser instance = new CliParser();
+73 instance.parse(args);
+74
+75 Assert.assertFalse(instance.isGetVersion());
+76 Assert.assertFalse(instance.isGetHelp());
+77 Assert.assertFalse(instance.isRunScan());
+78 }
+79
+80
+81
+82
+83
+84
+85 @Test
+86 public void testParse_help() throws Exception {
87
-88 CliParser instance = new CliParser();
-89 instance.parse(args);
+88 String[] args = {"-help" };
+89 PrintStream out = System.out;
90
-91 Assert.assertFalse(instance.isGetVersion());
-92 Assert.assertTrue(instance.isGetHelp());
-93 Assert.assertFalse(instance.isRunScan());
-94 }
-95
-96
-97
-98
-99
-100
-101 @Test
-102 public void testParse_version() throws Exception {
-103
-104 String[] args = {"-version" };
-105
-106 CliParser instance = new CliParser();
-107 instance.parse(args);
-108 Assert.assertTrue(instance.isGetVersion());
-109 Assert.assertFalse(instance.isGetHelp());
-110 Assert.assertFalse(instance.isRunScan());
-111
-112 }
-113
-114
-115
-116
-117
-118
-119 @Test
-120 public void testParse_unknown() throws Exception {
-121
-122 String[] args = {"-unknown" };
-123
-124 PrintStream out = System.out;
-125 PrintStream err = System.err;
-126 ByteArrayOutputStream baos_out = new ByteArrayOutputStream();
-127 ByteArrayOutputStream baos_err = new ByteArrayOutputStream();
-128 System.setOut(new PrintStream(baos_out));
-129 System.setErr(new PrintStream(baos_err));
-130
-131 CliParser instance = new CliParser();
-132
-133 try {
-134 instance.parse(args);
-135 } catch (ParseException ex) {
-136 Assert.assertTrue(ex.getMessage().contains("Unrecognized option" ));
-137 }
-138 Assert.assertFalse(instance.isGetVersion());
-139 Assert.assertFalse(instance.isGetHelp());
-140 Assert.assertFalse(instance.isRunScan());
-141 }
-142
-143
-144
-145
-146
-147
-148 @Test
-149 public void testParse_scan() throws Exception {
-150
-151 String[] args = {"-scan" };
-152
-153 CliParser instance = new CliParser();
-154
-155 try {
-156 instance.parse(args);
-157 } catch (ParseException ex) {
-158 Assert.assertTrue(ex.getMessage().contains("Missing argument" ));
-159 }
-160
-161 Assert.assertFalse(instance.isGetVersion());
-162 Assert.assertFalse(instance.isGetHelp());
-163 Assert.assertFalse(instance.isRunScan());
-164 }
-165
-166
-167
-168
-169
-170
-171 @Test
-172 public void testParse_scan_unknownFile() throws Exception {
-173
-174 String[] args = {"-scan" , "jar.that.does.not.exist" , "-app" , "test" };
-175
-176 CliParser instance = new CliParser();
-177 try {
-178 instance.parse(args);
-179 } catch (FileNotFoundException ex) {
-180 Assert.assertTrue(ex.getMessage().contains("Invalid 'scan' argument" ));
-181 }
-182
-183 Assert.assertFalse(instance.isGetVersion());
-184 Assert.assertFalse(instance.isGetHelp());
-185 Assert.assertFalse(instance.isRunScan());
-186 }
-187
-188
-189
-190
-191
-192
-193 @Test
-194 public void testParse_scan_withFileExists() throws Exception {
-195 File path = new File(this .getClass().getClassLoader().getResource("checkSumTest.file" ).getPath());
-196 String[] args = {"-scan" , path.getCanonicalPath(), "-out" , "./" , "-app" , "test" };
-197
-198 CliParser instance = new CliParser();
-199 instance.parse(args);
+91 CliParser instance = new CliParser();
+92 instance.parse(args);
+93
+94 Assert.assertFalse(instance.isGetVersion());
+95 Assert.assertTrue(instance.isGetHelp());
+96 Assert.assertFalse(instance.isRunScan());
+97 }
+98
+99
+100
+101
+102
+103
+104 @Test
+105 public void testParse_version() throws Exception {
+106
+107 String[] args = {"-version" };
+108
+109 CliParser instance = new CliParser();
+110 instance.parse(args);
+111 Assert.assertTrue(instance.isGetVersion());
+112 Assert.assertFalse(instance.isGetHelp());
+113 Assert.assertFalse(instance.isRunScan());
+114
+115 }
+116
+117
+118
+119
+120
+121
+122 @Test
+123 public void testParse_unknown() throws Exception {
+124
+125 String[] args = {"-unknown" };
+126
+127 PrintStream out = System.out;
+128 PrintStream err = System.err;
+129 ByteArrayOutputStream baos_out = new ByteArrayOutputStream();
+130 ByteArrayOutputStream baos_err = new ByteArrayOutputStream();
+131 System.setOut(new PrintStream(baos_out));
+132 System.setErr(new PrintStream(baos_err));
+133
+134 CliParser instance = new CliParser();
+135
+136 try {
+137 instance.parse(args);
+138 } catch (ParseException ex) {
+139 Assert.assertTrue(ex.getMessage().contains("Unrecognized option" ));
+140 }
+141 Assert.assertFalse(instance.isGetVersion());
+142 Assert.assertFalse(instance.isGetHelp());
+143 Assert.assertFalse(instance.isRunScan());
+144 }
+145
+146
+147
+148
+149
+150
+151 @Test
+152 public void testParse_scan() throws Exception {
+153
+154 String[] args = {"-scan" };
+155
+156 CliParser instance = new CliParser();
+157
+158 try {
+159 instance.parse(args);
+160 } catch (ParseException ex) {
+161 Assert.assertTrue(ex.getMessage().contains("Missing argument" ));
+162 }
+163
+164 Assert.assertFalse(instance.isGetVersion());
+165 Assert.assertFalse(instance.isGetHelp());
+166 Assert.assertFalse(instance.isRunScan());
+167 }
+168
+169
+170
+171
+172
+173
+174 @Test
+175 public void testParse_scan_unknownFile() throws Exception {
+176
+177 String[] args = {"-scan" , "jar.that.does.not.exist" , "-app" , "test" };
+178
+179 CliParser instance = new CliParser();
+180 try {
+181 instance.parse(args);
+182 } catch (FileNotFoundException ex) {
+183 Assert.assertTrue(ex.getMessage().contains("Invalid 'scan' argument" ));
+184 }
+185
+186 Assert.assertFalse(instance.isGetVersion());
+187 Assert.assertFalse(instance.isGetHelp());
+188 Assert.assertFalse(instance.isRunScan());
+189 }
+190
+191
+192
+193
+194
+195
+196 @Test
+197 public void testParse_scan_withFileExists() throws Exception {
+198 File path = new File(this .getClass().getClassLoader().getResource("checkSumTest.file" ).getPath());
+199 String[] args = {"-scan" , path.getCanonicalPath(), "-out" , "./" , "-app" , "test" };
200
-201 Assert.assertEquals(path.getCanonicalPath(), instance.getScanFiles()[0]);
-202
-203 Assert.assertFalse(instance.isGetVersion());
-204 Assert.assertFalse(instance.isGetHelp());
-205 Assert.assertTrue(instance.isRunScan());
-206 }
-207
-208
-209
-210
-211
-212
-213 @Test
-214 public void testParse_printVersionInfo() throws Exception {
-215
-216 PrintStream out = System.out;
-217 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-218 System.setOut(new PrintStream(baos));
-219
-220 CliParser instance = new CliParser();
-221 instance.printVersionInfo();
-222 try {
-223 baos.flush();
-224 String text = (new String(baos.toByteArray())).toLowerCase();
-225 String[] lines = text.split(System.getProperty("line.separator" ));
-226 Assert.assertEquals(1, lines.length);
-227 Assert.assertTrue(text.contains("version" ));
-228 Assert.assertTrue(!text.contains("unknown" ));
-229 } catch (IOException ex) {
-230 System.setOut(out);
-231 Assert.fail("CliParser.printVersionInfo did not write anything to system.out." );
-232 } finally {
+201 CliParser instance = new CliParser();
+202 instance.parse(args);
+203
+204 Assert.assertEquals(path.getCanonicalPath(), instance.getScanFiles()[0]);
+205
+206 Assert.assertFalse(instance.isGetVersion());
+207 Assert.assertFalse(instance.isGetHelp());
+208 Assert.assertTrue(instance.isRunScan());
+209 }
+210
+211
+212
+213
+214
+215
+216 @Test
+217 public void testParse_printVersionInfo() throws Exception {
+218
+219 PrintStream out = System.out;
+220 ByteArrayOutputStream baos = new ByteArrayOutputStream();
+221 System.setOut(new PrintStream(baos));
+222
+223 CliParser instance = new CliParser();
+224 instance.printVersionInfo();
+225 try {
+226 baos.flush();
+227 String text = (new String(baos.toByteArray())).toLowerCase();
+228 String[] lines = text.split(System.getProperty("line.separator" ));
+229 Assert.assertEquals(1, lines.length);
+230 Assert.assertTrue(text.contains("version" ));
+231 Assert.assertTrue(!text.contains("unknown" ));
+232 } catch (IOException ex) {
233 System.setOut(out);
-234 }
-235 }
-236
-237
-238
-239
-240
-241
-242 @Test
-243 public void testParse_printHelp() throws Exception {
-244
-245 PrintStream out = System.out;
-246 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-247 System.setOut(new PrintStream(baos));
-248
-249 CliParser instance = new CliParser();
-250 String[] args = {"-h" };
-251 instance.parse(args);
-252 instance.printHelp();
-253 args[0] = "-ah" ;
+234 Assert.fail("CliParser.printVersionInfo did not write anything to system.out." );
+235 } finally {
+236 System.setOut(out);
+237 }
+238 }
+239
+240
+241
+242
+243
+244
+245 @Test
+246 public void testParse_printHelp() throws Exception {
+247
+248 PrintStream out = System.out;
+249 ByteArrayOutputStream baos = new ByteArrayOutputStream();
+250 System.setOut(new PrintStream(baos));
+251
+252 CliParser instance = new CliParser();
+253 String[] args = {"-h" };
254 instance.parse(args);
255 instance.printHelp();
-256 try {
-257 baos.flush();
-258 String text = (new String(baos.toByteArray()));
-259 String[] lines = text.split(System.getProperty("line.separator" ));
-260 Assert.assertTrue(lines[0].startsWith("usage: " ));
-261 Assert.assertTrue((lines.length > 2));
-262 } catch (IOException ex) {
-263 System.setOut(out);
-264 Assert.fail("CliParser.printVersionInfo did not write anything to system.out." );
-265 } finally {
+256 args[0] = "-ah" ;
+257 instance.parse(args);
+258 instance.printHelp();
+259 try {
+260 baos.flush();
+261 String text = (new String(baos.toByteArray()));
+262 String[] lines = text.split(System.getProperty("line.separator" ));
+263 Assert.assertTrue(lines[0].startsWith("usage: " ));
+264 Assert.assertTrue((lines.length > 2));
+265 } catch (IOException ex) {
266 System.setOut(out);
-267 }
-268 }
-269 }
+267 Assert.fail("CliParser.printVersionInfo did not write anything to system.out." );
+268 } finally {
+269 System.setOut(out);
+270 }
+271 }
+272 }
Dependency-Check Command Line 1.1.4 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.2.0 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.1.4 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.2.0 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
diff --git a/dependency-check-cli/xref/index.html b/dependency-check-cli/xref/index.html
index 191524f0d..3239dc502 100644
--- a/dependency-check-cli/xref/index.html
+++ b/dependency-check-cli/xref/index.html
@@ -4,7 +4,7 @@
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
diff --git a/dependency-check-cli/xref/org/owasp/dependencycheck/App.html b/dependency-check-cli/xref/org/owasp/dependencycheck/App.html
index 1be7776f3..130d57593 100644
--- a/dependency-check-cli/xref/org/owasp/dependencycheck/App.html
+++ b/dependency-check-cli/xref/org/owasp/dependencycheck/App.html
@@ -55,214 +55,222 @@
47 private static final String LOG_PROPERTIES_FILE = "log.properties" ;
48
49
-50
-51
-52
-53
-54 public static void main(String[] args) {
-55 final App app = new App ();
-56 app.run(args);
-57 }
-58
-59
-60
-61
-62
-63
-64 public void run(String[] args) {
-65
-66 final CliParser cli = new CliParser ();
-67 try {
-68 cli.parse(args);
-69 } catch (FileNotFoundException ex) {
-70 System.err.println(ex.getMessage());
-71 cli.printHelp();
-72 return ;
-73 } catch (ParseException ex) {
-74 System.err.println(ex.getMessage());
-75 cli.printHelp();
-76 return ;
-77 }
-78
-79 final InputStream in = App.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
-80 LogUtils.prepareLogger(in, cli.getVerboseLog());
-81
-82 if (cli.isGetVersion()) {
-83 cli.printVersionInfo();
-84 } else if (cli.isRunScan()) {
-85 updateSettings(cli);
-86 runScan(cli.getReportDirectory(), cli.getReportFormat(), cli.getApplicationName(), cli.getScanFiles());
-87 } else {
-88 cli.printHelp();
-89 }
-90 }
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100 private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files) {
-101 Engine scanner = null ;
-102 try {
-103 scanner = new Engine();
-104
-105 for (String file : files) {
-106 scanner.scan(file);
-107 }
-108
-109 scanner.analyzeDependencies();
-110 final List<Dependency> dependencies = scanner.getDependencies();
-111 DatabaseProperties prop = null ;
-112 CveDB cve = null ;
-113 try {
-114 cve = new CveDB();
-115 cve.open();
-116 prop = cve.getDatabaseProperties();
-117 } catch (DatabaseException ex) {
-118 Logger.getLogger(App.class .getName()).log(Level.FINE, "Unable to retrieve DB Properties" , ex);
-119 } finally {
-120 if (cve != null ) {
-121 cve.close();
-122 }
-123 }
-124 final ReportGenerator report = new ReportGenerator(applicationName, dependencies, scanner.getAnalyzers(), prop);
-125 try {
-126 report.generateReports(reportDirectory, outputFormat);
-127 } catch (IOException ex) {
-128 Logger.getLogger(App.class .getName()).log(Level.SEVERE, "There was an IO error while attempting to generate the report." );
-129 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-130 } catch (Throwable ex) {
-131 Logger.getLogger(App.class .getName()).log(Level.SEVERE, "There was an error while attempting to generate the report." );
-132 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-133 }
-134 } catch (DatabaseException ex) {
-135 Logger.getLogger(App.class .getName()).log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped" );
-136 Logger.getLogger(App.class .getName()).log(Level.FINE, "" , ex);
-137 } finally {
-138 if (scanner != null ) {
-139 scanner.cleanup();
-140 }
-141 }
-142 }
-143
-144
-145
-146
-147
-148
-149
-150 private void updateSettings(CliParser cli) {
-151
-152 final boolean autoUpdate = cli.isAutoUpdate();
-153 final String connectionTimeout = cli.getConnectionTimeout();
-154 final String proxyUrl = cli.getProxyUrl();
-155 final String proxyPort = cli.getProxyPort();
-156 final String proxyUser = cli.getProxyUsername();
-157 final String proxyPass = cli.getProxyPassword();
-158 final String dataDirectory = cli.getDataDirectory();
-159 final File propertiesFile = cli.getPropertiesFile();
-160 final String suppressionFile = cli.getSuppressionFile();
-161 final boolean jarDisabled = cli.isJarDisabled();
-162 final boolean archiveDisabled = cli.isArchiveDisabled();
-163 final boolean assemblyDisabled = cli.isAssemblyDisabled();
-164 final boolean nuspecDisabled = cli.isNuspecDisabled();
-165 final boolean nexusDisabled = cli.isNexusDisabled();
-166 final String nexusUrl = cli.getNexusUrl();
-167 final String databaseDriverName = cli.getDatabaseDriverName();
-168 final String databaseDriverPath = cli.getDatabaseDriverPath();
-169 final String connectionString = cli.getConnectionString();
-170 final String databaseUser = cli.getDatabaseUser();
-171 final String databasePassword = cli.getDatabasePassword();
-172 final String additionalZipExtensions = cli.getAdditionalZipExtensions();
-173 final String pathToMono = cli.getPathToMono();
-174
-175 if (propertiesFile != null ) {
-176 try {
-177 Settings.mergeProperties(propertiesFile);
-178 } catch (FileNotFoundException ex) {
-179 final String msg = String.format("Unable to load properties file '%s'" , propertiesFile.getPath());
-180 Logger.getLogger(App.class .getName()).log(Level.SEVERE, msg);
-181 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-182 } catch (IOException ex) {
-183 final String msg = String.format("Unable to find properties file '%s'" , propertiesFile.getPath());
-184 Logger.getLogger(App.class .getName()).log(Level.SEVERE, msg);
-185 Logger.getLogger(App.class .getName()).log(Level.FINE, null , ex);
-186 }
-187 }
-188
-189
-190
-191 final boolean nexusUsesProxy = cli.isNexusUsesProxy();
-192 if (dataDirectory != null ) {
-193 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
-194 } else if (System.getProperty("basedir" ) != null ) {
-195 final File dataDir = new File(System.getProperty("basedir" ), "data" );
-196 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-197 } else {
-198 final File jarPath = new File(App.class .getProtectionDomain().getCodeSource().getLocation().getPath());
-199 final File base = jarPath.getParentFile();
-200 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
-201 final File dataDir = new File(base, sub);
-202 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-203 }
-204 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-205 if (proxyUrl != null && !proxyUrl.isEmpty()) {
-206 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
-207 }
-208 if (proxyPort != null && !proxyPort.isEmpty()) {
-209 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
-210 }
-211 if (proxyUser != null && !proxyUser.isEmpty()) {
-212 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUser);
-213 }
-214 if (proxyPass != null && !proxyPass.isEmpty()) {
-215 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPass);
-216 }
-217 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
-218 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
-219 }
-220 if (suppressionFile != null && !suppressionFile.isEmpty()) {
-221 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
-222 }
-223
-224
-225 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, !jarDisabled);
-226 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, !archiveDisabled);
-227 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
-228 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
-229
-230 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, !nexusDisabled);
-231 if (nexusUrl != null && !nexusUrl.isEmpty()) {
-232 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
-233 }
-234 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
-235 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
-236 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
-237 }
-238 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
-239 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
-240 }
-241 if (connectionString != null && !connectionString.isEmpty()) {
-242 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
-243 }
-244 if (databaseUser != null && !databaseUser.isEmpty()) {
-245 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
-246 }
-247 if (databasePassword != null && !databasePassword.isEmpty()) {
-248 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
-249 }
-250 if (additionalZipExtensions != null && !additionalZipExtensions.isEmpty()) {
-251 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, additionalZipExtensions);
-252 }
-253 if (pathToMono != null && !pathToMono.isEmpty()) {
-254 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
-255 }
-256 }
-257 }
+50
+51
+52 private static final Logger LOGGER = Logger.getLogger(App.class .getName());
+53
+54
+55
+56
+57
+58
+59 public static void main(String[] args) {
+60 final App app = new App ();
+61 app.run(args);
+62 }
+63
+64
+65
+66
+67
+68
+69 public void run(String[] args) {
+70
+71 final CliParser cli = new CliParser ();
+72 try {
+73 cli.parse(args);
+74 } catch (FileNotFoundException ex) {
+75 System.err.println(ex.getMessage());
+76 cli.printHelp();
+77 return ;
+78 } catch (ParseException ex) {
+79 System.err.println(ex.getMessage());
+80 cli.printHelp();
+81 return ;
+82 }
+83
+84 final InputStream in = App.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
+85 LogUtils.prepareLogger(in, cli.getVerboseLog());
+86
+87 if (cli.isGetVersion()) {
+88 cli.printVersionInfo();
+89 } else if (cli.isRunScan()) {
+90 populateSettings(cli);
+91 runScan(cli.getReportDirectory(), cli.getReportFormat(), cli.getApplicationName(), cli.getScanFiles());
+92 } else {
+93 cli.printHelp();
+94 }
+95 }
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105 private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files) {
+106 Engine scanner = null ;
+107 try {
+108 scanner = new Engine();
+109
+110 for (String file : files) {
+111 scanner.scan(file);
+112 }
+113
+114 scanner.analyzeDependencies();
+115 final List<Dependency> dependencies = scanner.getDependencies();
+116 DatabaseProperties prop = null ;
+117 CveDB cve = null ;
+118 try {
+119 cve = new CveDB();
+120 cve.open();
+121 prop = cve.getDatabaseProperties();
+122 } catch (DatabaseException ex) {
+123 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties" , ex);
+124 } finally {
+125 if (cve != null ) {
+126 cve.close();
+127 }
+128 }
+129 final ReportGenerator report = new ReportGenerator(applicationName, dependencies, scanner.getAnalyzers(), prop);
+130 try {
+131 report.generateReports(reportDirectory, outputFormat);
+132 } catch (IOException ex) {
+133 LOGGER.log(Level.SEVERE, "There was an IO error while attempting to generate the report." );
+134 LOGGER.log(Level.FINE, null , ex);
+135 } catch (Throwable ex) {
+136 LOGGER.log(Level.SEVERE, "There was an error while attempting to generate the report." );
+137 LOGGER.log(Level.FINE, null , ex);
+138 }
+139 } catch (DatabaseException ex) {
+140 LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped" );
+141 LOGGER.log(Level.FINE, "" , ex);
+142 } finally {
+143 Settings.cleanup();
+144 if (scanner != null ) {
+145 scanner.cleanup();
+146 }
+147 }
+148 }
+149
+150
+151
+152
+153
+154
+155
+156 private void populateSettings(CliParser cli) {
+157
+158 Settings.initialize();
+159
+160 final boolean autoUpdate = cli.isAutoUpdate();
+161 final String connectionTimeout = cli.getConnectionTimeout();
+162 final String proxyUrl = cli.getProxyUrl();
+163 final String proxyPort = cli.getProxyPort();
+164 final String proxyUser = cli.getProxyUsername();
+165 final String proxyPass = cli.getProxyPassword();
+166 final String dataDirectory = cli.getDataDirectory();
+167 final File propertiesFile = cli.getPropertiesFile();
+168 final String suppressionFile = cli.getSuppressionFile();
+169 final boolean jarDisabled = cli.isJarDisabled();
+170 final boolean archiveDisabled = cli.isArchiveDisabled();
+171 final boolean assemblyDisabled = cli.isAssemblyDisabled();
+172 final boolean nuspecDisabled = cli.isNuspecDisabled();
+173 final boolean nexusDisabled = cli.isNexusDisabled();
+174 final String nexusUrl = cli.getNexusUrl();
+175 final String databaseDriverName = cli.getDatabaseDriverName();
+176 final String databaseDriverPath = cli.getDatabaseDriverPath();
+177 final String connectionString = cli.getConnectionString();
+178 final String databaseUser = cli.getDatabaseUser();
+179 final String databasePassword = cli.getDatabasePassword();
+180 final String additionalZipExtensions = cli.getAdditionalZipExtensions();
+181 final String pathToMono = cli.getPathToMono();
+182
+183 if (propertiesFile != null ) {
+184 try {
+185 Settings.mergeProperties(propertiesFile);
+186 } catch (FileNotFoundException ex) {
+187 final String msg = String.format("Unable to load properties file '%s'" , propertiesFile.getPath());
+188 LOGGER.log(Level.SEVERE, msg);
+189 LOGGER.log(Level.FINE, null , ex);
+190 } catch (IOException ex) {
+191 final String msg = String.format("Unable to find properties file '%s'" , propertiesFile.getPath());
+192 LOGGER.log(Level.SEVERE, msg);
+193 LOGGER.log(Level.FINE, null , ex);
+194 }
+195 }
+196
+197
+198
+199 final boolean nexusUsesProxy = cli.isNexusUsesProxy();
+200 if (dataDirectory != null ) {
+201 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
+202 } else if (System.getProperty("basedir" ) != null ) {
+203 final File dataDir = new File(System.getProperty("basedir" ), "data" );
+204 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+205 } else {
+206 final File jarPath = new File(App.class .getProtectionDomain().getCodeSource().getLocation().getPath());
+207 final File base = jarPath.getParentFile();
+208 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
+209 final File dataDir = new File(base, sub);
+210 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+211 }
+212 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+213 if (proxyUrl != null && !proxyUrl.isEmpty()) {
+214 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
+215 }
+216 if (proxyPort != null && !proxyPort.isEmpty()) {
+217 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+218 }
+219 if (proxyUser != null && !proxyUser.isEmpty()) {
+220 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUser);
+221 }
+222 if (proxyPass != null && !proxyPass.isEmpty()) {
+223 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPass);
+224 }
+225 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+226 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+227 }
+228 if (suppressionFile != null && !suppressionFile.isEmpty()) {
+229 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
+230 }
+231
+232
+233 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, !jarDisabled);
+234 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, !archiveDisabled);
+235 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
+236 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
+237
+238 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, !nexusDisabled);
+239 if (nexusUrl != null && !nexusUrl.isEmpty()) {
+240 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+241 }
+242 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+243 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+244 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+245 }
+246 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+247 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+248 }
+249 if (connectionString != null && !connectionString.isEmpty()) {
+250 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+251 }
+252 if (databaseUser != null && !databaseUser.isEmpty()) {
+253 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+254 }
+255 if (databasePassword != null && !databasePassword.isEmpty()) {
+256 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
+257 }
+258 if (additionalZipExtensions != null && !additionalZipExtensions.isEmpty()) {
+259 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, additionalZipExtensions);
+260 }
+261 if (pathToMono != null && !pathToMono.isEmpty()) {
+262 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
+263 }
+264 }
+265 }
199 .withDescription("The file path to write verbose logging information." )
200 .create(ArgumentName.VERBOSE_LOG_SHORT);
201
-202 final Option suppressionFile = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.SUPPRESION_FILE)
+202 final Option suppressionFile = OptionBuilder.withArgName("file" ).hasArg().withLongOpt(ArgumentName.SUPPRESSION_FILE)
203 .withDescription("The file path to the suppression XML file." )
204 .create();
205
@@ -309,7 +309,7 @@
301
302 final Option additionalZipExtensions = OptionBuilder.withArgName("extensions" ).hasArg()
303 .withLongOpt(ArgumentName.ADDITIONAL_ZIP_EXTENSIONS)
-304 .withDescription("A comma seperated list of additional extensions to be scanned as ZIP files "
+304 .withDescription("A comma separated list of additional extensions to be scanned as ZIP files "
305 + "(ZIP, EAR, WAR are already treated as zip files)" )
306 .create();
307
@@ -595,7 +595,7 @@
587
588
589 public String getSuppressionFile() {
-590 return line.getOptionValue(ArgumentName.SUPPRESION_FILE);
+590 return line.getOptionValue(ArgumentName.SUPPRESSION_FILE);
591 }
592
593
@@ -799,7 +799,7 @@
791
792
793
-794 public static final String SUPPRESION_FILE = "suppression" ;
+794 public static final String SUPPRESSION_FILE = "suppression" ;
795
796
797
diff --git a/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html b/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html
index f9e52ff34..9e138a482 100644
--- a/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html
+++ b/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Command Line 1.1.4 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.2.0 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.1.4 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.2.0 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.1.4 Reference Package org.owasp.dependencycheck
+ Dependency-Check Command Line 1.2.0 Reference Package org.owasp.dependencycheck
Dependency-Check Command Line 1.1.4 Reference Package org.owasp.dependencycheck
+ Dependency-Check Command Line 1.2.0 Reference Package org.owasp.dependencycheck
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
Dependency-Check Command Line 1.1.4 Reference
+ Dependency-Check Command Line 1.2.0 Reference
diff --git a/dependency-check-core/apidocs/allclasses-frame.html b/dependency-check-core/apidocs/allclasses-frame.html
index 668a41126..64b4d4ac9 100644
--- a/dependency-check-core/apidocs/allclasses-frame.html
+++ b/dependency-check-core/apidocs/allclasses-frame.html
@@ -2,10 +2,10 @@
-
+
All Classes (Dependency-Check Core 1.1.4 API)
-All Classes (Dependency-Check Core 1.2.0 API)
+DriverLoader DriverLoadException Engine EscapeTool Evidence EvidenceCollection Exclusion All Classes (Dependency-Check Core 1.1.4 API)
-All Classes (Dependency-Check Core 1.2.0 API)
+DriverLoader DriverLoadException Engine EscapeTool Evidence EvidenceCollection Exclusion Constant Field Values (Dependency-Check Core 1.1.4 API)
-Constant Field Values (Dependency-Check Core 1.2.0 API)
+Deprecated List (Dependency-Check Core 1.1.4 API)
-Deprecated List (Dependency-Check Core 1.2.0 API)
+API Help (Dependency-Check Core 1.1.4 API)
-API Help (Dependency-Check Core 1.2.0 API)
+Index (Dependency-Check Core 1.1.4 API)
-Index (Dependency-Check Core 1.2.0 API)
+address Notifier
+addSuppressedIdentifier(Identifier) Dependency
+Adds an identifier to the list of suppressed identifiers.
+
+addSuppressedVulnerability(Vulnerability) Dependency
+Adds a vulnerability to the set of suppressed vulnerabilities.
+
addTerm() AbstractTokenizingFilter
Adds a term, if one exists, from the tokens collection.
@@ -362,7 +370,13 @@
The properties key for whether the .NET Nuspec analyzer is enabled.
AnalyzerService org.owasp.dependencycheck.analyzer
+
+The Analyzer Service Loader.
+
+AnalyzerService(ClassLoader) AnalyzerService
+Creates a new instance of AnalyzerService.
+
any Contributor.Properties
any Developer.Properties
A callable object to download two files.
-CallableDownloadTask(NvdCveInfo, ExecutorService, CveDB) CallableDownloadTask CallableDownloadTask(NvdCveInfo, ExecutorService, CveDB, Settings) CallableDownloadTask
Simple constructor for the callable download task.
@@ -594,6 +608,10 @@
Properly cleans up resources allocated during analysis.
+cleanup() Settings
+Cleans up resources to prevent memory leaks.
+
cleanupDatabase() CveDB
It is possible that orphaned rows may be generated during database updates.
@@ -1536,7 +1554,7 @@
endElement(String, String, String) MavenNamespaceFilter
-Indicatees the start of the document.
+Indicates the start of the document.
endElement(String, String, String) SuppressionHandler
@@ -1550,6 +1568,10 @@
Creates a new Engine.
+ Engine(ClassLoader) Engine
+Creates a new Engine using the specified classloader to dynamically load Analyzer and Update services.
+
ENTRY NvdCve12Handler.Element
A node type in the NVD CVE Schema 1.2.
@@ -1600,6 +1622,12 @@
Escapes the text passed in so that it is treated as data instead of control characters.
+ EscapeTool org.owasp.dependencycheck.reporting
+An extremely simple wrapper around various escape utils to perform URL and HTML encoding within the reports.
+
+EscapeTool() EscapeTool
Evidence org.owasp.dependencycheck.dependency
Evidence is a piece of information about a Dependency.
@@ -2632,17 +2660,13 @@
Gets the value of the inherited property.
- getInstance() AnalyzerService
-Retrieve the singleton instance of AnalyzerService.
-
getInstance() CpeMemoryIndex
Gets the singleton instance of the CpeMemoryIndex.
-getInstance() UpdateService getInstance() Settings
-Retrieve the singleton instance of UpdateService.
+Gets the underlying instance of the Settings object.
getInt(String) Settings
@@ -3351,6 +3375,14 @@
Returns the extensions for which this Analyzer runs.
+ getSuppressedIdentifiers() Dependency
+Get the value of suppressedIdentifiers.
+
+getSuppressedVulnerabilities() Dependency
+Get the value of suppressedVulnerabilities.
+
getSuppressionFile() DependencyCheckScanAgent
Get the value of suppressionFile.
@@ -3735,6 +3767,10 @@
HintAnalyzer() HintAnalyzer
+html(String) EscapeTool
+HTML Encodes the provided text.
+
@@ -3862,6 +3898,10 @@
Initializes the connection factory.
+initialize() Settings
+Initializes the thread local settings object.
+
initializeFileTypeAnalyzer() AbstractFileTypeAnalyzer
Initializes the file type analyzer.
@@ -5036,7 +5076,7 @@
A callable task that will process a given set of NVD CVE xml files and update the Cve Database accordingly.
- ProcessTask(CveDB, CallableDownloadTask) ProcessTask ProcessTask(CveDB, CallableDownloadTask, Settings) ProcessTask
Constructs a new ProcessTask used to process an NVD CVE update.
@@ -5970,6 +6010,10 @@
Sets the value of the inherited property.
+setInstance(Settings) Settings
+Sets the instance of the Settings object to use in this thread.
+
setIssueManagement(IssueManagement) Model
Sets the value of the issueManagement property.
@@ -6474,6 +6518,14 @@
Sets the value of the subscribe property.
+ setSuppressedIdentifiers(Set<Identifier>) Dependency
+Set the value of suppressedIdentifiers.
+
+setSuppressedVulnerabilities(SortedSet<Vulnerability>) Dependency
+Set the value of suppressedVulnerabilities.
+
setSuppressionFile(String) DependencyCheckScanAgent
Set the value of suppressionFile.
@@ -6970,7 +7022,13 @@
updatePolicy RepositoryPolicy
UpdateService org.owasp.dependencycheck.data.update
+
+The CachedWebDataSource Service Loader.
+
+UpdateService(ClassLoader) UpdateService
+Creates a new instance of UpdateService.
+
updatesNeeded() StandardUpdate
Determines if the index needs to be updated.
@@ -7005,6 +7063,10 @@
url Site
+url(String) EscapeTool
+URL Encodes the provided text.
+
URLConnectionFactory org.owasp.dependencycheck.utils
A URLConnection Factory to create new connections.
@@ -7205,6 +7267,10 @@ the order they are declared.
X
+xml(String) EscapeTool
+XML Encodes the provided text.
+
XPathNuspecParser org.owasp.dependencycheck.data.nuget
Parse a Nuspec file using XPath.
diff --git a/dependency-check-core/apidocs/index.html b/dependency-check-core/apidocs/index.html
index 2f7f72024..f918bfab2 100644
--- a/dependency-check-core/apidocs/index.html
+++ b/dependency-check-core/apidocs/index.html
@@ -2,9 +2,9 @@
-
+
Dependency-Check Core 1.1.4 API
+Dependency-Check Core 1.2.0 API
@@ -126,6 +126,11 @@ extends Creates a new Engine.
+
+Engine ClassLoader serviceClassLoader)Creates a new Engine using the specified classloader to dynamically load Analyzer and Update services.
+
@@ -254,7 +259,7 @@ extends
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.html
index 4771dc6b4..b9dfc1d14 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.html
@@ -2,16 +2,16 @@
-
+
DependencyCheckScanAgent (Dependency-Check Core 1.1.4 API)
-DependencyCheckScanAgent (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.agent.DependencyCheckScanAgent (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.agent.DependencyCheckScanAgent (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.agent (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.agent (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.agent (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.agent (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.agent Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.agent Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.agent (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.agent (Dependency-Check Core 1.2.0 API)
+AbstractAnalyzer (Dependency-Check Core 1.1.4 API)
-AbstractAnalyzer (Dependency-Check Core 1.2.0 API)
+AbstractFileTypeAnalyzer (Dependency-Check Core 1.1.4 API)
-AbstractFileTypeAnalyzer (Dependency-Check Core 1.2.0 API)
+AbstractSuppressionAnalyzer (Dependency-Check Core 1.1.4 API)
-AbstractSuppressionAnalyzer (Dependency-Check Core 1.2.0 API)
+AnalysisPhase (Dependency-Check Core 1.1.4 API)
-AnalysisPhase (Dependency-Check Core 1.2.0 API)
+Analyzer (Dependency-Check Core 1.1.4 API)
-Analyzer (Dependency-Check Core 1.2.0 API)
+AnalyzerService (Dependency-Check Core 1.1.4 API)
-AnalyzerService (Dependency-Check Core 1.2.0 API)
+Summary:
Nested |
Field |
-Constr |
+Constr | Method
public final class AnalyzerService
+public class AnalyzerService
extends Object
+The Analyzer Service Loader. This class loads all services that implement
+ org.owasp.dependencycheck.analyzer.Analyzer.
Author: Jeremy Long
@@ -107,6 +109,25 @@ extends
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+AnalyzerService ClassLoader classLoader)Creates a new instance of AnalyzerService.
+
+
+
@@ -147,23 +162,31 @@ extends
ProcessTask (Dependency-Check Core 1.1.4 API)
-ProcessTask (Dependency-Check Core 1.2.0 API)
+Constructor and Description
-ProcessTask CveDB cveDB,
- CallableDownloadTask filePair)ProcessTask CveDB cveDB,
+ CallableDownloadTask filePair,
+ Settings settings)Constructs a new ProcessTask used to process an NVD CVE update.
@@ -192,16 +193,18 @@ implements
+
ProcessTask
public ProcessTask(CveDB cveDB,
- CallableDownloadTask filePair)
+ CallableDownloadTask filePair,
+ Settings settings)
Constructs a new ProcessTask used to process an NVD CVE update.
-Parameters: cveDB - the data store objectfilePair - the download task that contains the URL references to downloadParameters: cveDB - the data store objectfilePair - the download task that contains the URL references to downloadsettings - a reference to the global settings object; this is necessary so that when the thread is started
+ the dependencies have a correct reference to the global settings.
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/CallableDownloadTask.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/CallableDownloadTask.html
index 9fee10b73..1c22f2f0d 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/CallableDownloadTask.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/CallableDownloadTask.html
@@ -2,16 +2,16 @@
-
+
Uses of Class org.owasp.dependencycheck.data.update.task.CallableDownloadTask (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.data.update.task.CallableDownloadTask (Dependency-Check Core 1.2.0 API)
+
-ProcessTask CveDB cveDB,
- CallableDownloadTask filePair)ProcessTask CveDB cveDB,
+ CallableDownloadTask filePair,
+ Settings settings)Constructs a new ProcessTask used to process an NVD CVE update.
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/ProcessTask.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/ProcessTask.html
index 817c81ab7..332bc990e 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/ProcessTask.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/ProcessTask.html
@@ -2,16 +2,16 @@
-
+
Uses of Class org.owasp.dependencycheck.data.update.task.ProcessTask (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.data.update.task.ProcessTask (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.data.update.task Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.data.update.task Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.0 API)
+NvdCve12Handler.Element (Dependency-Check Core 1.1.4 API)
-NvdCve12Handler.Element (Dependency-Check Core 1.2.0 API)
+NvdCve12Handler (Dependency-Check Core 1.1.4 API)
-NvdCve12Handler (Dependency-Check Core 1.2.0 API)
+NvdCve20Handler.Element (Dependency-Check Core 1.1.4 API)
-NvdCve20Handler.Element (Dependency-Check Core 1.2.0 API)
+NvdCve20Handler (Dependency-Check Core 1.1.4 API)
-NvdCve20Handler (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.Element (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.Element (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.Element (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.Element (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.data.update.xml Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.data.update.xml Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.0 API)
+Confidence (Dependency-Check Core 1.1.4 API)
-Confidence (Dependency-Check Core 1.2.0 API)
+Dependency (Dependency-Check Core 1.1.4 API)
-Dependency (Dependency-Check Core 1.2.0 API)
+
voidaddSuppressedIdentifier Identifier identifier)Adds an identifier to the list of suppressed identifiers.
+
+voidaddSuppressedVulnerability Vulnerability vulnerability)Adds a vulnerability to the set of suppressed vulnerabilities.
+
+
+voidaddVulnerability Vulnerability vulnerability)Adds a vulnerability to the dependency.
+ Set <Identifier >getSuppressedIdentifiers Get the value of suppressedIdentifiers.
+
+
+SortedSet <Vulnerability >getSuppressedVulnerabilities Get the value of suppressedVulnerabilities.
+
+
EvidenceCollection getVendorEvidence Gets the Vendor Evidence.
@@ -375,6 +399,18 @@ implements
voidsetSuppressedIdentifiers Set <Identifier > suppressedIdentifiers)Set the value of suppressedIdentifiers.
+
+
+voidsetSuppressedVulnerabilities SortedSet <Vulnerability > suppressedVulnerabilities)Set the value of suppressedVulnerabilities.
+
+
+voidsetVulnerabilities SortedSet <Vulnerability > vulnerabilities)Set the value of vulnerabilities.
Parameters:identifier - the identifier to add
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Evidence.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Evidence.html
index d6881a8e4..32ba2c0c3 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Evidence.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Evidence.html
@@ -2,16 +2,16 @@
-
+
Evidence (Dependency-Check Core 1.1.4 API)
-Evidence (Dependency-Check Core 1.2.0 API)
+EvidenceCollection (Dependency-Check Core 1.1.4 API)
-EvidenceCollection (Dependency-Check Core 1.2.0 API)
+Identifier (Dependency-Check Core 1.1.4 API)
-Identifier (Dependency-Check Core 1.2.0 API)
+Reference (Dependency-Check Core 1.1.4 API)
-Reference (Dependency-Check Core 1.2.0 API)
+Vulnerability (Dependency-Check Core 1.1.4 API)
-Vulnerability (Dependency-Check Core 1.2.0 API)
+VulnerabilityComparator (Dependency-Check Core 1.1.4 API)
-VulnerabilityComparator (Dependency-Check Core 1.2.0 API)
+VulnerableSoftware (Dependency-Check Core 1.1.4 API)
-VulnerableSoftware (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.dependency.Confidence (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.Confidence (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.dependency.Dependency (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.Dependency (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.dependency.Evidence (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.Evidence (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.dependency.EvidenceCollection (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.EvidenceCollection (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.dependency.Identifier (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.Identifier (Dependency-Check Core 1.2.0 API)
+Returns a List of Identifiers.
+
+Set <Identifier >Dependency. getSuppressedIdentifiers Get the value of suppressedIdentifiers.
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Reference.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Reference.html
index 13f66e9cf..cd62c9aa7 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Reference.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Reference.html
@@ -2,16 +2,16 @@
-
+
Uses of Class org.owasp.dependencycheck.dependency.Reference (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.Reference (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.dependency.Vulnerability (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.Vulnerability (Dependency-Check Core 1.2.0 API)
+
SortedSet <Vulnerability >Dependency. getSuppressedVulnerabilities Get the value of suppressedVulnerabilities.
+
+
+SortedSet <Vulnerability >Dependency. getVulnerabilities Get the list of vulnerabilities.
voidDependency. addSuppressedVulnerability Vulnerability vulnerability)Adds a vulnerability to the set of suppressed vulnerabilities.
+
+
+voidDependency. addVulnerability Vulnerability vulnerability)Adds a vulnerability to the dependency.
-
+
intVulnerabilityComparator. compare Vulnerability o1,
Vulnerability o2)Implements the comparison of vulnerabilities.
-
+
intVulnerability. compareTo Vulnerability v)Compares two vulnerabilities.
@@ -194,6 +206,12 @@
voidDependency. setSuppressedVulnerabilities SortedSet <Vulnerability > suppressedVulnerabilities)Set the value of suppressedVulnerabilities.
+
+
+voidDependency. setVulnerabilities SortedSet <Vulnerability > vulnerabilities)Set the value of vulnerabilities.
Uses of Class org.owasp.dependencycheck.dependency.VulnerabilityComparator (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.VulnerabilityComparator (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.dependency.VulnerableSoftware (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.dependency.VulnerableSoftware (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.dependency (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.dependency (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.dependency Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.dependency Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.dependency (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.0 API)
+NoDataException (Dependency-Check Core 1.1.4 API)
-NoDataException (Dependency-Check Core 1.2.0 API)
+ScanAgentException (Dependency-Check Core 1.1.4 API)
-ScanAgentException (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.exception.NoDataException (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.exception.NoDataException (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.exception.ScanAgentException (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.exception.ScanAgentException (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.exception (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.exception (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.exception (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.exception (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.exception Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.exception Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.exception (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.exception (Dependency-Check Core 1.2.0 API)
+MavenNamespaceFilter (Dependency-Check Core 1.1.4 API)
-MavenNamespaceFilter (Dependency-Check Core 1.2.0 API)
+endElement String uri,
String localName,
String qName)Indicatees the start of the document.
+Indicates the start of the document.
@@ -167,7 +167,7 @@ extends startElement String uri,
String localName,
String qName,
- Attributes atts)Attributes attributes)
Called when an element is started.
@@ -251,7 +251,7 @@ extends String uri,
String localName,
String qName,
- Attributes atts)
+ Attributes attributes)
throws SAXException
Called when an element is started.
@@ -259,7 +259,7 @@ extends startElement in interface ContentHandler Overrides: startElement org.xml.sax.helpers.XMLFilterImpl Parameters: uri - the urilocalName - the localNameqName - the qualified nameatts - the attributesParameters: uri - the urilocalName - the localNameqName - the qualified nameattributes - the attributesThrows: SAXException
@@ -274,7 +274,7 @@ extends String localName,
String qName)
throws SAXException
-Indicatees the start of the document.
+Indicates the start of the document.
Specified by: endElement ContentHandler Uses of Class org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter (Dependency-Check Core 1.2.0 API)
+Activation (Dependency-Check Core 1.1.4 API)
-Activation (Dependency-Check Core 1.2.0 API)
+ActivationFile (Dependency-Check Core 1.1.4 API)
-ActivationFile (Dependency-Check Core 1.2.0 API)
+ActivationOS (Dependency-Check Core 1.1.4 API)
-ActivationOS (Dependency-Check Core 1.2.0 API)
+ActivationProperty (Dependency-Check Core 1.1.4 API)
-ActivationProperty (Dependency-Check Core 1.2.0 API)
+Build.Extensions (Dependency-Check Core 1.1.4 API)
-Build.Extensions (Dependency-Check Core 1.2.0 API)
+Build.Filters (Dependency-Check Core 1.1.4 API)
-Build.Filters (Dependency-Check Core 1.2.0 API)
+Build.Plugins (Dependency-Check Core 1.1.4 API)
-Build.Plugins (Dependency-Check Core 1.2.0 API)
+Build.Resources (Dependency-Check Core 1.1.4 API)
-Build.Resources (Dependency-Check Core 1.2.0 API)
+Build.TestResources (Dependency-Check Core 1.1.4 API)
-Build.TestResources (Dependency-Check Core 1.2.0 API)
+Build (Dependency-Check Core 1.1.4 API)
-Build (Dependency-Check Core 1.2.0 API)
+BuildBase.Filters (Dependency-Check Core 1.1.4 API)
-BuildBase.Filters (Dependency-Check Core 1.2.0 API)
+BuildBase.Plugins (Dependency-Check Core 1.1.4 API)
-BuildBase.Plugins (Dependency-Check Core 1.2.0 API)
+BuildBase.Resources (Dependency-Check Core 1.1.4 API)
-BuildBase.Resources (Dependency-Check Core 1.2.0 API)
+BuildBase.TestResources (Dependency-Check Core 1.1.4 API)
-BuildBase.TestResources (Dependency-Check Core 1.2.0 API)
+BuildBase (Dependency-Check Core 1.1.4 API)
-BuildBase (Dependency-Check Core 1.2.0 API)
+CiManagement.Notifiers (Dependency-Check Core 1.1.4 API)
-CiManagement.Notifiers (Dependency-Check Core 1.2.0 API)
+CiManagement (Dependency-Check Core 1.1.4 API)
-CiManagement (Dependency-Check Core 1.2.0 API)
+Contributor.Properties (Dependency-Check Core 1.1.4 API)
-Contributor.Properties (Dependency-Check Core 1.2.0 API)
+Contributor.Roles (Dependency-Check Core 1.1.4 API)
-Contributor.Roles (Dependency-Check Core 1.2.0 API)
+Contributor (Dependency-Check Core 1.1.4 API)
-Contributor (Dependency-Check Core 1.2.0 API)
+Dependency.Exclusions (Dependency-Check Core 1.1.4 API)
-Dependency.Exclusions (Dependency-Check Core 1.2.0 API)
+Dependency (Dependency-Check Core 1.1.4 API)
-Dependency (Dependency-Check Core 1.2.0 API)
+DependencyManagement.Dependencies (Dependency-Check Core 1.1.4 API)
-DependencyManagement.Dependencies (Dependency-Check Core 1.2.0 API)
+DependencyManagement (Dependency-Check Core 1.1.4 API)
-DependencyManagement (Dependency-Check Core 1.2.0 API)
+DeploymentRepository (Dependency-Check Core 1.1.4 API)
-DeploymentRepository (Dependency-Check Core 1.2.0 API)
+Developer.Properties (Dependency-Check Core 1.1.4 API)
-Developer.Properties (Dependency-Check Core 1.2.0 API)
+Developer.Roles (Dependency-Check Core 1.1.4 API)
-Developer.Roles (Dependency-Check Core 1.2.0 API)
+Developer (Dependency-Check Core 1.1.4 API)
-Developer (Dependency-Check Core 1.2.0 API)
+DistributionManagement (Dependency-Check Core 1.1.4 API)
-DistributionManagement (Dependency-Check Core 1.2.0 API)
+Exclusion (Dependency-Check Core 1.1.4 API)
-Exclusion (Dependency-Check Core 1.2.0 API)
+Extension (Dependency-Check Core 1.1.4 API)
-Extension (Dependency-Check Core 1.2.0 API)
+IssueManagement (Dependency-Check Core 1.1.4 API)
-IssueManagement (Dependency-Check Core 1.2.0 API)
+License (Dependency-Check Core 1.1.4 API)
-License (Dependency-Check Core 1.2.0 API)
+MailingList.OtherArchives (Dependency-Check Core 1.1.4 API)
-MailingList.OtherArchives (Dependency-Check Core 1.2.0 API)
+MailingList (Dependency-Check Core 1.1.4 API)
-MailingList (Dependency-Check Core 1.2.0 API)
+Model.Contributors (Dependency-Check Core 1.1.4 API)
-Model.Contributors (Dependency-Check Core 1.2.0 API)
+Model.Dependencies (Dependency-Check Core 1.1.4 API)
-Model.Dependencies (Dependency-Check Core 1.2.0 API)
+Model.Developers (Dependency-Check Core 1.1.4 API)
-Model.Developers (Dependency-Check Core 1.2.0 API)
+Model.Licenses (Dependency-Check Core 1.1.4 API)
-Model.Licenses (Dependency-Check Core 1.2.0 API)
+Model.MailingLists (Dependency-Check Core 1.1.4 API)
-Model.MailingLists (Dependency-Check Core 1.2.0 API)
+Model.Modules (Dependency-Check Core 1.1.4 API)
-Model.Modules (Dependency-Check Core 1.2.0 API)
+Model.PluginRepositories (Dependency-Check Core 1.1.4 API)
-Model.PluginRepositories (Dependency-Check Core 1.2.0 API)
+Model.Profiles (Dependency-Check Core 1.1.4 API)
-Model.Profiles (Dependency-Check Core 1.2.0 API)
+Model.Properties (Dependency-Check Core 1.1.4 API)
-Model.Properties (Dependency-Check Core 1.2.0 API)
+Model.Reports (Dependency-Check Core 1.1.4 API)
-Model.Reports (Dependency-Check Core 1.2.0 API)
+Model.Repositories (Dependency-Check Core 1.1.4 API)
-Model.Repositories (Dependency-Check Core 1.2.0 API)
+Model (Dependency-Check Core 1.1.4 API)
-Model (Dependency-Check Core 1.2.0 API)
+Notifier.Configuration (Dependency-Check Core 1.1.4 API)
-Notifier.Configuration (Dependency-Check Core 1.2.0 API)
+Notifier (Dependency-Check Core 1.1.4 API)
-Notifier (Dependency-Check Core 1.2.0 API)
+ObjectFactory (Dependency-Check Core 1.1.4 API)
-ObjectFactory (Dependency-Check Core 1.2.0 API)
+Organization (Dependency-Check Core 1.1.4 API)
-Organization (Dependency-Check Core 1.2.0 API)
+Parent (Dependency-Check Core 1.1.4 API)
-Parent (Dependency-Check Core 1.2.0 API)
+Plugin.Configuration (Dependency-Check Core 1.1.4 API)
-Plugin.Configuration (Dependency-Check Core 1.2.0 API)
+Plugin.Dependencies (Dependency-Check Core 1.1.4 API)
-Plugin.Dependencies (Dependency-Check Core 1.2.0 API)
+Plugin.Executions (Dependency-Check Core 1.1.4 API)
-Plugin.Executions (Dependency-Check Core 1.2.0 API)
+Plugin.Goals (Dependency-Check Core 1.1.4 API)
-Plugin.Goals (Dependency-Check Core 1.2.0 API)
+Plugin (Dependency-Check Core 1.1.4 API)
-Plugin (Dependency-Check Core 1.2.0 API)
+PluginExecution.Configuration (Dependency-Check Core 1.1.4 API)
-PluginExecution.Configuration (Dependency-Check Core 1.2.0 API)
+PluginExecution.Goals (Dependency-Check Core 1.1.4 API)
-PluginExecution.Goals (Dependency-Check Core 1.2.0 API)
+PluginExecution (Dependency-Check Core 1.1.4 API)
-PluginExecution (Dependency-Check Core 1.2.0 API)
+PluginManagement.Plugins (Dependency-Check Core 1.1.4 API)
-PluginManagement.Plugins (Dependency-Check Core 1.2.0 API)
+PluginManagement (Dependency-Check Core 1.1.4 API)
-PluginManagement (Dependency-Check Core 1.2.0 API)
+Prerequisites (Dependency-Check Core 1.1.4 API)
-Prerequisites (Dependency-Check Core 1.2.0 API)
+Profile.Dependencies (Dependency-Check Core 1.1.4 API)
-Profile.Dependencies (Dependency-Check Core 1.2.0 API)
+Profile.Modules (Dependency-Check Core 1.1.4 API)
-Profile.Modules (Dependency-Check Core 1.2.0 API)
+Profile.PluginRepositories (Dependency-Check Core 1.1.4 API)
-Profile.PluginRepositories (Dependency-Check Core 1.2.0 API)
+Profile.Properties (Dependency-Check Core 1.1.4 API)
-Profile.Properties (Dependency-Check Core 1.2.0 API)
+Profile.Reports (Dependency-Check Core 1.1.4 API)
-Profile.Reports (Dependency-Check Core 1.2.0 API)
+Profile.Repositories (Dependency-Check Core 1.1.4 API)
-Profile.Repositories (Dependency-Check Core 1.2.0 API)
+Profile (Dependency-Check Core 1.1.4 API)
-Profile (Dependency-Check Core 1.2.0 API)
+Relocation (Dependency-Check Core 1.1.4 API)
-Relocation (Dependency-Check Core 1.2.0 API)
+ReportPlugin.Configuration (Dependency-Check Core 1.1.4 API)
-ReportPlugin.Configuration (Dependency-Check Core 1.2.0 API)
+ReportPlugin.ReportSets (Dependency-Check Core 1.1.4 API)
-ReportPlugin.ReportSets (Dependency-Check Core 1.2.0 API)
+ReportPlugin (Dependency-Check Core 1.1.4 API)
-ReportPlugin (Dependency-Check Core 1.2.0 API)
+ReportSet.Configuration (Dependency-Check Core 1.1.4 API)
-ReportSet.Configuration (Dependency-Check Core 1.2.0 API)
+ReportSet.Reports (Dependency-Check Core 1.1.4 API)
-ReportSet.Reports (Dependency-Check Core 1.2.0 API)
+ReportSet (Dependency-Check Core 1.1.4 API)
-ReportSet (Dependency-Check Core 1.2.0 API)
+Reporting.Plugins (Dependency-Check Core 1.1.4 API)
-Reporting.Plugins (Dependency-Check Core 1.2.0 API)
+Reporting (Dependency-Check Core 1.1.4 API)
-Reporting (Dependency-Check Core 1.2.0 API)
+Repository (Dependency-Check Core 1.1.4 API)
-Repository (Dependency-Check Core 1.2.0 API)
+RepositoryPolicy (Dependency-Check Core 1.1.4 API)
-RepositoryPolicy (Dependency-Check Core 1.2.0 API)
+Resource.Excludes (Dependency-Check Core 1.1.4 API)
-Resource.Excludes (Dependency-Check Core 1.2.0 API)
+Resource.Includes (Dependency-Check Core 1.1.4 API)
-Resource.Includes (Dependency-Check Core 1.2.0 API)
+Resource (Dependency-Check Core 1.1.4 API)
-Resource (Dependency-Check Core 1.2.0 API)
+Scm (Dependency-Check Core 1.1.4 API)
-Scm (Dependency-Check Core 1.2.0 API)
+Site (Dependency-Check Core 1.1.4 API)
-Site (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Activation (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Activation (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Extensions (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Extensions (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Filters (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Filters (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Plugins (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Plugins (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Resources (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Resources (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.TestResources (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.TestResources (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Filters (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Filters (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Plugins (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Plugins (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Resources (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Resources (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.TestResources (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.TestResources (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.Notifiers (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.Notifiers (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Properties (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Properties (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Roles (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Roles (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency.Exclusions (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency.Exclusions (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.Dependencies (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.Dependencies (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Properties (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Properties (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Roles (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Roles (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Exclusion (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Exclusion (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Extension (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Extension (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.License (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.License (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList.OtherArchives (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList.OtherArchives (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Contributors (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Contributors (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Dependencies (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Dependencies (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Developers (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Developers (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Licenses (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Licenses (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.MailingLists (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.MailingLists (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Modules (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Modules (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.PluginRepositories (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.PluginRepositories (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Profiles (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Profiles (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Properties (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Properties (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Reports (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Reports (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Repositories (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Repositories (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier.Configuration (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier.Configuration (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Organization (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Organization (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Parent (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Parent (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Configuration (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Configuration (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Dependencies (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Dependencies (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Executions (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Executions (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Goals (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Goals (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Configuration (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Configuration (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Goals (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Goals (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.Plugins (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.Plugins (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Dependencies (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Dependencies (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Modules (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Modules (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.PluginRepositories (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.PluginRepositories (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Properties (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Properties (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Reports (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Reports (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Repositories (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Repositories (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Relocation (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Relocation (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.Configuration (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.Configuration (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.ReportSets (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.ReportSets (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Configuration (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Configuration (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Reports (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Reports (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting.Plugins (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting.Plugins (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Repository (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Repository (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Excludes (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Excludes (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Includes (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Includes (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Scm (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Scm (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Site (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Site (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.jaxb.pom.generated Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.jaxb.pom.generated Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.jaxb.pom Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.jaxb.pom Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck (Dependency-Check Core 1.2.0 API)
+ReportGenerator.Format (Dependency-Check Core 1.1.4 API)
-ReportGenerator.Format (Dependency-Check Core 1.2.0 API)
+ReportGenerator (Dependency-Check Core 1.1.4 API)
-ReportGenerator (Dependency-Check Core 1.2.0 API)
+
@@ -308,7 +308,7 @@ extends
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.html
index fd4e62772..285d04955 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.html
@@ -2,16 +2,16 @@
-
+
VelocityLoggerRedirect (Dependency-Check Core 1.1.4 API)
-VelocityLoggerRedirect (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator.Format (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator.Format (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.reporting.VelocityLoggerRedirect (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.reporting.VelocityLoggerRedirect (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.reporting (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.reporting (Dependency-Check Core 1.2.0 API)
+
Classes
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html
index f68e1aa14..1c5cb32e6 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html
@@ -2,16 +2,16 @@
-
+
-
org.owasp.dependencycheck.reporting (Dependency-Check Core 1.1.4 API)
-
+
org.owasp.dependencycheck.reporting (Dependency-Check Core 1.2.0 API)
+
@@ -86,12 +86,18 @@
+EscapeTool
+An extremely simple wrapper around various escape utils to perform URL and HTML encoding within the reports.
+
+
+
ReportGenerator
The ReportGenerator is used to, as the name implies, generate reports.
-
+
VelocityLoggerRedirect
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-tree.html
index 953203598..534fcd574 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-tree.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-tree.html
@@ -2,16 +2,16 @@
-
+
-
org.owasp.dependencycheck.reporting Class Hierarchy (Dependency-Check Core 1.1.4 API)
-
+
org.owasp.dependencycheck.reporting Class Hierarchy (Dependency-Check Core 1.2.0 API)
+
@@ -75,6 +75,7 @@
java.lang.Object Uses of Package org.owasp.dependencycheck.reporting (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.reporting (Dependency-Check Core 1.2.0 API)
+PropertyType (Dependency-Check Core 1.1.4 API)
-PropertyType (Dependency-Check Core 1.2.0 API)
+SuppressionErrorHandler (Dependency-Check Core 1.1.4 API)
-SuppressionErrorHandler (Dependency-Check Core 1.2.0 API)
+SuppressionHandler (Dependency-Check Core 1.1.4 API)
-SuppressionHandler (Dependency-Check Core 1.2.0 API)
+SuppressionParseException (Dependency-Check Core 1.1.4 API)
-SuppressionParseException (Dependency-Check Core 1.2.0 API)
+SuppressionParser (Dependency-Check Core 1.1.4 API)
-SuppressionParser (Dependency-Check Core 1.2.0 API)
+SuppressionRule (Dependency-Check Core 1.1.4 API)
-SuppressionRule (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.suppression.PropertyType (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.suppression.PropertyType (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.suppression.SuppressionErrorHandler (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.suppression.SuppressionErrorHandler (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.suppression.SuppressionHandler (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.suppression.SuppressionHandler (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.suppression.SuppressionParseException (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.suppression.SuppressionParseException (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.suppression.SuppressionParser (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.suppression.SuppressionParser (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.suppression.SuppressionRule (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.suppression.SuppressionRule (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.suppression (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.suppression (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.suppression (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.suppression (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.suppression Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.suppression Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.suppression (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.suppression (Dependency-Check Core 1.2.0 API)
+Checksum (Dependency-Check Core 1.1.4 API)
-Checksum (Dependency-Check Core 1.2.0 API)
+DBUtils (Dependency-Check Core 1.1.4 API)
-DBUtils (Dependency-Check Core 1.2.0 API)
+DependencyVersion (Dependency-Check Core 1.1.4 API)
-DependencyVersion (Dependency-Check Core 1.2.0 API)
+String version)
Constructor for a DependencyVersion that will parse a version string.
- Note , this should only be used when the version passed in is already known to be a well formated version
+ Note , this should only be used when the version passed in is already known to be a well formatted version
number. Otherwise, DependencyVersionUtil.parseVersion() should be used instead.
-Parameters: version - the well formated version number to parseParameters: version - the well formatted version number to parse
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DependencyVersionUtil.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DependencyVersionUtil.html
index edf267830..46044e880 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DependencyVersionUtil.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DependencyVersionUtil.html
@@ -2,16 +2,16 @@
-
+
-
DependencyVersionUtil (Dependency-Check Core 1.1.4 API)
-
+
DependencyVersionUtil (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html
index 4fba4d4e4..b2b7860fb 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html
@@ -2,16 +2,16 @@
-
+
-
DownloadFailedException (Dependency-Check Core 1.1.4 API)
-
+
DownloadFailedException (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Downloader.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Downloader.html
index 141fa2470..bc82db820 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Downloader.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Downloader.html
@@ -2,16 +2,16 @@
-
+
-
Downloader (Dependency-Check Core 1.1.4 API)
-
+
Downloader (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html
index c428c1cec..3b808bda0 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html
@@ -2,16 +2,16 @@
-
+
-
ExtractionException (Dependency-Check Core 1.1.4 API)
-
+
ExtractionException (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/FileUtils.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/FileUtils.html
index 8b20beeaa..a362be995 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/FileUtils.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/FileUtils.html
@@ -2,16 +2,16 @@
-
+
-
FileUtils (Dependency-Check Core 1.1.4 API)
-
+
FileUtils (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html
index e3051ad49..a8c9068eb 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html
@@ -2,16 +2,16 @@
-
+
-
Filter (Dependency-Check Core 1.1.4 API)
-
+
Filter (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html
index dbf568cfa..caa59a920 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html
@@ -2,16 +2,16 @@
-
+
-
InvalidSettingException (Dependency-Check Core 1.1.4 API)
-
+
InvalidSettingException (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogFilter.html
index 60c124280..d7eb3cff4 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogFilter.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogFilter.html
@@ -2,16 +2,16 @@
-
+
-
LogFilter (Dependency-Check Core 1.1.4 API)
-
+
LogFilter (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogUtils.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogUtils.html
index 870ebcf4a..258a59029 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogUtils.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/LogUtils.html
@@ -2,16 +2,16 @@
-
+
-
LogUtils (Dependency-Check Core 1.1.4 API)
-
+
LogUtils (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/NonClosingStream.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/NonClosingStream.html
index 93eea4b32..a60847174 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/NonClosingStream.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/NonClosingStream.html
@@ -2,16 +2,16 @@
-
+
-
NonClosingStream (Dependency-Check Core 1.1.4 API)
-
+
NonClosingStream (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Pair.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Pair.html
index bf0b3058c..d675e0072 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Pair.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Pair.html
@@ -2,16 +2,16 @@
-
+
-
Pair (Dependency-Check Core 1.1.4 API)
-
+
Pair (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html
index 7f38a90f3..7eeca8dfe 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html
@@ -2,16 +2,16 @@
-
+
-
Settings.KEYS (Dependency-Check Core 1.1.4 API)
-
+
Settings.KEYS (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.html
index 6b441c8ba..f2b443e88 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Settings.html
@@ -2,16 +2,16 @@
-
+
-
Settings (Dependency-Check Core 1.1.4 API)
-
+
Settings (Dependency-Check Core 1.2.0 API)
+
@@ -142,30 +142,42 @@ extends
Method and Description
+static voidcleanup Cleans up resources to prevent memory leaks.
+
+
static booleangetBoolean String key)Returns a boolean value from the properties file.
-
+
static booleangetBoolean String key,
boolean defaultValue)Returns a boolean value from the properties file.
-
+
static File getDataFile String key)Returns a value from the properties file as a File object.
-
+
static File getFile String key)Returns a value from the properties file as a File object.
+
+static Settings getInstance Gets the underlying instance of the Settings object.
+
static intgetInt String key)
static voidinitialize Initializes the thread local settings object.
+
+
+static voidmergeProperties File filePath)Merges a new properties file into the current properties.
-
+
static voidmergeProperties InputStream stream)Merges a new properties file into the current properties.
-
+
static voidmergeProperties String filePath)Merges a new properties file into the current properties.
-
+
static voidremoveProperty String key)Removes a property from the local properties collection.
-
+
static voidsetBoolean String key,
boolean value)Sets a property value.
+
+static voidsetInstance Settings instance)Sets the instance of the Settings object to use in this thread.
+
static voidsetString String key,
@@ -264,6 +288,49 @@ extends
+
+
+
+
+initialize
+public static void initialize()
+Initializes the thread local settings object. Note, to use the settings object you must call this method.
+ However, you must also call Settings.cleanup() to properly release resources.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -393,9 +460,12 @@ extends
getTempDirectory
-public static File getTempDirectory()
+public static File getTempDirectory()
+ throws IOException
Returns the temporary directory.
-Returns: the temporary directory Returns: the temporary directory
+Throws: IOException
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html
index e75a26a7f..a5a56bf5e 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html
@@ -2,16 +2,16 @@
-
+
URLConnectionFactory (Dependency-Check Core 1.1.4 API)
-URLConnectionFactory (Dependency-Check Core 1.2.0 API)
+URLConnectionFailureException (Dependency-Check Core 1.1.4 API)
-URLConnectionFailureException (Dependency-Check Core 1.2.0 API)
+UrlStringUtils (Dependency-Check Core 1.1.4 API)
-UrlStringUtils (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.Checksum (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.Checksum (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.DBUtils (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.DBUtils (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.DependencyVersion (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.DependencyVersion (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.DependencyVersionUtil (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.DependencyVersionUtil (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.DownloadFailedException (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.DownloadFailedException (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.Downloader (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.Downloader (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.ExtractionException (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.ExtractionException (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.FileUtils (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.FileUtils (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.Filter (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.Filter (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.InvalidSettingException (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.InvalidSettingException (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.LogFilter (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.LogFilter (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.LogUtils (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.LogUtils (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.NonClosingStream (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.NonClosingStream (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.Pair (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.Pair (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.Settings.KEYS (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.Settings.KEYS (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.Settings (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.Settings (Dependency-Check Core 1.2.0 API)
+No usage of org.owasp.dependencycheck.utils.Settings
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html
index b559112b3..6d95ee0cd 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html
@@ -2,16 +2,16 @@
-
+
Uses of Class org.owasp.dependencycheck.utils.URLConnectionFactory (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.URLConnectionFactory (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.URLConnectionFailureException (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.URLConnectionFailureException (Dependency-Check Core 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.utils.UrlStringUtils (Dependency-Check Core 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.utils.UrlStringUtils (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.utils (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.utils (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.utils (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.utils (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.utils Class Hierarchy (Dependency-Check Core 1.1.4 API)
-org.owasp.dependencycheck.utils Class Hierarchy (Dependency-Check Core 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.utils (Dependency-Check Core 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.utils (Dependency-Check Core 1.2.0 API)
+
+org.owasp.dependencycheck.data.update.task
+
+
+
org.owasp.dependencycheck.data.update.task
+
+
+
+
+
org.owasp.dependencycheck.dependency
@@ -108,7 +118,7 @@
Contains the core Dependency implementation.
-
+
org.owasp.dependencycheck.utils
@@ -156,6 +166,23 @@
+
+
+
+
+
@@ -205,6 +232,11 @@
+Settings
+A simple settings container that wraps the dependencycheck.properties file.
+
+
URLConnectionFailureException
An exception used when the creation of an URLConnection fails.
Overview List (Dependency-Check Core 1.1.4 API)
-Overview List (Dependency-Check Core 1.2.0 API)
+Overview (Dependency-Check Core 1.1.4 API)
-Overview (Dependency-Check Core 1.2.0 API)
+
diff --git a/dependency-check-core/apidocs/overview-tree.html b/dependency-check-core/apidocs/overview-tree.html
index bc941cc75..f3efe73b8 100644
--- a/dependency-check-core/apidocs/overview-tree.html
+++ b/dependency-check-core/apidocs/overview-tree.html
@@ -2,16 +2,16 @@
-
+
Class Hierarchy (Dependency-Check Core 1.1.4 API)
-Class Hierarchy (Dependency-Check Core 1.2.0 API)
+org.owasp.dependencycheck.utils.Downloader
org.owasp.dependencycheck.data.nvdcve.DriverLoader
org.owasp.dependencycheck.Engine
+org.owasp.dependencycheck.reporting.EscapeTool
org.owasp.dependencycheck.dependency.Evidence Comparable <T>)
org.owasp.dependencycheck.dependency.EvidenceCollection Iterable <T>)
org.owasp.dependencycheck.jaxb.pom.generated.Exclusion
diff --git a/dependency-check-core/apidocs/serialized-form.html b/dependency-check-core/apidocs/serialized-form.html
index 351ce7e81..a85562f36 100644
--- a/dependency-check-core/apidocs/serialized-form.html
+++ b/dependency-check-core/apidocs/serialized-form.html
@@ -2,16 +2,16 @@
-
+
Serialized Form (Dependency-Check Core 1.1.4 API)
-Serialized Form (Dependency-Check Core 1.2.0 API)
+dependency-check-core - Checkstyle Results
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
@@ -147,6 +147,13 @@
Surefire Report
+
+
+
+
+
+
@@ -161,16 +168,16 @@
-
+
+ PMD
-
+
+ CPD
@@ -242,7 +249,7 @@
Warnings
Errors
-201
+183
0
0
6
@@ -263,44 +270,45 @@
org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java 0
0
-3
+2
org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java 0
0
-2
+2
+
+org/owasp/dependencycheck/dependency/Dependency.java 0
+0
+1
org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java
@@ -315,7 +323,18 @@
Variable 'sb' should be declared final.
-116
+116
+
org/owasp/dependencycheck/dependency/Dependency.java
+
+
+Violation
+Message
+Line
+
+Total number of methods is 45 (max allowed is 40).
+38
en-us
©2012 - 2014 OWASP
-
-
File: 201,
+ <title>File: 183,
Errors: 6,
Warnings: 0,
Infos: 0
@@ -46,7 +46,7 @@ under the License.
<tbody>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.StandardUpdate.java">org/owasp/dependencycheck/data/update/StandardUpdate.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.package-info.java">org/owasp/dependencycheck/data/lucene/package-info.java</a>
</td>
<td>
0
@@ -71,1504 +71,6 @@ under the License.
<td>
0
</td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nexus.NexusSearch.java">org/owasp/dependencycheck/data/nexus/NexusSearch.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.HintAnalyzer.java">org/owasp/dependencycheck/analyzer/HintAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.exception.ScanAgentException.java">org/owasp/dependencycheck/exception/ScanAgentException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.CachedWebDataSource.java">org/owasp/dependencycheck/data/update/CachedWebDataSource.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.generated-classes.cobertura.cobertura.properties">dependency-check-ant/target/generated-classes/cobertura/cobertura.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.DependencyVersion.java">org/owasp/dependencycheck/utils/DependencyVersion.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Dependency.java">org/owasp/dependencycheck/jaxb/pom/generated/Dependency.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Dependency.java">org/owasp/dependencycheck/dependency/Dependency.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/IssueManagement.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.LogUtils.java">org/owasp/dependencycheck/utils/LogUtils.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.generated-classes.cobertura.task.properties">dependency-check-ant/target/generated-classes/cobertura/task.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Pair.java">org/owasp/dependencycheck/utils/Pair.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.java">org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nexus.MavenArtifact.java">org/owasp/dependencycheck/data/nexus/MavenArtifact.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.URLConnectionFactory.java">org/owasp/dependencycheck/utils/URLConnectionFactory.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.java">org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.exception.package-info.java">org/owasp/dependencycheck/analyzer/exception/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.EvidenceCollection.java">org/owasp/dependencycheck/dependency/EvidenceCollection.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Parent.java">org/owasp/dependencycheck/jaxb/pom/generated/Parent.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.classes.task.properties">dependency-check-ant/target/classes/task.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.target.generated-classes.cobertura.log.properties">dependency-check-maven/target/generated-classes/cobertura/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.java">org/owasp/dependencycheck/jaxb/pom/generated/RepositoryPolicy.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.NonClosingStream.java">org/owasp/dependencycheck/utils/NonClosingStream.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.DownloadFailedException.java">org/owasp/dependencycheck/utils/DownloadFailedException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cwe.package-info.java">org/owasp/dependencycheck/data/cwe/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.java">org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.java">org/owasp/dependencycheck/jaxb/pom/generated/Exclusion.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Build.java">org/owasp/dependencycheck/jaxb/pom/generated/Build.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.DBUtils.java">org/owasp/dependencycheck/utils/DBUtils.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Relocation.java">org/owasp/dependencycheck/jaxb/pom/generated/Relocation.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.generated-classes.cobertura.taskdefs.properties">dependency-check-ant/target/generated-classes/cobertura/taskdefs.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Developer.java">org/owasp/dependencycheck/jaxb/pom/generated/Developer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.VulnerableSoftware.java">org/owasp/dependencycheck/dependency/VulnerableSoftware.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Notifier.java">org/owasp/dependencycheck/jaxb/pom/generated/Notifier.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.java">org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.DependencySimilarity.java">org/owasp/dependencycheck/data/lucene/DependencySimilarity.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.suppression.PropertyType.java">org/owasp/dependencycheck/suppression/PropertyType.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.java">org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cpe.Fields.java">org/owasp/dependencycheck/data/cpe/Fields.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.suppression.package-info.java">org/owasp/dependencycheck/suppression/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-cli.target.maven-archiver.pom.properties">dependency-check-cli/target/maven-archiver/pom.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.VulnerabilityComparator.java">org/owasp/dependencycheck/dependency/VulnerabilityComparator.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/CiManagement.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.exception.package-info.java">org/owasp/dependencycheck/data/update/exception/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Identifier.java">org/owasp/dependencycheck/dependency/Identifier.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.src.main.resources.dependencycheck.properties">dependency-check-core/src/main/resources/dependencycheck.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.classes.log.properties">dependency-check-ant/target/classes/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.NexusAnalyzer.java">org/owasp/dependencycheck/analyzer/NexusAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.DriverLoader.java">org/owasp/dependencycheck/data/nvdcve/DriverLoader.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.java">org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Reporting.java">org/owasp/dependencycheck/jaxb/pom/generated/Reporting.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-cli.target.generated-classes.cobertura.log.properties">dependency-check-cli/target/generated-classes/cobertura/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Checksum.java">org/owasp/dependencycheck/utils/Checksum.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.src.test.resources.dependencycheck.properties">dependency-check-core/src/test/resources/dependencycheck.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.FieldAnalyzer.java">org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Confidence.java">org/owasp/dependencycheck/dependency/Confidence.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.java">org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 3
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.InvalidSettingException.java">org/owasp/dependencycheck/utils/InvalidSettingException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Downloader.java">org/owasp/dependencycheck/utils/Downloader.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Evidence.java">org/owasp/dependencycheck/dependency/Evidence.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.java">org/owasp/dependencycheck/jaxb/pom/generated/Prerequisites.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.test-classes.log.properties">dependency-check-core/target/test-classes/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.package-info.java">org/owasp/dependencycheck/analyzer/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Reference.java">org/owasp/dependencycheck/dependency/Reference.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-cli.src.main.resources.log.properties">dependency-check-cli/src/main/resources/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.LogFilter.java">org/owasp/dependencycheck/utils/LogFilter.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.package-info.java">org/owasp/dependencycheck/data/nvdcve/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/PluginManagement.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.exception.UpdateException.java">org/owasp/dependencycheck/data/update/exception/UpdateException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.package-info.java">org/owasp/dependencycheck/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.target.generated-classes.cobertura.cobertura.properties">dependency-check-maven/target/generated-classes/cobertura/cobertura.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cwe.CweHandler.java">org/owasp/dependencycheck/data/cwe/CweHandler.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.LuceneUtils.java">org/owasp/dependencycheck/data/lucene/LuceneUtils.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Filter.java">org/owasp/dependencycheck/utils/Filter.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cwe.CweDB.java">org/owasp/dependencycheck/data/cwe/CweDB.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.java">org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.CveDB.java">org/owasp/dependencycheck/data/nvdcve/CveDB.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Profile.java">org/owasp/dependencycheck/jaxb/pom/generated/Profile.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.java">org/owasp/dependencycheck/jaxb/pom/generated/ActivationFile.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.java">org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.URLConnectionFailureException.java">org/owasp/dependencycheck/utils/URLConnectionFailureException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Organization.java">org/owasp/dependencycheck/jaxb/pom/generated/Organization.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-cli.target.generated-classes.cobertura.cobertura.properties">dependency-check-cli/target/generated-classes/cobertura/cobertura.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.generated-classes.cobertura.log.properties">dependency-check-ant/target/generated-classes/cobertura/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nuget.NuspecParseException.java">org/owasp/dependencycheck/data/nuget/NuspecParseException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cpe.package-info.java">org/owasp/dependencycheck/data/cpe/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.suppression.SuppressionParseException.java">org/owasp/dependencycheck/suppression/SuppressionParseException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.generated-classes.cobertura.dependencycheck.properties">dependency-check-core/target/generated-classes/cobertura/dependencycheck.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.java">org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.java">org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.java">org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.java">org/owasp/dependencycheck/data/lucene/VersionTokenizingFilter.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.exception.NoDataException.java">org/owasp/dependencycheck/exception/NoDataException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.task.ProcessTask.java">org/owasp/dependencycheck/data/update/task/ProcessTask.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/DistributionManagement.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.DriverShim.java">org/owasp/dependencycheck/data/nvdcve/DriverShim.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Vulnerability.java">org/owasp/dependencycheck/dependency/Vulnerability.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.MailingList.java">org/owasp/dependencycheck/jaxb/pom/generated/MailingList.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.package-info.java">org/owasp/dependencycheck/jaxb/pom/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.ExtractionException.java">org/owasp/dependencycheck/utils/ExtractionException.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.src.main.resources.log.properties">dependency-check-maven/src/main/resources/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.java">org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 2
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.xml.package-info.java">org/owasp/dependencycheck/data/update/xml/package-info.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nuget.NugetPackage.java">org/owasp/dependencycheck/data/nuget/NugetPackage.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.classes.dependencycheck.properties">dependency-check-core/target/classes/dependencycheck.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.NvdCveUpdater.java">org/owasp/dependencycheck/data/update/NvdCveUpdater.java</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- </tr>
- <tr>
- <td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.target.classes.log.properties">dependency-check-maven/target/classes/log.properties</a>
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
- <td>
- 0
- </td>
</tr>
<tr>
<td>
@@ -1586,7 +88,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.package-info.java">org/owasp/dependencycheck/data/lucene/package-info.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.StandardUpdate.java">org/owasp/dependencycheck/data/update/StandardUpdate.java</a>
</td>
<td>
0
@@ -1600,7 +102,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.target.generated-classes.cobertura.mojo.properties">dependency-check-maven/target/generated-classes/cobertura/mojo.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nexus.NexusSearch.java">org/owasp/dependencycheck/data/nexus/NexusSearch.java</a>
</td>
<td>
0
@@ -1625,6 +127,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.HintAnalyzer.java">org/owasp/dependencycheck/analyzer/HintAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1639,6 +155,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.exception.ScanAgentException.java">org/owasp/dependencycheck/exception/ScanAgentException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1670,7 +200,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.FileUtils.java">org/owasp/dependencycheck/utils/FileUtils.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.CachedWebDataSource.java">org/owasp/dependencycheck/data/update/CachedWebDataSource.java</a>
</td>
<td>
0
@@ -1684,7 +214,21 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.java">org/owasp/dependencycheck/jaxb/pom/generated/BuildBase.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.DependencyVersion.java">org/owasp/dependencycheck/utils/DependencyVersion.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.FileUtils.java">org/owasp/dependencycheck/utils/FileUtils.java</a>
</td>
<td>
0
@@ -1709,6 +253,34 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.java">org/owasp/dependencycheck/jaxb/pom/generated/BuildBase.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Dependency.java">org/owasp/dependencycheck/jaxb/pom/generated/Dependency.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1723,6 +295,34 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Dependency.java">org/owasp/dependencycheck/dependency/Dependency.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 1
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/IssueManagement.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1737,6 +337,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.LogUtils.java">org/owasp/dependencycheck/utils/LogUtils.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1754,7 +368,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.target.maven-archiver.pom.properties">dependency-check-maven/target/maven-archiver/pom.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Pair.java">org/owasp/dependencycheck/utils/Pair.java</a>
</td>
<td>
0
@@ -1796,7 +410,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.java">org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.java">org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java</a>
</td>
<td>
0
@@ -1824,7 +438,35 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.target.maven-plugin-help.properties">dependency-check-maven/target/maven-plugin-help.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.java">org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nexus.MavenArtifact.java">org/owasp/dependencycheck/data/nexus/MavenArtifact.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.URLConnectionFactory.java">org/owasp/dependencycheck/utils/URLConnectionFactory.java</a>
</td>
<td>
0
@@ -1852,7 +494,21 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Model.java">org/owasp/dependencycheck/jaxb/pom/generated/Model.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.java">org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.exception.package-info.java">org/owasp/dependencycheck/analyzer/exception/package-info.java</a>
</td>
<td>
0
@@ -1877,6 +533,48 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Parent.java">org/owasp/dependencycheck/jaxb/pom/generated/Parent.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Model.java">org/owasp/dependencycheck/jaxb/pom/generated/Model.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.EvidenceCollection.java">org/owasp/dependencycheck/dependency/EvidenceCollection.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1905,6 +603,90 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.NonClosingStream.java">org/owasp/dependencycheck/utils/NonClosingStream.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.java">org/owasp/dependencycheck/jaxb/pom/generated/RepositoryPolicy.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.DownloadFailedException.java">org/owasp/dependencycheck/utils/DownloadFailedException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cwe.package-info.java">org/owasp/dependencycheck/data/cwe/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.java">org/owasp/dependencycheck/jaxb/pom/generated/Exclusion.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.java">org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1947,6 +729,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Build.java">org/owasp/dependencycheck/jaxb/pom/generated/Build.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1975,6 +771,76 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.DBUtils.java">org/owasp/dependencycheck/utils/DBUtils.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Relocation.java">org/owasp/dependencycheck/jaxb/pom/generated/Relocation.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Developer.java">org/owasp/dependencycheck/jaxb/pom/generated/Developer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Notifier.java">org/owasp/dependencycheck/jaxb/pom/generated/Notifier.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.VulnerableSoftware.java">org/owasp/dependencycheck/dependency/VulnerableSoftware.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -1989,6 +855,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.java">org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2017,6 +897,34 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.suppression.PropertyType.java">org/owasp/dependencycheck/suppression/PropertyType.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.DependencySimilarity.java">org/owasp/dependencycheck/data/lucene/DependencySimilarity.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2048,7 +956,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.maven-archiver.pom.properties">dependency-check-ant/target/maven-archiver/pom.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.java">org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java</a>
</td>
<td>
0
@@ -2073,6 +981,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cpe.Fields.java">org/owasp/dependencycheck/data/cpe/Fields.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2104,7 +1026,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.VersionAnalyzer.java">org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.suppression.package-info.java">org/owasp/dependencycheck/suppression/package-info.java</a>
</td>
<td>
0
@@ -2118,7 +1040,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nuget.package-info.java">org/owasp/dependencycheck/data/nuget/package-info.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.VersionAnalyzer.java">org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java</a>
</td>
<td>
0
@@ -2143,6 +1065,48 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nuget.package-info.java">org/owasp/dependencycheck/data/nuget/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.VulnerabilityComparator.java">org/owasp/dependencycheck/dependency/VulnerabilityComparator.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/CiManagement.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2157,6 +1121,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.exception.package-info.java">org/owasp/dependencycheck/data/update/exception/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2171,6 +1149,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Identifier.java">org/owasp/dependencycheck/dependency/Identifier.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2185,6 +1177,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.src.main.resources.dependencycheck.properties">dependency-check-core/src/main/resources/dependencycheck.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2213,6 +1219,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.NexusAnalyzer.java">org/owasp/dependencycheck/analyzer/NexusAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2227,6 +1247,76 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.DriverLoader.java">org/owasp/dependencycheck/data/nvdcve/DriverLoader.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.java">org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Reporting.java">org/owasp/dependencycheck/jaxb/pom/generated/Reporting.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Checksum.java">org/owasp/dependencycheck/utils/Checksum.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.src.test.resources.dependencycheck.properties">dependency-check-core/src/test/resources/dependencycheck.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2244,7 +1334,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AbstractAnalyzer.java">org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.FieldAnalyzer.java">org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java</a>
</td>
<td>
0
@@ -2258,7 +1348,35 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-ant.target.classes.taskdefs.properties">dependency-check-ant/target/classes/taskdefs.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.reporting.EscapeTool.java">org/owasp/dependencycheck/reporting/EscapeTool.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Confidence.java">org/owasp/dependencycheck/dependency/Confidence.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AbstractAnalyzer.java">org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java</a>
</td>
<td>
0
@@ -2283,6 +1401,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.java">org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 2
+ </td>
</tr>
<tr>
<td>
@@ -2311,6 +1443,34 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.InvalidSettingException.java">org/owasp/dependencycheck/utils/InvalidSettingException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Downloader.java">org/owasp/dependencycheck/utils/Downloader.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2339,6 +1499,76 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Evidence.java">org/owasp/dependencycheck/dependency/Evidence.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.test-classes.log.properties">dependency-check-core/target/test-classes/log.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.java">org/owasp/dependencycheck/jaxb/pom/generated/Prerequisites.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.package-info.java">org/owasp/dependencycheck/analyzer/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-cli.src.main.resources.log.properties">dependency-check-cli/src/main/resources/log.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2353,6 +1583,34 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Reference.java">org/owasp/dependencycheck/dependency/Reference.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.LogFilter.java">org/owasp/dependencycheck/utils/LogFilter.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2367,6 +1625,62 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/PluginManagement.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.package-info.java">org/owasp/dependencycheck/data/nvdcve/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.exception.UpdateException.java">org/owasp/dependencycheck/data/update/exception/UpdateException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.package-info.java">org/owasp/dependencycheck/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2423,6 +1737,34 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.LuceneUtils.java">org/owasp/dependencycheck/data/lucene/LuceneUtils.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cwe.CweHandler.java">org/owasp/dependencycheck/data/cwe/CweHandler.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2465,6 +1807,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.Filter.java">org/owasp/dependencycheck/utils/Filter.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2479,6 +1835,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cwe.CweDB.java">org/owasp/dependencycheck/data/cwe/CweDB.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2493,6 +1863,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.java">org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2524,7 +1908,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.java">org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Extension.java">org/owasp/dependencycheck/jaxb/pom/generated/Extension.java</a>
</td>
<td>
0
@@ -2538,7 +1922,7 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Extension.java">org/owasp/dependencycheck/jaxb/pom/generated/Extension.java</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.java">org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java</a>
</td>
<td>
0
@@ -2577,6 +1961,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.CveDB.java">org/owasp/dependencycheck/data/nvdcve/CveDB.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2591,6 +1989,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Profile.java">org/owasp/dependencycheck/jaxb/pom/generated/Profile.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2605,6 +2017,62 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.java">org/owasp/dependencycheck/jaxb/pom/generated/ActivationFile.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.URLConnectionFailureException.java">org/owasp/dependencycheck/utils/URLConnectionFailureException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.java">org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.Organization.java">org/owasp/dependencycheck/jaxb/pom/generated/Organization.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2619,6 +2087,62 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.generated-classes.cobertura.dependencycheck.properties">dependency-check-core/target/generated-classes/cobertura/dependencycheck.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.suppression.SuppressionParseException.java">org/owasp/dependencycheck/suppression/SuppressionParseException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.cpe.package-info.java">org/owasp/dependencycheck/data/cpe/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nuget.NuspecParseException.java">org/owasp/dependencycheck/data/nuget/NuspecParseException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2650,7 +2174,35 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-cli.target.classes.log.properties">dependency-check-cli/target/classes/log.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.java">org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.java">org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.java">org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java</a>
</td>
<td>
0
@@ -2675,6 +2227,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.java">org/owasp/dependencycheck/data/lucene/VersionTokenizingFilter.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2703,6 +2269,20 @@ under the License.
<td>
1
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.exception.NoDataException.java">org/owasp/dependencycheck/exception/NoDataException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2731,6 +2311,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.task.ProcessTask.java">org/owasp/dependencycheck/data/update/task/ProcessTask.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2748,7 +2342,21 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.target.classes.mojo.properties">dependency-check-maven/target/classes/mojo.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.java">org/owasp/dependencycheck/jaxb/pom/generated/DistributionManagement.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nvdcve.DriverShim.java">org/owasp/dependencycheck/data/nvdcve/DriverShim.java</a>
</td>
<td>
0
@@ -2773,6 +2381,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.test-classes.test.properties">dependency-check-core/target/test-classes/test.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2790,7 +2412,35 @@ under the License.
</tr>
<tr>
<td>
- <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.test-classes.test.properties">dependency-check-core/target/test-classes/test.properties</a>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.dependency.Vulnerability.java">org/owasp/dependencycheck/dependency/Vulnerability.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.package-info.java">org/owasp/dependencycheck/jaxb/pom/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.jaxb.pom.generated.MailingList.java">org/owasp/dependencycheck/jaxb/pom/generated/MailingList.java</a>
</td>
<td>
0
@@ -2815,6 +2465,34 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.utils.ExtractionException.java">org/owasp/dependencycheck/utils/ExtractionException.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-maven.src.main.resources.log.properties">dependency-check-maven/src/main/resources/log.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2829,6 +2507,62 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.java">org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 2
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.nuget.NugetPackage.java">org/owasp/dependencycheck/data/nuget/NugetPackage.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.xml.package-info.java">org/owasp/dependencycheck/data/update/xml/package-info.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#dependency-check-core.target.classes.dependencycheck.properties">dependency-check-core/target/classes/dependencycheck.properties</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
@@ -2843,6 +2577,20 @@ under the License.
<td>
0
</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="https://github.com/jeremylong/DependencyCheck.git/dependency-check-core/checkstyle.html#org.owasp.dependencycheck.data.update.NvdCveUpdater.java">org/owasp/dependencycheck/data/update/NvdCveUpdater.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
</tr>
<tr>
<td>
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 499551c2e..9b9d1dd6f 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
@@ -15,67 +15,67 @@ org.owasp.dependencycheck.analyzer
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a> <i>(74%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a> <i>(48%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.Analyzer.html">Analyzer</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a> <i>(38%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a> <i>(67%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a> <i>(81%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a> <i>(55%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a> <i>(34%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a> <i>(57%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a> <i>(85%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html">FileTypeAnalyzer</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a> <i>(76%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a> <i>(53%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a> <i>(26%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a> <i>(15%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a> <i>(20%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a> <i>(67%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a> <i>(55%)</i></td>
</tr>
</tbody>
</table>
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 61c9854cf..c6d96b96d 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,13 +15,13 @@ org.owasp.dependencycheck.data.cpe
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a> <i>(73%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.Fields.html">Fields</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a> <i>(58%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.IndexException.html">IndexException</a> <i>(N/A)</i></td>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html
index 4868d347e..72235246a 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html
@@ -15,7 +15,7 @@ org.owasp.dependencycheck.data.cwe
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a> <i>(54%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cwe.CweHandler.html">CweHandler</a> <i>(0%)</i></td>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html
index f251b9c37..85d25c1f2 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html
@@ -15,31 +15,31 @@ org.owasp.dependencycheck.data.lucene
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.DependencySimilarity.html">DependencySimilarity</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html">SearchVersionAnalyzer</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a> <i>(78%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html">VersionAnalyzer</a> <i>(0%)</i></td>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html
index 106126a9d..565120dd2 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html
@@ -15,10 +15,10 @@ org.owasp.dependencycheck.data.nexus
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a> <i>(50%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a> <i>(70%)</i></td>
</tr>
</tbody>
</table>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html
index 8d7c4207b..86b4737fd 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html
@@ -24,7 +24,7 @@ org.owasp.dependencycheck.data.nuget
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.NuspecParser.html">NuspecParser</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a> <i>(94%)</i></td>
</tr>
</tbody>
</table>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html
index 84c146116..aef13d5cc 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html
@@ -15,7 +15,7 @@ org.owasp.dependencycheck.data.nvdcve
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a> <i>(45%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html">CorruptDatabaseException</a> <i>(N/A)</i></td>
@@ -24,16 +24,16 @@ org.owasp.dependencycheck.data.nvdcve
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DatabaseException.html">DatabaseException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a> <i>(21%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html">DriverLoadException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a> <i>(59%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a> <i>(9%)</i></td>
</tr>
</tbody>
</table>
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 6275c06ad..85459f21e 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
@@ -30,7 +30,7 @@ org.owasp.dependencycheck.data.update
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.UpdateService.html">UpdateService</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a> <i>(93%)</i></td>
</tr>
</tbody>
</table>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html
index 49fd999f9..2847f58b9 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html
@@ -15,10 +15,10 @@ org.owasp.dependencycheck.data.update.xml
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a> <i>(94%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a> <i>(85%)</i></td>
</tr>
</tbody>
</table>
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 1d6831f15..35e50e2c6 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
@@ -15,31 +15,31 @@ org.owasp.dependencycheck.dependency
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a> <i>(59%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a> <i>(74%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a> <i>(79%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a> <i>(31%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a> <i>(28%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a> <i>(69%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a> <i>(78%)</i></td>
</tr>
</tbody>
</table>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html
index a99d369f0..0a4463e7e 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html
@@ -15,7 +15,7 @@ org.owasp.dependencycheck
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.Engine.html">Engine</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.Engine.html">Engine</a> <i>(53%)</i></td>
</tr>
</tbody>
</table>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.reporting.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.reporting.html
index 142dc00ac..bdf39eb08 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.reporting.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.reporting.html
@@ -15,6 +15,9 @@ org.owasp.dependencycheck.reporting
<table width="100%">
<tbody>
<tr>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.reporting.EscapeTool.html">EscapeTool</a> <i>(0%)</i></td>
+</tr>
+<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.reporting.ReportGenerator.html">ReportGenerator</a> <i>(0%)</i></td>
</tr>
<tr>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.suppression.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.suppression.html
index f2216eda3..23f095ba8 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.suppression.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.suppression.html
@@ -15,22 +15,22 @@ org.owasp.dependencycheck.suppression
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a> <i>(57%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a> <i>(6%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a> <i>(97%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionParseException.html">SuppressionParseException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a> <i>(58%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a> <i>(95%)</i></td>
</tr>
</tbody>
</table>
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 9152bccc8..d1219b86d 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
@@ -15,31 +15,31 @@ org.owasp.dependencycheck.utils
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a> <i>(88%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a> <i>(39%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a> <i>(87%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a> <i>(95%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DownloadFailedException.html">DownloadFailedException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a> <i>(19%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.ExtractionException.html">ExtractionException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a> <i>(16%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Filter.html">Filter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Filter.html">Filter</a> <i>(91%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.InvalidSettingException.html">InvalidSettingException</a> <i>(N/A)</i></td>
@@ -48,25 +48,25 @@ org.owasp.dependencycheck.utils
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.LogFilter.html">LogFilter</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a> <i>(12%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Pair.html">Pair</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Pair.html">Pair</a> <i>(28%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Settings.html">Settings</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Settings.html">Settings</a> <i>(52%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a> <i>(18%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.URLConnectionFailureException.html">URLConnectionFailureException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a> <i>(95%)</i></td>
</tr>
</tbody>
</table>
diff --git a/dependency-check-core/cobertura/frame-sourcefiles.html b/dependency-check-core/cobertura/frame-sourcefiles.html
index c9924262d..0c06b337a 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles.html
@@ -15,16 +15,16 @@ All Packages
<table width="100%">
<tbody>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a> <i>(74%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a> <i>(48%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Activation.html">Activation</a> <i>(N/A)</i></td>
@@ -39,28 +39,28 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html">ActivationProperty</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.exception.AnalysisException.html">AnalysisException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.Analyzer.html">Analyzer</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a> <i>(38%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.html">ArchiveExtractionException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a> <i>(67%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Build.html">Build</a> <i>(0%)</i></td>
@@ -69,7 +69,7 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html">BuildBase</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a> <i>(81%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.CachedWebDataSource.html">CachedWebDataSource</a> <i>(N/A)</i></td>
@@ -78,16 +78,16 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html">CallableDownloadTask</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a> <i>(88%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html">CiManagement</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a> <i>(45%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html">Contributor</a> <i>(0%)</i></td>
@@ -96,34 +96,34 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html">CorruptDatabaseException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a> <i>(73%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a> <i>(55%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a> <i>(54%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cwe.CweHandler.html">CweHandler</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a> <i>(39%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DatabaseException.html">DatabaseException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a> <i>(21%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a> <i>(59%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html">Dependency</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a> <i>(34%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html">DependencyCheckScanAgent</a> <i>(0%)</i></td>
@@ -135,10 +135,10 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.DependencySimilarity.html">DependencySimilarity</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a> <i>(87%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a> <i>(95%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html">DeploymentRepository</a> <i>(N/A)</i></td>
@@ -153,25 +153,28 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.DownloadFailedException.html">DownloadFailedException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a> <i>(19%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html">DriverLoadException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a> <i>(59%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a> <i>(9%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.Engine.html">Engine</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.Engine.html">Engine</a> <i>(53%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.reporting.EscapeTool.html">EscapeTool</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a> <i>(74%)</i></td>
+</tr>
+<tr>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a> <i>(79%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html">Exclusion</a> <i>(N/A)</i></td>
@@ -183,34 +186,34 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.ExtractionException.html">ExtractionException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a> <i>(57%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.Fields.html">Fields</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a> <i>(85%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html">FileTypeAnalyzer</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a> <i>(16%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Filter.html">Filter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Filter.html">Filter</a> <i>(91%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a> <i>(76%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a> <i>(31%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a> <i>(58%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.cpe.IndexException.html">IndexException</a> <i>(N/A)</i></td>
@@ -225,10 +228,10 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html">IssueManagement</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a> <i>(53%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a> <i>(26%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.License.html">License</a> <i>(N/A)</i></td>
@@ -237,16 +240,16 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.LogFilter.html">LogFilter</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a> <i>(12%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html">MailingList</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a> <i>(50%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html">MavenNamespaceFilter</a> <i>(0%)</i></td>
@@ -255,16 +258,16 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Model.html">Model</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a> <i>(15%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a> <i>(70%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.exception.NoDataException.html">NoDataException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html">Notifier</a> <i>(0%)</i></td>
@@ -273,7 +276,7 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.NugetPackage.html">NugetPackage</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a> <i>(20%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.NuspecParseException.html">NuspecParseException</a> <i>(N/A)</i></td>
@@ -282,13 +285,13 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.NuspecParser.html">NuspecParser</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a> <i>(94%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a> <i>(85%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a> <i>(67%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.NvdCveInfo.html">NvdCveInfo</a> <i>(N/A)</i></td>
@@ -303,7 +306,7 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Organization.html">Organization</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Pair.html">Pair</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Pair.html">Pair</a> <i>(28%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Parent.html">Parent</a> <i>(N/A)</i></td>
@@ -327,10 +330,10 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Profile.html">Profile</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a> <i>(57%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a> <i>(28%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html">Relocation</a> <i>(N/A)</i></td>
@@ -363,13 +366,13 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Scm.html">Scm</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a> <i>(100%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html">SearchVersionAnalyzer</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Settings.html">Settings</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.Settings.html">Settings</a> <i>(52%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.Site.html">Site</a> <i>(N/A)</i></td>
@@ -378,25 +381,25 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.StandardUpdate.html">StandardUpdate</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a> <i>(6%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a> <i>(97%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionParseException.html">SuppressionParseException</a> <i>(N/A)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a> <i>(58%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a> <i>(95%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a> <i>(18%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.URLConnectionFailureException.html">URLConnectionFailureException</a> <i>(N/A)</i></td>
@@ -408,13 +411,13 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.UpdateService.html">UpdateService</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a> <i>(93%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a> <i>(95%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a> <i>(78%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html">VelocityLoggerRedirect</a> <i>(0%)</i></td>
@@ -426,19 +429,19 @@ All Packages
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html">VersionTokenizingFilter</a> <i>(0%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a> <i>(69%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a> <i>(100%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a> <i>(55%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a> <i>(78%)</i></td>
</tr>
<tr>
-<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a> <i>(0%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a> <i>(94%)</i></td>
</tr>
<tr>
<td nowrap="nowrap"><a target="summary" href="org.owasp.dependencycheck.jaxb.pom.generated.package-info.html">package-info</a> <i>(N/A)</i></td>
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 0538deccc..fae91402c 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.agent.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.agent.html"'>org.owasp.dependencycheck.agent</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/139</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.921875;</span>1.922</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.agent.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.agent.html"'>org.owasp.dependencycheck.agent</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.90625;</span>1.906</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,7 +28,7 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html">DependencyCheckScanAgent</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/139</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.921875;</span>1.922</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html">DependencyCheckScanAgent</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.90625;</span>1.906</td></tr>
</tbody>
</table>
@@ -37,6 +37,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f4f4722ed..6f08cea33 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);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 c46d74fc8..f4f87c09c 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 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.html"'>org.owasp.dependencycheck.analyzer</a></td><td class="value">24</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1649</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1020</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.911242603550296;</span>4.911</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.html"'>org.owasp.dependencycheck.analyzer</a></td><td class="value">24</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">55%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">919/1659</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">417/1032</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.911242603550296;</span>4.911</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.exception.html"'>org.owasp.dependencycheck.analyzer.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</tbody>
</table>
@@ -29,50 +29,50 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6153846153846154;</span>1.615</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">74%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:74px"><span class="text">26/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">8/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6153846153846154;</span>1.615</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/45</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">48%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:48px"><span class="text">25/52</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">6/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.6666666666666665;</span>3.667</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">10/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
<tr><td><a href="org.owasp.dependencycheck.analyzer.Analyzer.html">Analyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/7</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/163</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/70</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.454545454545454;</span>6.455</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">38%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:38px"><span class="text">62/159</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">19/66</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.181818181818182;</span>6.182</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/117</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.625;</span>6.625</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">67%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">80/119</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">25/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.875;</span>6.875</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/193</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/126</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierConfidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierMatch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">171/194</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">75%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">95/126</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierConfidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">3/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierMatch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">12/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">4/24</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">55%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">5/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">1/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/150</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.090909090909092;</span>9.091</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">34%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:34px"><span class="text">48/141</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">43/150</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.090909090909092;</span>9.091</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/115</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/122</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.222222222222221;</span>8.222</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:57px"><span class="text">67/116</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">33%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:33px"><span class="text">41/122</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.222222222222221;</span>8.222</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">85%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:85px"><span class="text">17/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">5/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
<tr><td><a href="org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html">FileTypeAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">76%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">23/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">71%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:71px"><span class="text">10/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/580</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/352</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.485714285714286;</span>7.486</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer$ClassNameInformation</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.485714285714286;</span>7.486</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">52%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:52px"><span class="text">300/576</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">41%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:41px"><span class="text">145/348</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.4;</span>7.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer$ClassNameInformation</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">94%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:94px"><span class="text">16/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">8/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.4;</span>7.4</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/26</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.0;</span>2</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">26%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:26px"><span class="text">7/26</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.0;</span>2</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/39</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">15%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:15px"><span class="text">6/39</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">7/34</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.625;</span>1.625</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">67%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">23/34</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">6/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.125;</span>2.125</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">55%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">5/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">1/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
</tbody>
</table>
@@ -81,6 +81,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 be1c34876..567cb6e13 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 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cpe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html"'>org.owasp.dependencycheck.data.cpe</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/115</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cpe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html"'>org.owasp.dependencycheck.data.cpe</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">82/116</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">38%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:38px"><span class="text">23/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,11 +28,11 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/91</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.9285714285714284;</span>2.929</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">73%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:73px"><span class="text">68/92</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">42%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:42px"><span class="text">12/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.9285714285714284;</span>2.929</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.cpe.Fields.html">Fields</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/32</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">58%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:58px"><span class="text">14/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">34%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:34px"><span class="text">11/32</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.cpe.IndexException.html">IndexException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
@@ -43,6 +43,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 950e92089..2396da5d1 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cwe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html"'>org.owasp.dependencycheck.data.cwe</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.8;</span>2.8</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cwe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html"'>org.owasp.dependencycheck.data.cwe</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">41%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:41px"><span class="text">12/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">2/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.8;</span>2.8</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,7 +28,7 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/21</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">54%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:54px"><span class="text">12/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">2/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.cwe.CweHandler.html">CweHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/7</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.0;</span>2</td></tr>
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7c08ec8a4..3a5945c79 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.lucene.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html"'>org.owasp.dependencycheck.data.lucene</a></td><td class="value">11</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/117</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/50</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.lucene.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html"'>org.owasp.dependencycheck.data.lucene</a></td><td class="value">11</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">71%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:71px"><span class="text">84/118</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">35/50</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,23 +28,23 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">10/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">1/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.lucene.DependencySimilarity.html">DependencySimilarity</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">6/6</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.0;</span>9</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">16/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">90%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">9/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.0;</span>9</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">1/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html">SearchVersionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2;</span>2.2</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">24/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">8/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2;</span>2.2</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/18</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">78%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">15/19</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">90%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">9/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html">VersionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
@@ -57,6 +57,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f2902f3cc..09c79d8ff 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nexus.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html"'>org.owasp.dependencycheck.data.nexus</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.1333333333333333;</span>2.133</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nexus.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html"'>org.owasp.dependencycheck.data.nexus</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">66%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:66px"><span class="text">42/63</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">62%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:62px"><span class="text">10/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2666666666666666;</span>2.267</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,9 +28,9 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">6/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/48</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.666666666666667;</span>6.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">36/51</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">62%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:62px"><span class="text">10/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.333333333333333;</span>7.333</td></tr>
</tbody>
</table>
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 8819c2b21..8741678cf 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nuget.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html"'>org.owasp.dependencycheck.data.nuget</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.238095238095238;</span>2.238</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nuget.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html"'>org.owasp.dependencycheck.data.nuget</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">51%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:51px"><span class="text">16/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">15%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:15px"><span class="text">6/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.238095238095238;</span>2.238</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -34,7 +34,7 @@ packageTable.sort(0);
<tr><td><a href="org.owasp.dependencycheck.data.nuget.NuspecParser.html">NuspecParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.0;</span>6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">94%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:94px"><span class="text">16/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">6/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.0;</span>6</td></tr>
</tbody>
</table>
@@ -43,6 +43,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 38767050f..497ffb0a9 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nvdcve.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html"'>org.owasp.dependencycheck.data.nvdcve</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/253</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/74</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.073170731707317;</span>3.073</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nvdcve.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html"'>org.owasp.dependencycheck.data.nvdcve</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">105/259</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">21/74</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.097560975609756;</span>3.098</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,20 +28,20 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/143</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.111111111111111;</span>6.111</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">45%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:45px"><span class="text">66/146</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">32%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:32px"><span class="text">13/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.222222222222222;</span>6.222</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html">CorruptDatabaseException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DatabaseException.html">DatabaseException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">21%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:21px"><span class="text">7/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
<tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html">DriverLoadException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/46</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:57px"><span class="text">27/47</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">8/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3636363636363638;</span>2.364</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">9%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:9px"><span class="text">3/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3636363636363638;</span>2.364</td></tr>
</tbody>
</table>
@@ -50,6 +50,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 ab7389d9b..df828dba5 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);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 c1210475f..6a35f9261 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,10 +16,10 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.html"'>org.owasp.dependencycheck.data.update</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/187</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5428571428571427;</span>2.543</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.html"'>org.owasp.dependencycheck.data.update</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">27/186</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">6%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:6px"><span class="text">4/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5588235294117645;</span>2.559</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.exception.html"'>org.owasp.dependencycheck.data.update.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/93</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/186</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/102</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">165/187</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">101/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -35,13 +35,13 @@ packageTable.sort(0);
<tr><td><a href="org.owasp.dependencycheck.data.update.NvdCveInfo.html">NvdCveInfo</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.NvdCveUpdater.html">NvdCveUpdater</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/11</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.NvdCveUpdater.html">NvdCveUpdater</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.StandardUpdate.html">StandardUpdate</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/52</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.875;</span>6.875</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.StandardUpdate.html">StandardUpdate</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/141</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/52</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.875;</span>6.875</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateService.html">UpdateService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/7</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateService.html">UpdateService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">93%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:93px"><span class="text">27/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
</tbody>
</table>
@@ -50,6 +50,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 3ced2e7b6..1db0b780c 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/93</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/102</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,9 +28,9 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html">CallableDownloadTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/47</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4545454545454546;</span>2.455</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html">CallableDownloadTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/52</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4545454545454546;</span>2.455</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.task.ProcessTask.html">ProcessTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/46</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.5;</span>3.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.task.ProcessTask.html">ProcessTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/50</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.5;</span>3.5</td></tr>
</tbody>
</table>
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7c9c156f5..50215def3 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
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/186</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">165/187</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">101/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,11 +28,11 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/48</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">46/48</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">86%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:86px"><span class="text">26/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">4/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/84</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">84%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:84px"><span class="text">100/119</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">89%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:89px"><span class="text">75/84</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">15/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
</tbody>
</table>
@@ -41,6 +41,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 be68cf191..e65c30932 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 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.dependency.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.dependency.html"'>org.owasp.dependencycheck.dependency</a></td><td class="value">14</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/401</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/370</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.360248447204969;</span>2.36</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.dependency.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.dependency.html"'>org.owasp.dependencycheck.dependency</a></td><td class="value">14</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">67%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">275/410</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">37%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:37px"><span class="text">140/370</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.311377245508982;</span>2.311</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,28 +28,28 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">5/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/106</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.682926829268293;</span>2.683</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">59%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:59px"><span class="text">67/113</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">17/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4680851063829787;</span>2.468</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/27</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2941176470588234;</span>2.294</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">74%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:74px"><span class="text">20/27</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">35%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:35px"><span class="text">14/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2941176470588234;</span>2.294</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/94</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$2</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$3</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$4</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$5</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">76%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">73/95</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">63%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:63px"><span class="text">37/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$2</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$3</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$4</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$5</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/22</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">31%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:31px"><span class="text">7/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">13%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:13px"><span class="text">3/22</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4444444444444446;</span>3.444</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">7/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">5/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4444444444444446;</span>3.444</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/36</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/18</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.2777777777777777;</span>1.278</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">69%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:69px"><span class="text">25/36</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">22%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:22px"><span class="text">4/18</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.2777777777777777;</span>1.278</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/74</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/72</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2777777777777777;</span>3.278</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">78%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">59/75</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">72%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:72px"><span class="text">52/72</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2777777777777777;</span>3.278</td></tr>
</tbody>
</table>
@@ -58,6 +58,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 474d0f3ca..84b355060 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);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 adc01cb28..99e2d740e 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
@@ -16,27 +16,27 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.html"'>org.owasp.dependencycheck</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/192</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2857142857142856;</span>3.286</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.agent.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.agent.html"'>org.owasp.dependencycheck.agent</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/139</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.921875;</span>1.922</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.html"'>org.owasp.dependencycheck.analyzer</a></td><td class="value">24</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1649</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1020</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.911242603550296;</span>4.911</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.html"'>org.owasp.dependencycheck</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:53px"><span class="text">105/196</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">36/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1818181818181817;</span>3.182</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.agent.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.agent.html"'>org.owasp.dependencycheck.agent</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.90625;</span>1.906</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.html"'>org.owasp.dependencycheck.analyzer</a></td><td class="value">24</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">55%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">919/1659</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">417/1032</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.911242603550296;</span>4.911</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.exception.html"'>org.owasp.dependencycheck.analyzer.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cpe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html"'>org.owasp.dependencycheck.data.cpe</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/115</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cwe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html"'>org.owasp.dependencycheck.data.cwe</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.8;</span>2.8</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.lucene.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html"'>org.owasp.dependencycheck.data.lucene</a></td><td class="value">11</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/117</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/50</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nexus.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html"'>org.owasp.dependencycheck.data.nexus</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.1333333333333333;</span>2.133</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nuget.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html"'>org.owasp.dependencycheck.data.nuget</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.238095238095238;</span>2.238</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nvdcve.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html"'>org.owasp.dependencycheck.data.nvdcve</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/253</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/74</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.073170731707317;</span>3.073</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.html"'>org.owasp.dependencycheck.data.update</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/187</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5428571428571427;</span>2.543</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cpe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html"'>org.owasp.dependencycheck.data.cpe</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">82/116</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">38%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:38px"><span class="text">23/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cwe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html"'>org.owasp.dependencycheck.data.cwe</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">41%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:41px"><span class="text">12/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">2/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.8;</span>2.8</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.lucene.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html"'>org.owasp.dependencycheck.data.lucene</a></td><td class="value">11</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">71%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:71px"><span class="text">84/118</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">35/50</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nexus.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html"'>org.owasp.dependencycheck.data.nexus</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">66%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:66px"><span class="text">42/63</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">62%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:62px"><span class="text">10/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2666666666666666;</span>2.267</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nuget.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html"'>org.owasp.dependencycheck.data.nuget</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">51%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:51px"><span class="text">16/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">15%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:15px"><span class="text">6/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.238095238095238;</span>2.238</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nvdcve.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html"'>org.owasp.dependencycheck.data.nvdcve</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">105/259</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">21/74</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.097560975609756;</span>3.098</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.html"'>org.owasp.dependencycheck.data.update</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">27/186</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">6%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:6px"><span class="text">4/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5588235294117645;</span>2.559</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.exception.html"'>org.owasp.dependencycheck.data.update.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/93</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/186</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.dependency.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.dependency.html"'>org.owasp.dependencycheck.dependency</a></td><td class="value">14</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/401</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/370</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.360248447204969;</span>2.36</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/102</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">165/187</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">101/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.dependency.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.dependency.html"'>org.owasp.dependencycheck.dependency</a></td><td class="value">14</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">67%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">275/410</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">37%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:37px"><span class="text">140/370</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.311377245508982;</span>2.311</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.exception.html"'>org.owasp.dependencycheck.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.jaxb.pom.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.html"'>org.owasp.dependencycheck.jaxb.pom</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/11</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.generated.html"'>org.owasp.dependencycheck.jaxb.pom.generated</a></td><td class="value">87</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/234</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/98</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0907407407407408;</span>1.091</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.reporting.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.reporting.html"'>org.owasp.dependencycheck.reporting</a></td><td class="value">3</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/102</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/44</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.2727272727272725;</span>4.273</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.suppression.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.suppression.html"'>org.owasp.dependencycheck.suppression</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/193</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/130</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.7916666666666665;</span>2.792</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.utils.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.utils.html"'>org.owasp.dependencycheck.utils</a></td><td class="value">22</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/554</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/260</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0588235294117645;</span>3.059</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.reporting.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.reporting.html"'>org.owasp.dependencycheck.reporting</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/113</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/44</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7142857142857144;</span>3.714</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.suppression.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.suppression.html"'>org.owasp.dependencycheck.suppression</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">77%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:77px"><span class="text">153/197</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">73%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:73px"><span class="text">96/130</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.7916666666666665;</span>2.792</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.utils.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.utils.html"'>org.owasp.dependencycheck.utils</a></td><td class="value">22</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">48%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:48px"><span class="text">279/575</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">42%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:42px"><span class="text">112/264</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.009433962264151;</span>3.009</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -48,7 +48,7 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.Engine.html">Engine</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/192</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2857142857142856;</span>3.286</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.Engine.html">Engine</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:53px"><span class="text">105/196</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">36/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1818181818181817;</span>3.182</td></tr>
</tbody>
</table>
@@ -57,6 +57,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 aeef3e13a..f3a2e5825 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);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 9f3b2c7e8..d32aa21fa 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);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7bc35945d..84b177da0 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 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.reporting.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.reporting.html"'>org.owasp.dependencycheck.reporting</a></td><td class="value">3</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/102</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/44</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.2727272727272725;</span>4.273</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.reporting.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.reporting.html"'>org.owasp.dependencycheck.reporting</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/113</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/44</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7142857142857144;</span>3.714</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,10 +28,12 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.reporting.ReportGenerator.html">ReportGenerator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/84</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/38</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.333333333333333;</span>5.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.reporting.EscapeTool.html">EscapeTool</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
+
+ <tr><td><a href="org.owasp.dependencycheck.reporting.ReportGenerator.html">ReportGenerator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/86</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/38</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.333333333333333;</span>5.333</td></tr>
<tr><td><a href="org.owasp.dependencycheck.reporting.ReportGenerator.html">ReportGenerator$Format</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.333333333333333;</span>5.333</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html">VelocityLoggerRedirect</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/13</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html">VelocityLoggerRedirect</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
</tbody>
</table>
@@ -40,6 +42,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 40cc46b7e..34663378d 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 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.suppression.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.suppression.html"'>org.owasp.dependencycheck.suppression</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/193</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/130</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.7916666666666665;</span>2.792</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.suppression.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.suppression.html"'>org.owasp.dependencycheck.suppression</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">77%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:77px"><span class="text">153/197</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">73%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:73px"><span class="text">96/130</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.7916666666666665;</span>2.792</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,17 +28,17 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1;</span>3.1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:57px"><span class="text">16/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">46%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:46px"><span class="text">13/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1;</span>3.1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">6%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:6px"><span class="text">1/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/26</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.6;</span>3.6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">97%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:97px"><span class="text">39/40</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">84%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:84px"><span class="text">22/26</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.6;</span>3.6</td></tr>
<tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionParseException.html">SuppressionParseException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">10.0;</span>10</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">58%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:58px"><span class="text">17/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">10.0;</span>10</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/82</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/68</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">80/84</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">89%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:89px"><span class="text">61/68</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
</tbody>
</table>
@@ -47,6 +47,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7fd501762..c92ee04ee 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 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.utils.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.utils.html"'>org.owasp.dependencycheck.utils</a></td><td class="value">22</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/554</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/260</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0588235294117645;</span>3.059</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.utils.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.utils.html"'>org.owasp.dependencycheck.utils</a></td><td class="value">22</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">48%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:48px"><span class="text">279/575</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">42%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:42px"><span class="text">112/264</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.009433962264151;</span>3.009</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -28,45 +28,45 @@ packageTable.sort(0);
<table class="report" id="classResults">
<thead><tr> <td class="heading">Classes in this Package</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4;</span>2.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">22/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">75%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">9/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4;</span>2.4</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">39%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:39px"><span class="text">9/23</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">2/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/77</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.090909090909091;</span>5.091</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">87%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:87px"><span class="text">67/77</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">44/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.090909090909091;</span>5.091</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.0;</span>7</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">23/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">92%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:92px"><span class="text">13/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.0;</span>7</td></tr>
<tr><td><a href="org.owasp.dependencycheck.utils.DownloadFailedException.html">DownloadFailedException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/80</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.25;</span>8.25</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">19%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:19px"><span class="text">16/81</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">3/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.25;</span>8.25</td></tr>
<tr><td><a href="org.owasp.dependencycheck.utils.ExtractionException.html">ExtractionException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/87</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/38</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.777777777777778;</span>4.778</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">14/85</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">11%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:11px"><span class="text">4/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.444444444444445;</span>4.444</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$FilterIterator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">1/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$FilterIterator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">90%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">18/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">8/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
<tr><td><a href="org.owasp.dependencycheck.utils.InvalidSettingException.html">InvalidSettingException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
<tr><td><a href="org.owasp.dependencycheck.utils.LogFilter.html">LogFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/23</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">12%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:12px"><span class="text">3/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">1/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Pair.html">Pair</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.75;</span>2.75</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Pair.html">Pair</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">4/14</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">2/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.75;</span>2.75</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.55;</span>2.55</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings$KEYS</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.55;</span>2.55</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">52%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:52px"><span class="text">72/137</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">44%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:44px"><span class="text">16/36</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings$KEYS</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">7/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">1/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
<tr><td><a href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
<tr><td><a href="org.owasp.dependencycheck.utils.URLConnectionFailureException.html">URLConnectionFailureException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/21</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">20/21</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">83%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:83px"><span class="text">10/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
</tbody>
</table>
@@ -75,6 +75,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
diff --git a/dependency-check-core/cobertura/frame-summary.html b/dependency-check-core/cobertura/frame-summary.html
index 8b8e0ae28..266bd4cfd 100644
--- a/dependency-check-core/cobertura/frame-summary.html
+++ b/dependency-check-core/cobertura/frame-summary.html
@@ -16,28 +16,28 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><b>All Packages</b></td><td class="value">208</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4545</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2560</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.274981765134938;</span>2.275</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.html"'>org.owasp.dependencycheck</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/192</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2857142857142856;</span>3.286</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.agent.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.agent.html"'>org.owasp.dependencycheck.agent</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/139</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.921875;</span>1.922</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.html"'>org.owasp.dependencycheck.analyzer</a></td><td class="value">24</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1649</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1020</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.911242603550296;</span>4.911</td></tr>
+ <tr><td><b>All Packages</b></td><td class="value">209</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">48%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:48px"><span class="text">2264/4626</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">38%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:38px"><span class="text">1003/2574</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2673410404624277;</span>2.267</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.html"'>org.owasp.dependencycheck</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:53px"><span class="text">105/196</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">36/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1818181818181817;</span>3.182</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.agent.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.agent.html"'>org.owasp.dependencycheck.agent</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.90625;</span>1.906</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.html"'>org.owasp.dependencycheck.analyzer</a></td><td class="value">24</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">55%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">919/1659</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">417/1032</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.911242603550296;</span>4.911</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.analyzer.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.analyzer.exception.html"'>org.owasp.dependencycheck.analyzer.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cpe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html"'>org.owasp.dependencycheck.data.cpe</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/115</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cwe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html"'>org.owasp.dependencycheck.data.cwe</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.8;</span>2.8</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.lucene.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html"'>org.owasp.dependencycheck.data.lucene</a></td><td class="value">11</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/117</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/50</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nexus.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html"'>org.owasp.dependencycheck.data.nexus</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.1333333333333333;</span>2.133</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nuget.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html"'>org.owasp.dependencycheck.data.nuget</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.238095238095238;</span>2.238</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nvdcve.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html"'>org.owasp.dependencycheck.data.nvdcve</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/253</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/74</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.073170731707317;</span>3.073</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.html"'>org.owasp.dependencycheck.data.update</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/187</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5428571428571427;</span>2.543</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cpe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html"'>org.owasp.dependencycheck.data.cpe</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">82/116</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">38%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:38px"><span class="text">23/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.cwe.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.cwe.html"'>org.owasp.dependencycheck.data.cwe</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">41%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:41px"><span class="text">12/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">2/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.8;</span>2.8</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.lucene.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.lucene.html"'>org.owasp.dependencycheck.data.lucene</a></td><td class="value">11</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">71%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:71px"><span class="text">84/118</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">35/50</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nexus.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nexus.html"'>org.owasp.dependencycheck.data.nexus</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">66%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:66px"><span class="text">42/63</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">62%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:62px"><span class="text">10/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2666666666666666;</span>2.267</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nuget.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nuget.html"'>org.owasp.dependencycheck.data.nuget</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">51%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:51px"><span class="text">16/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">15%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:15px"><span class="text">6/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.238095238095238;</span>2.238</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.nvdcve.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.nvdcve.html"'>org.owasp.dependencycheck.data.nvdcve</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">105/259</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">21/74</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.097560975609756;</span>3.098</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.html"'>org.owasp.dependencycheck.data.update</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">27/186</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">6%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:6px"><span class="text">4/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5588235294117645;</span>2.559</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.exception.html"'>org.owasp.dependencycheck.data.update.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/93</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/186</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.dependency.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.dependency.html"'>org.owasp.dependencycheck.dependency</a></td><td class="value">14</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/401</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/370</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.360248447204969;</span>2.36</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.task.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.task.html"'>org.owasp.dependencycheck.data.update.task</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/102</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.823529411764706;</span>2.824</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.data.update.xml.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.data.update.xml.html"'>org.owasp.dependencycheck.data.update.xml</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">165/187</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">101/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.914285714285714;</span>2.914</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.dependency.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.dependency.html"'>org.owasp.dependencycheck.dependency</a></td><td class="value">14</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">67%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">275/410</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">37%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:37px"><span class="text">140/370</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.311377245508982;</span>2.311</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.exception.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.exception.html"'>org.owasp.dependencycheck.exception</a></td><td class="value">2</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.jaxb.pom.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.html"'>org.owasp.dependencycheck.jaxb.pom</a></td><td class="value">1</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/11</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
<tr><td><a href="frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.generated.html"'>org.owasp.dependencycheck.jaxb.pom.generated</a></td><td class="value">87</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/234</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/98</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0907407407407408;</span>1.091</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.reporting.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.reporting.html"'>org.owasp.dependencycheck.reporting</a></td><td class="value">3</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/102</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/44</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.2727272727272725;</span>4.273</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.suppression.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.suppression.html"'>org.owasp.dependencycheck.suppression</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/193</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/130</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.7916666666666665;</span>2.792</td></tr>
- <tr><td><a href="frame-summary-org.owasp.dependencycheck.utils.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.utils.html"'>org.owasp.dependencycheck.utils</a></td><td class="value">22</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/554</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/260</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0588235294117645;</span>3.059</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.reporting.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.reporting.html"'>org.owasp.dependencycheck.reporting</a></td><td class="value">4</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/113</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/44</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7142857142857144;</span>3.714</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.suppression.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.suppression.html"'>org.owasp.dependencycheck.suppression</a></td><td class="value">6</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">77%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:77px"><span class="text">153/197</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">73%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:73px"><span class="text">96/130</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.7916666666666665;</span>2.792</td></tr>
+ <tr><td><a href="frame-summary-org.owasp.dependencycheck.utils.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-org.owasp.dependencycheck.utils.html"'>org.owasp.dependencycheck.utils</a></td><td class="value">22</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">48%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:48px"><span class="text">279/575</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">42%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:42px"><span class="text">112/264</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.009433962264151;</span>3.009</td></tr>
</tbody>
</table>
<script type="text/javascript">
@@ -45,6 +45,6 @@ var packageTable = new SortableTable(document.getElementById("packageResults"),
["String", "Number", "Percentage", "Percentage", "FormattedNumber"]);
packageTable.sort(0);
</script>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
index b4b2248f7..3d2d58267 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 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.Engine.html">Engine</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/192</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2857142857142856;</span>3.286</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.Engine.html">Engine</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:53px"><span class="text">105/196</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">36/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1818181818181817;</span>3.182</td></tr>
</table>
<div class="separator"> </div>
@@ -154,607 +154,610 @@
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Set<FileTypeAnalyzer> fileTypeAnalyzers;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The ClassLoader to use when dynamically loading Analyzer and Update services.</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates a new Engine.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> ClassLoader serviceClassLoader;</pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an error connecting to the database</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> Engine() <span class="keyword">throws</span> DatabaseException {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.dependencies = <span class="keyword">new</span> ArrayList<Dependency>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.analyzers = <span class="keyword">new</span> EnumMap<AnalysisPhase, List<Analyzer>>(AnalysisPhase.<span class="keyword">class</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.fileTypeAnalyzers = <span class="keyword">new</span> HashSet<FileTypeAnalyzer>();</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ConnectionFactory.initialize();</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> autoUpdate = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidSettingException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Invalid setting for auto-update; using true."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"><a title="Line 88: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 88: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (autoUpdate) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> doUpdates();</span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> loadAnalyzers();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Properly cleans up resources allocated during analysis.</span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger for use throughout the class.</span></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> cleanup() {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ConnectionFactory.cleanup();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(Engine.<span class="keyword">class</span>.getName());</pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates a new Engine.</span></pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an error connecting to the database</span></pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Engine() <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 84</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(Thread.currentThread().getContextClassLoader());</pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates a new Engine using the specified classloader to dynamically load Analyzer and Update services.</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param serviceClassLoader the ClassLoader to use when dynamically loading Analyzer and Update services</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an error connecting to the database</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Engine(ClassLoader serviceClassLoader) <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.dependencies = <span class="keyword">new</span> ArrayList<Dependency>();</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.analyzers = <span class="keyword">new</span> EnumMap<AnalysisPhase, List<Analyzer>>(AnalysisPhase.<span class="keyword">class</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileTypeAnalyzers = <span class="keyword">new</span> HashSet<FileTypeAnalyzer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.serviceClassLoader = serviceClassLoader;</pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ConnectionFactory.initialize();</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> autoUpdate = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads the analyzers specified in the configuration file (or system properties).</span></pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> loadAnalyzers() {</pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"><a title="Line 106: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 106: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzers.put(phase, <span class="keyword">new</span> ArrayList<Analyzer>());</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);</pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidSettingException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Invalid setting for auto-update; using true."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (autoUpdate) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> doUpdates();</span></pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> loadAnalyzers();</pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Properly cleans up resources allocated during analysis.</span></pre></td></tr>
+<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> cleanup() {</pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ConnectionFactory.cleanup();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> AnalyzerService service = AnalyzerService.getInstance();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Analyzer> iterator = service.getAnalyzers();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"><a title="Line 112: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 112: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (iterator.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Analyzer a = iterator.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzers.get(a.getAnalysisPhase()).add(a);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (a <span class="keyword">instanceof</span> FileTypeAnalyzer) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.fileTypeAnalyzers.add((FileTypeAnalyzer) a);</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads the analyzers specified in the configuration file (or system properties).</span></pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the List of the analyzers for a specific phase of analysis.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> loadAnalyzers() {</pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param phase the phase to get the configured analyzers.</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the analyzers loaded</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> List<Analyzer> getAnalyzers(AnalysisPhase phase) {</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> analyzers.get(phase);</span></pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the dependencies identified.</span></pre></td></tr>
-<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the dependencies identified</span></pre></td></tr>
-<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"><a title="Line 125: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 125: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> analyzers.put(phase, <span class="keyword">new</span> ArrayList<Analyzer>());</pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> AnalyzerService service = <span class="keyword">new</span> AnalyzerService(serviceClassLoader);</pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Analyzer> iterator = service.getAnalyzers();</pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"><a title="Line 131: Conditional coverage 100% (2/2)."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 131: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (iterator.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Analyzer a = iterator.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> analyzers.get(a.getAnalysisPhase()).add(a);</pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"><a title="Line 134: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 134: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (a <span class="keyword">instanceof</span> FileTypeAnalyzer) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileTypeAnalyzers.add((FileTypeAnalyzer) a);</pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> List<Dependency> getDependencies() {</pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> dependencies;</pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDependencies(List<Dependency> dependencies) {</pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.dependencies = dependencies;</pre></td></tr>
-<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//for (Dependency dependency: dependencies) {</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// dependencies.add(dependency);</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//}</span></pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Scans an array of files or directories. If a directory is specified, it will be scanned recursively. Any</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * dependencies identified are added to the dependency collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the List of the analyzers for a specific phase of analysis.</span></pre></td></tr>
+<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param phase the phase to get the configured analyzers.</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the analyzers loaded</span></pre></td></tr>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> List<Analyzer> getAnalyzers(AnalysisPhase phase) {</pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> analyzers.get(phase);</span></pre></td></tr>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.5</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the dependencies identified.</span></pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param paths an array of paths to files or directories to be analyzed.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the dependencies identified</span></pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(String[] paths) {</pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"><a title="Line 156: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 156: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String path : paths) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(path);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> List<Dependency> getDependencies() {</pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> dependencies;</pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDependencies(List<Dependency> dependencies) {</pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.dependencies = dependencies;</pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//for (Dependency dependency: dependencies) {</span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// dependencies.add(dependency);</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Scans a given file or directory. If a directory is specified, it will be scanned recursively. Any dependencies</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//}</span></pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * identified are added to the dependency collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param path the path to a file or directory to be analyzed.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(String path) {</pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"><a title="Line 169: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 169: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (path.matches(<span class="string">"^.*[\\/]\\*\\.[^\\/:*|?<>\"]+$"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] parts = path.split(<span class="string">"\\*\\."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] ext = <span class="keyword">new</span> String[]{parts[parts.length - 1]};</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File dir = <span class="keyword">new</span> File(path.substring(0, path.length() - ext[0].length() - 2));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"><a title="Line 173: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 173: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dir.isDirectory()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<File> files = (List<File>) org.apache.commons.io.FileUtils.listFiles(dir, ext, <span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(files);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Invalid file path provided to scan '%s'"</span>, path);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.SEVERE, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(path);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Scans an array of files or directories. If a directory is specified, it will be scanned recursively. Any</span></pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * dependencies identified are added to the dependency collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.5</span></pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param files an array of paths to files or directories to be analyzed.</span></pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param paths an array of paths to files or directories to be analyzed.</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(File[] files) {</pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"><a title="Line 195: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 195: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File file : files) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
-<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(String[] paths) {</pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"><a title="Line 175: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 175: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String path : paths) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(path);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any</span></pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * dependencies identified are added to the dependency collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.5</span></pre></td></tr>
-<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param files a set of paths to files or directories to be analyzed.</span></pre></td></tr>
-<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(Set<File> files) {</pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File file : files) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any</span></pre></td></tr>
-<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * dependencies identified are added to the dependency collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.5</span></pre></td></tr>
-<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param files a set of paths to files or directories to be analyzed.</span></pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(List<File> files) {</pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File file : files) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Scans a given file or directory. If a directory is specified, it will be scanned recursively. Any dependencies</span></pre></td></tr>
-<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * identified are added to the dependency collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param path the path to a file or directory to be analyzed.</span></pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(String path) {</pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"><a title="Line 188: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 188: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (path.matches(<span class="string">"^.*[\\/]\\*\\.[^\\/:*|?<>\"]+$"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] parts = path.split(<span class="string">"\\*\\."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] ext = <span class="keyword">new</span> String[]{parts[parts.length - 1]};</span></pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File dir = <span class="keyword">new</span> File(path.substring(0, path.length() - ext[0].length() - 2));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"><a title="Line 192: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 192: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dir.isDirectory()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<File> files = (List<File>) org.apache.commons.io.FileUtils.listFiles(dir, ext, <span class="keyword">true</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(files);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Invalid file path provided to scan '%s'"</span>, path);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(path);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
+<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Scans an array of files or directories. If a directory is specified, it will be scanned recursively. Any</span></pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * dependencies identified are added to the dependency collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.5</span></pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param files an array of paths to files or directories to be analyzed.</span></pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(File[] files) {</pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"><a title="Line 214: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 214: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File file : files) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
+<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any</span></pre></td></tr>
+<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * dependencies identified are added to the dependency collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.5</span></pre></td></tr>
+<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param files a set of paths to files or directories to be analyzed.</span></pre></td></tr>
+<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(Set<File> files) {</pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"><a title="Line 228: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 228: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File file : files) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.4</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the path to a file or directory to be analyzed.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any</span></pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * dependencies identified are added to the dependency collection.</span></pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(File file) {</pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsUncovered"><a title="Line 237: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 237: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"><a title="Line 238: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 238: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file.isDirectory()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanDirectory(file);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.5</span></pre></td></tr>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param files a set of paths to files or directories to be analyzed.</span></pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanFile(file);</span></pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(List<File> files) {</pre></td></tr>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"><a title="Line 242: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 242: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File file : files) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan(file);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Recursively scans files and directories. Any dependencies identified are added to the dependency collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Scans a given file or directory. If a directory is specified, it will be scanned recursively. Any dependencies</span></pre></td></tr>
<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dir the directory to scan.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * identified are added to the dependency collection.</span></pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> scanDirectory(File dir) {</pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File[] files = dir.listFiles();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"><a title="Line 253: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 253: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (files != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"><a title="Line 254: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 254: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File f : files) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"><a title="Line 255: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 255: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (f.isDirectory()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanDirectory(f);</span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanFile(f);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @since v0.3.2.4</span></pre></td></tr>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the path to a file or directory to be analyzed.</span></pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> scan(File file) {</pre></td></tr>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"><a title="Line 256: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 256: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (file.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"><a title="Line 257: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 257: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (file.isDirectory()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> scanDirectory(file);</pre></td></tr>
<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> scanFile(file);</pre></td></tr>
<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 263</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Scans a specified file. If a dependency is identified it is added to the dependency collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Recursively scans files and directories. Any dependencies identified are added to the dependency collection.</span></pre></td></tr>
<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file The file to scan.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dir the directory to scan.</span></pre></td></tr>
<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> scanFile(File file) {</pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"><a title="Line 270: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 270: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!file.isFile()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Path passed to scanFile(File) is not a file: %s. Skipping the file."</span>, file.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> scanDirectory(File dir) {</pre></td></tr>
+<tr> <td class="numLineCover"> 271</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File[] files = dir.listFiles();</pre></td></tr>
+<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"><a title="Line 272: Conditional coverage 50% (1/2)."> 38</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 272: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (files != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"><a title="Line 273: Conditional coverage 100% (2/2)."> 74</a></td> <td class="src"><pre class="src"> <a title="Line 273: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (File f : files) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"><a title="Line 274: Conditional coverage 50% (1/2)."> 36</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 274: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (f.isDirectory()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> scanDirectory(f);</pre></td></tr>
+<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanFile(f);</span></pre></td></tr>
+<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String fileName = file.getName();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String extension = FileUtils.getFileExtension(fileName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"><a title="Line 277: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 277: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (extension != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"><a title="Line 278: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 278: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (supportsExtension(extension)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Dependency dependency = <span class="keyword">new</span> Dependency(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependencies.add(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 281</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"No file extension found on file '%s'. The file was not analyzed."</span>,</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> file.toString());</pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINEST, msg);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Scans a specified file. If a dependency is identified it is added to the dependency collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file The file to scan.</span></pre></td></tr>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Runs the analyzers against all of the dependencies.</span></pre></td></tr>
-<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyzeDependencies() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> scanFile(File file) {</pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"><a title="Line 289: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 289: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!file.isFile()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Path passed to scanFile(File) is not a file: %s. Skipping the file."</span>, file.toString());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//need to ensure that data exists</span></pre></td></tr>
-<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ensureDataExists();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoDataException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%s%n%nUnable to continue dependency-check analysis."</span>, ex.getMessage());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.SEVERE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%s%n%nUnable to continue dependency-check analysis."</span>, ex.getMessage());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.SEVERE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String fileName = file.getName();</pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String extension = FileUtils.getFileExtension(fileName);</pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"><a title="Line 296: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 296: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (extension != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"><a title="Line 297: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 297: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (supportsExtension(extension)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Dependency dependency = <span class="keyword">new</span> Dependency(file);</pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependencies.add(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"No file extension found on file '%s'. The file was not analyzed."</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> file.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 307</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String logHeader = String.format(<span class="string">"%n"</span></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Runs the analyzers against all of the dependencies.</span></pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"----------------------------------------------------%n"</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"BEGIN ANALYSIS%n"</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyzeDependencies() {</pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"----------------------------------------------------"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 313</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, logHeader);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.INFO, <span class="string">"Analysis Starting"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// analysis phases</span></pre></td></tr>
-<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"><a title="Line 317: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 317: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 318</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Analyzer> analyzerList = analyzers.get(phase);</span></pre></td></tr>
-<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"><a title="Line 320: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 320: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Analyzer a : analyzerList) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 321</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> initializeAnalyzer(a);</span></pre></td></tr>
-<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/* need to create a copy of the collection because some of the</span></pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * analyzers may modify it. This prevents ConcurrentModificationExceptions.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//need to ensure that data exists</span></pre></td></tr>
+<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 314</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ensureDataExists();</pre></td></tr>
+<tr> <td class="numLineCover"> 315</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoDataException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 316</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%s%n%nUnable to continue dependency-check analysis."</span>, ex.getMessage());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 318</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 319</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%s%n%nUnable to continue dependency-check analysis."</span>, ex.getMessage());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This is okay for adds/deletes because it happens per analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Begin Analyzer '%s'"</span>, a.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Dependency> dependencySet = <span class="keyword">new</span> HashSet<Dependency>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 330</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependencySet.addAll(dependencies);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"><a title="Line 331: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 331: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependencySet) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> shouldAnalyze = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"><a title="Line 333: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 333: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (a <span class="keyword">instanceof</span> FileTypeAnalyzer) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 334</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 337</td> <td class="nbHitsUncovered"><a title="Line 337: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 337: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (shouldAnalyze) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 338</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msgFile = String.format(<span class="string">"Begin Analysis of '%s'"</span>, d.getActualFilePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 339</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, msgFile);</span></pre></td></tr>
-<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 341</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> a.analyze(d, <span class="keyword">this</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (AnalysisException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String exMsg = String.format(<span class="string">"An error occured while analyzing '%s'."</span>, d.getActualFilePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 344</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.WARNING, exMsg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 345</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 346</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 347</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String axMsg = String.format(<span class="string">"An unexpected error occurred during analysis of '%s'"</span>, d.getActualFilePath());</span></pre></td></tr>
-<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//final AnalysisException ax = new AnalysisException(axMsg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 349</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.WARNING, axMsg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 350</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 353</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"><a title="Line 356: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 356: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Analyzer> analyzerList = analyzers.get(phase);</span></pre></td></tr>
-<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 359</td> <td class="nbHitsUncovered"><a title="Line 359: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 359: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Analyzer a : analyzerList) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 360</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> closeAnalyzer(a);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 326</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 364</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String logFooter = String.format(<span class="string">"%n"</span></span></pre></td></tr>
-<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String logHeader = String.format(<span class="string">"%n"</span></pre></td></tr>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"----------------------------------------------------%n"</span></pre></td></tr>
-<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"END ANALYSIS%n"</span></pre></td></tr>
-<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"BEGIN ANALYSIS%n"</span></pre></td></tr>
+<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"----------------------------------------------------"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, logFooter);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 369</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.INFO, <span class="string">"Analysis Complete"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 332</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, logHeader);</pre></td></tr>
+<tr> <td class="numLineCover"> 333</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.INFO, <span class="string">"Analysis Starting"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// analysis phases</span></pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsCovered"><a title="Line 336: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 336: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 337</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<Analyzer> analyzerList = analyzers.get(phase);</pre></td></tr>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsCovered"><a title="Line 339: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 339: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Analyzer a : analyzerList) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 340</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> initializeAnalyzer(a);</pre></td></tr>
+<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/* need to create a copy of the collection because some of the</span></pre></td></tr>
+<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * analyzers may modify it. This prevents ConcurrentModificationExceptions.</span></pre></td></tr>
+<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * This is okay for adds/deletes because it happens per analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 346</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Begin Analyzer '%s'"</span>, a.getName());</pre></td></tr>
+<tr> <td class="numLineCover"> 347</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, msg);</pre></td></tr>
+<tr> <td class="numLineCover"> 348</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<Dependency> dependencySet = <span class="keyword">new</span> HashSet<Dependency>();</pre></td></tr>
+<tr> <td class="numLineCover"> 349</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dependencySet.addAll(dependencies);</pre></td></tr>
+<tr> <td class="numLineCover"> 350</td> <td class="nbHitsCovered"><a title="Line 350: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 350: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Dependency d : dependencySet) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 351</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> shouldAnalyze = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 352</td> <td class="nbHitsCovered"><a title="Line 352: Conditional coverage 100% (2/2)."> 26</a></td> <td class="src"><pre class="src"> <a title="Line 352: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (a <span class="keyword">instanceof</span> FileTypeAnalyzer) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">final</span> FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;</pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());</pre></td></tr>
+<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 356</td> <td class="nbHitsCovered"><a title="Line 356: Conditional coverage 100% (2/2)."> 26</a></td> <td class="src"><pre class="src"> <a title="Line 356: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (shouldAnalyze) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 357</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String msgFile = String.format(<span class="string">"Begin Analysis of '%s'"</span>, d.getActualFilePath());</pre></td></tr>
+<tr> <td class="numLineCover"> 358</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, msgFile);</pre></td></tr>
+<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> a.analyze(d, <span class="keyword">this</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (AnalysisException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 362</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String exMsg = String.format(<span class="string">"An error occurred while analyzing '%s'."</span>, d.getActualFilePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 363</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, exMsg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 364</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String axMsg = String.format(<span class="string">"An unexpected error occurred during analysis of '%s'"</span>, d.getActualFilePath());</span></pre></td></tr>
+<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//final AnalysisException ax = new AnalysisException(axMsg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, axMsg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Initializes the given analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 372</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 373</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param analyzer the analyzer to initialize</span></pre></td></tr>
-<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 375</td> <td class="nbHitsCovered"><a title="Line 375: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 375: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 376</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<Analyzer> analyzerList = analyzers.get(phase);</pre></td></tr>
<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> initializeAnalyzer(Analyzer analyzer) {</pre></td></tr>
-<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Initializing %s"</span>, analyzer.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 380</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 381</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzer.initialize();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 382</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 383</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception occurred initializing %s."</span>, analyzer.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 384</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.SEVERE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 385</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 378</td> <td class="nbHitsCovered"><a title="Line 378: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 378: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Analyzer a : analyzerList) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 379</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> closeAnalyzer(a);</pre></td></tr>
+<tr> <td class="numLineCover"> 380</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String logFooter = String.format(<span class="string">"%n"</span></pre></td></tr>
+<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"----------------------------------------------------%n"</span></pre></td></tr>
+<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"END ANALYSIS%n"</span></pre></td></tr>
<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 387</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzer.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 388</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex1) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 389</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex1);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 390</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 391</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 392</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> + <span class="string">"----------------------------------------------------"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 387</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, logFooter);</pre></td></tr>
+<tr> <td class="numLineCover"> 388</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.INFO, <span class="string">"Analysis Complete"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 389</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Initializes the given analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Closes the given analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param analyzer the analyzer to initialize</span></pre></td></tr>
+<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> initializeAnalyzer(Analyzer analyzer) {</pre></td></tr>
<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param analyzer the analyzer to close</span></pre></td></tr>
-<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> closeAnalyzer(Analyzer analyzer) {</pre></td></tr>
-<tr> <td class="numLineCover"> 400</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Closing Analyzer '%s'"</span>, analyzer.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 401</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 403</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzer.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 404</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 405</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 406</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 407</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Cycles through the cached web data sources and calls update on all of them.</span></pre></td></tr>
-<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> doUpdates() {</pre></td></tr>
-<tr> <td class="numLineCover"> 413</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> UpdateService service = UpdateService.getInstance();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 414</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<CachedWebDataSource> iterator = service.getDataSources();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsUncovered"><a title="Line 415: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 415: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (iterator.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 416</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> CachedWebDataSource source = iterator.next();</span></pre></td></tr>
-<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 398</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Initializing %s"</span>, analyzer.getName());</pre></td></tr>
+<tr> <td class="numLineCover"> 399</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, msg);</pre></td></tr>
+<tr> <td class="numLineCover"> 400</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> analyzer.initialize();</pre></td></tr>
+<tr> <td class="numLineCover"> 401</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 402</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception occurred initializing %s."</span>, analyzer.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 403</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 404</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 418</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> source.update();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 419</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UpdateException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 420</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.WARNING,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 406</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzer.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 407</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex1) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 408</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex1);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 409</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 410</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 411</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Closes the given analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 416</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param analyzer the analyzer to close</span></pre></td></tr>
+<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> closeAnalyzer(Analyzer analyzer) {</pre></td></tr>
+<tr> <td class="numLineCover"> 419</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Closing Analyzer '%s'"</span>, analyzer.getName());</pre></td></tr>
+<tr> <td class="numLineCover"> 420</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, msg);</pre></td></tr>
<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Unable to update Cached Web DataSource, using local data instead. Results may not include recent vulnerabilities."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 422</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Engine.<span class="keyword">class</span>.getName()).log(Level.FINE,</span></pre></td></tr>
-<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String.format(<span class="string">"Unable to update details for %s"</span>, source.getClass().getName()), ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 424</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 425</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 426</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 422</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> analyzer.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 423</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 424</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 425</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 426</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 427</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a full list of all of the analyzers. This is useful for reporting which analyzers where used.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Cycles through the cached web data sources and calls update on all of them.</span></pre></td></tr>
<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a list of Analyzers</span></pre></td></tr>
-<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> List<Analyzer> getAnalyzers() {</pre></td></tr>
-<tr> <td class="numLineCover"> 434</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Analyzer> ret = <span class="keyword">new</span> ArrayList<Analyzer>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 435</td> <td class="nbHitsUncovered"><a title="Line 435: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 435: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 436</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Analyzer> analyzerList = analyzers.get(phase);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 437</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.addAll(analyzerList);</span></pre></td></tr>
-<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 439</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> doUpdates() {</pre></td></tr>
+<tr> <td class="numLineCover"> 432</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> UpdateService service = <span class="keyword">new</span> UpdateService(serviceClassLoader);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 433</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<CachedWebDataSource> iterator = service.getDataSources();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 434</td> <td class="nbHitsUncovered"><a title="Line 434: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 434: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (iterator.hasNext()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 435</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> CachedWebDataSource source = iterator.next();</span></pre></td></tr>
+<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 437</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> source.update();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 438</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UpdateException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 439</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING,</span></pre></td></tr>
<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="string">"Unable to update Cached Web DataSource, using local data instead. Results may not include recent vulnerabilities."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 441</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE,</span></pre></td></tr>
<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks all analyzers to see if an extension is supported.</span></pre></td></tr>
-<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ext a file extension</span></pre></td></tr>
+ <td class="src"><pre class="src"> String.format(<span class="string">"Unable to update details for %s"</span>, source.getClass().getName()), ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 443</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 444</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 445</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false depending on whether or not the file extension is supported</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> supportsExtension(String ext) {</pre></td></tr>
-<tr> <td class="numLineCover"> 449</td> <td class="nbHitsUncovered"><a title="Line 449: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 449: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ext == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 450</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a full list of all of the analyzers. This is useful for reporting which analyzers where used.</span></pre></td></tr>
+<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 450</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a list of Analyzers</span></pre></td></tr>
<tr> <td class="numLine"> 451</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> List<Analyzer> getAnalyzers() {</pre></td></tr>
+<tr> <td class="numLineCover"> 453</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Analyzer> ret = <span class="keyword">new</span> ArrayList<Analyzer>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 454</td> <td class="nbHitsUncovered"><a title="Line 454: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 454: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (AnalysisPhase phase : AnalysisPhase.values()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 455</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Analyzer> analyzerList = analyzers.get(phase);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 456</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.addAll(analyzerList);</span></pre></td></tr>
+<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 452</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> scan = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 453</td> <td class="nbHitsUncovered"><a title="Line 453: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 453: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (FileTypeAnalyzer a : <span class="keyword">this</span>.fileTypeAnalyzers) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/* note, we can't break early on this loop as the analyzers need to know if</span></pre></td></tr>
-<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> they have files to work on prior to initialization */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 456</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scan |= a.supportsExtension(ext);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 457</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 458</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> scan;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 458</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
<tr> <td class="numLine"> 459</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 460</td> <td class="nbHits"> </td>
@@ -762,45 +765,74 @@
<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks the CPE Index to ensure documents exists. If none exist a NoDataException is thrown.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks all analyzers to see if an extension is supported.</span></pre></td></tr>
<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 464</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws NoDataException thrown if no data exists in the CPE Index</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ext a file extension</span></pre></td></tr>
<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an exception opening the database</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false depending on whether or not the file extension is supported</span></pre></td></tr>
<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> ensureDataExists() <span class="keyword">throws</span> NoDataException, DatabaseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 468</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> CpeMemoryIndex cpe = CpeMemoryIndex.getInstance();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 469</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> CveDB cve = <span class="keyword">new</span> CveDB();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> supportsExtension(String ext) {</pre></td></tr>
+<tr> <td class="numLineCover"> 468</td> <td class="nbHitsCovered"><a title="Line 468: Conditional coverage 100% (2/2)."> 851</a></td> <td class="src"><pre class="src"> <a title="Line 468: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (ext == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 469</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 470</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 471</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 472</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.open();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 473</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe.open(cve);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 474</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IndexException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 475</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NoDataException(ex.getMessage(), ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 476</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 477</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NoDataException(ex.getMessage(), ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 479</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 480</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 481</td> <td class="nbHitsUncovered"><a title="Line 481: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 481: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cpe.numDocs() <= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 482</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 483</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NoDataException(<span class="string">"No documents exist"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 485</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 471</td> <td class="nbHitsCovered"> 848</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> scan = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 472</td> <td class="nbHitsCovered"><a title="Line 472: Conditional coverage 100% (2/2)."> 848</a></td> <td class="src"><pre class="src"> <a title="Line 472: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (FileTypeAnalyzer a : <span class="keyword">this</span>.fileTypeAnalyzers) {</a></pre></td></tr>
+<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/* note, we can't break early on this loop as the analyzers need to know if</span></pre></td></tr>
+<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> they have files to work on prior to initialization */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 475</td> <td class="nbHitsCovered"> 4240</td> <td class="src"><pre class="src"> scan |= a.supportsExtension(ext);</pre></td></tr>
+<tr> <td class="numLineCover"> 476</td> <td class="nbHitsCovered"> 4240</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 477</td> <td class="nbHitsCovered"> 848</td> <td class="src"><pre class="src"> <span class="keyword">return</span> scan;</pre></td></tr>
+<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 487</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks the CPE Index to ensure documents exists. If none exist a NoDataException is thrown.</span></pre></td></tr>
+<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws NoDataException thrown if no data exists in the CPE Index</span></pre></td></tr>
+<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an exception opening the database</span></pre></td></tr>
+<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> ensureDataExists() <span class="keyword">throws</span> NoDataException, DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 487</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> CpeMemoryIndex cpe = CpeMemoryIndex.getInstance();</pre></td></tr>
+<tr> <td class="numLineCover"> 488</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> CveDB cve = <span class="keyword">new</span> CveDB();</pre></td></tr>
+<tr> <td class="numLine"> 489</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 490</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 491</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cve.open();</pre></td></tr>
+<tr> <td class="numLineCover"> 492</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cpe.open(cve);</pre></td></tr>
+<tr> <td class="numLineCover"> 493</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IndexException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 494</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NoDataException(ex.getMessage(), ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 495</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 496</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NoDataException(ex.getMessage(), ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 498</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cve.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 499</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 500</td> <td class="nbHitsUncovered"><a title="Line 500: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 500: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (cpe.numDocs() <= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 501</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 502</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NoDataException(<span class="string">"No documents exist"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 504</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 0bc723a8c..34d33919a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html">DependencyCheckScanAgent</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/139</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.921875;</span>1.922</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html">DependencyCheckScanAgent</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/114</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.90625;</span>1.906</td></tr>
</table>
<div class="separator"> </div>
@@ -148,1684 +148,1679 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String NEW_LINE = System.getProperty(<span class="string">"line.separator"</span>, <span class="string">"\n"</span>).intern();</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Logger for use throughout the class.</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The application name for the report.</span></pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> String applicationName = <span class="string">"Dependency-Check"</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The application name for the report.</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of applicationName.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> String applicationName = <span class="string">"Dependency-Check"</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of applicationName</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of applicationName.</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getApplicationName() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> applicationName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of applicationName</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getApplicationName() {</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> applicationName;</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of applicationName.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param applicationName new value of applicationName</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of applicationName.</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setApplicationName(String applicationName) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.applicationName = applicationName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param applicationName new value of applicationName</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setApplicationName(String applicationName) {</pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.applicationName = applicationName;</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The pre-determined dependencies to scan</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> List<Dependency> dependencies;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The pre-determined dependencies to scan</span></pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a list of pre-determined dependencies.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> List<Dependency> dependencies;</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return returns a list of dependencies</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a list of pre-determined dependencies.</span></pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> List<Dependency> getDependencies() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> dependencies;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return returns a list of dependencies</span></pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> List<Dependency> getDependencies() {</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> dependencies;</pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the list of dependencies to scan.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependencies new value of dependencies</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the list of dependencies to scan.</span></pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDependencies(List<Dependency> dependencies) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.dependencies = dependencies;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependencies new value of dependencies</span></pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDependencies(List<Dependency> dependencies) {</pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.dependencies = dependencies;</pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The location of the data directory that contains</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> String dataDirectory = <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The location of the data directory that contains</span></pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of dataDirectory.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> String dataDirectory = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of dataDirectory</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of dataDirectory.</span></pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getDataDirectory() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> dataDirectory;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of dataDirectory</span></pre></td></tr>
<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getDataDirectory() {</pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> dataDirectory;</pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of dataDirectory.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dataDirectory new value of dataDirectory</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of dataDirectory.</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDataDirectory(String dataDirectory) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.dataDirectory = dataDirectory;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dataDirectory new value of dataDirectory</span></pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDataDirectory(String dataDirectory) {</pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.dataDirectory = dataDirectory;</pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Specifies the destination directory for the generated Dependency-Check report.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String reportOutputDirectory;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Specifies the destination directory for the generated Dependency-Check report.</span></pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of reportOutputDirectory.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String reportOutputDirectory;</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of reportOutputDirectory</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of reportOutputDirectory.</span></pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getReportOutputDirectory() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> reportOutputDirectory;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of reportOutputDirectory</span></pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getReportOutputDirectory() {</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> reportOutputDirectory;</pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of reportOutputDirectory.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param reportOutputDirectory new value of reportOutputDirectory</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of reportOutputDirectory.</span></pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setReportOutputDirectory(String reportOutputDirectory) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.reportOutputDirectory = reportOutputDirectory;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param reportOutputDirectory new value of reportOutputDirectory</span></pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setReportOutputDirectory(String reportOutputDirectory) {</pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.reportOutputDirectory = reportOutputDirectory;</pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Specifies if the build should be failed if a CVSS score above a specified level is identified. The default is 11</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * which means since the CVSS scores are 0-10, by default the build will never fail and the CVSS score is set to 11.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The valid range for the fail build on CVSS is 0 to 11, where anything above 10 will not cause the build to fail.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">float</span> failBuildOnCVSS = 11;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Specifies if the build should be failed if a CVSS score above a specified level is identified. The default is 11</span></pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * which means since the CVSS scores are 0-10, by default the build will never fail and the CVSS score is set to 11.</span></pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The valid range for the fail build on CVSS is 0 to 11, where anything above 10 will not cause the build to fail.</span></pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of failBuildOnCVSS.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">float</span> failBuildOnCVSS = 11;</span></pre></td></tr>
<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of failBuildOnCVSS</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of failBuildOnCVSS.</span></pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">float</span> getFailBuildOnCVSS() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> failBuildOnCVSS;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of failBuildOnCVSS</span></pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">float</span> getFailBuildOnCVSS() {</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> failBuildOnCVSS;</pre></td></tr>
<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of failBuildOnCVSS.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param failBuildOnCVSS new value of failBuildOnCVSS</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of failBuildOnCVSS.</span></pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFailBuildOnCVSS(<span class="keyword">float</span> failBuildOnCVSS) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.failBuildOnCVSS = failBuildOnCVSS;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param failBuildOnCVSS new value of failBuildOnCVSS</span></pre></td></tr>
<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFailBuildOnCVSS(<span class="keyword">float</span> failBuildOnCVSS) {</pre></td></tr>
<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.failBuildOnCVSS = failBuildOnCVSS;</pre></td></tr>
<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets whether auto-updating of the NVD CVE/CPE data is enabled. It is not recommended that this be turned to</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * false. Default is true.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> autoUpdate = <span class="keyword">true</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets whether auto-updating of the NVD CVE/CPE data is enabled. It is not recommended that this be turned to</span></pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * false. Default is true.</span></pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of autoUpdate.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> autoUpdate = <span class="keyword">true</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of autoUpdate</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of autoUpdate.</span></pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isAutoUpdate() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> autoUpdate;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of autoUpdate</span></pre></td></tr>
<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isAutoUpdate() {</pre></td></tr>
<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> autoUpdate;</pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of autoUpdate.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param autoUpdate new value of autoUpdate</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of autoUpdate.</span></pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setAutoUpdate(<span class="keyword">boolean</span> autoUpdate) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.autoUpdate = autoUpdate;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param autoUpdate new value of autoUpdate</span></pre></td></tr>
<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setAutoUpdate(<span class="keyword">boolean</span> autoUpdate) {</pre></td></tr>
<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.autoUpdate = autoUpdate;</pre></td></tr>
<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * within the Site plugin unless the externalReport is set to true. Default is HTML.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> ReportGenerator.Format reportFormat = ReportGenerator.Format.HTML;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this</span></pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * within the Site plugin unless the externalReport is set to true. Default is HTML.</span></pre></td></tr>
<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of reportFormat.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> ReportGenerator.Format reportFormat = ReportGenerator.Format.HTML;</span></pre></td></tr>
<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of reportFormat</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of reportFormat.</span></pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> ReportGenerator.Format getReportFormat() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> reportFormat;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of reportFormat</span></pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> ReportGenerator.Format getReportFormat() {</pre></td></tr>
<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> reportFormat;</pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of reportFormat.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param reportFormat new value of reportFormat</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of reportFormat.</span></pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setReportFormat(ReportGenerator.Format reportFormat) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.reportFormat = reportFormat;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param reportFormat new value of reportFormat</span></pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setReportFormat(ReportGenerator.Format reportFormat) {</pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.reportFormat = reportFormat;</pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Proxy URL.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyUrl;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Proxy URL.</span></pre></td></tr>
<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyUrl.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyUrl;</pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyUrl</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyUrl.</span></pre></td></tr>
<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyUrl() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> proxyUrl;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyUrl</span></pre></td></tr>
<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyUrl() {</pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> proxyUrl;</pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyUrl.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param proxyUrl new value of proxyUrl</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyUrl.</span></pre></td></tr>
<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyUrl(String proxyUrl) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyUrl = proxyUrl;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param proxyUrl new value of proxyUrl</span></pre></td></tr>
<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyUrl(String proxyUrl) {</pre></td></tr>
<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyUrl = proxyUrl;</pre></td></tr>
<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Proxy Port.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyPort;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Proxy Port.</span></pre></td></tr>
<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyPort.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyPort;</pre></td></tr>
<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyPort</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyPort.</span></pre></td></tr>
<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyPort() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> proxyPort;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyPort</span></pre></td></tr>
<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyPort() {</pre></td></tr>
<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> proxyPort;</pre></td></tr>
<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyPort.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param proxyPort new value of proxyPort</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyPort.</span></pre></td></tr>
<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyPort(String proxyPort) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyPort = proxyPort;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param proxyPort new value of proxyPort</span></pre></td></tr>
<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyPort(String proxyPort) {</pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyPort = proxyPort;</pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Proxy username.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyUsername;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Proxy username.</span></pre></td></tr>
<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyUsername.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyUsername;</pre></td></tr>
<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyUsername</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyUsername.</span></pre></td></tr>
<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyUsername() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> proxyUsername;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyUsername</span></pre></td></tr>
<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyUsername() {</pre></td></tr>
<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> proxyUsername;</pre></td></tr>
<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyUsername.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param proxyUsername new value of proxyUsername</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyUsername.</span></pre></td></tr>
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyUsername(String proxyUsername) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyUsername = proxyUsername;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param proxyUsername new value of proxyUsername</span></pre></td></tr>
<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyUsername(String proxyUsername) {</pre></td></tr>
<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyUsername = proxyUsername;</pre></td></tr>
<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Proxy password.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyPassword;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Proxy password.</span></pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyPassword.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String proxyPassword;</pre></td></tr>
<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyPassword</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of proxyPassword.</span></pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyPassword() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> proxyPassword;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of proxyPassword</span></pre></td></tr>
<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getProxyPassword() {</pre></td></tr>
<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> proxyPassword;</pre></td></tr>
<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyPassword.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param proxyPassword new value of proxyPassword</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of proxyPassword.</span></pre></td></tr>
<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyPassword(String proxyPassword) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyPassword = proxyPassword;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param proxyPassword new value of proxyPassword</span></pre></td></tr>
<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setProxyPassword(String proxyPassword) {</pre></td></tr>
<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.proxyPassword = proxyPassword;</pre></td></tr>
<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Connection Timeout.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String connectionTimeout;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Connection Timeout.</span></pre></td></tr>
<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of connectionTimeout.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String connectionTimeout;</pre></td></tr>
<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of connectionTimeout</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of connectionTimeout.</span></pre></td></tr>
<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getConnectionTimeout() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> connectionTimeout;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of connectionTimeout</span></pre></td></tr>
<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getConnectionTimeout() {</pre></td></tr>
<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> connectionTimeout;</pre></td></tr>
<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of connectionTimeout.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param connectionTimeout new value of connectionTimeout</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of connectionTimeout.</span></pre></td></tr>
<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setConnectionTimeout(String connectionTimeout) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.connectionTimeout = connectionTimeout;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param connectionTimeout new value of connectionTimeout</span></pre></td></tr>
<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setConnectionTimeout(String connectionTimeout) {</pre></td></tr>
<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.connectionTimeout = connectionTimeout;</pre></td></tr>
<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The file path used for verbose logging.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> String logFile = <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The file path used for verbose logging.</span></pre></td></tr>
<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of logFile.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> String logFile = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of logFile</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of logFile.</span></pre></td></tr>
<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getLogFile() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> logFile;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of logFile</span></pre></td></tr>
<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getLogFile() {</pre></td></tr>
<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> logFile;</pre></td></tr>
<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of logFile.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param logFile new value of logFile</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of logFile.</span></pre></td></tr>
<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setLogFile(String logFile) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.logFile = logFile;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param logFile new value of logFile</span></pre></td></tr>
<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setLogFile(String logFile) {</pre></td></tr>
<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.logFile = logFile;</pre></td></tr>
<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The path to the suppression file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String suppressionFile;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The path to the suppression file.</span></pre></td></tr>
<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of suppressionFile.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String suppressionFile;</pre></td></tr>
<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of suppressionFile</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of suppressionFile.</span></pre></td></tr>
<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getSuppressionFile() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> suppressionFile;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of suppressionFile</span></pre></td></tr>
<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getSuppressionFile() {</pre></td></tr>
<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> suppressionFile;</pre></td></tr>
<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of suppressionFile.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param suppressionFile new value of suppressionFile</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of suppressionFile.</span></pre></td></tr>
<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSuppressionFile(String suppressionFile) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.suppressionFile = suppressionFile;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param suppressionFile new value of suppressionFile</span></pre></td></tr>
<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSuppressionFile(String suppressionFile) {</pre></td></tr>
<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.suppressionFile = suppressionFile;</pre></td></tr>
<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * flag indicating whether or not to show a summary of findings.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 397</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> showSummary = <span class="keyword">true</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * flag indicating whether or not to show a summary of findings.</span></pre></td></tr>
<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of showSummary.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 400</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> showSummary = <span class="keyword">true</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 401</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of showSummary</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of showSummary.</span></pre></td></tr>
<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isShowSummary() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> showSummary;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of showSummary</span></pre></td></tr>
<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isShowSummary() {</pre></td></tr>
<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> showSummary;</pre></td></tr>
<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of showSummary.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param showSummary new value of showSummary</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of showSummary.</span></pre></td></tr>
<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setShowSummary(<span class="keyword">boolean</span> showSummary) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.showSummary = showSummary;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param showSummary new value of showSummary</span></pre></td></tr>
<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 416</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setShowSummary(<span class="keyword">boolean</span> showSummary) {</pre></td></tr>
<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.showSummary = showSummary;</pre></td></tr>
<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Whether or not the nexus analyzer is enabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 420</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> nexusAnalyzerEnabled = <span class="keyword">true</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Whether or not the nexus analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of nexusAnalyzerEnabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 423</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> nexusAnalyzerEnabled = <span class="keyword">true</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 425</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of nexusAnalyzerEnabled</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 426</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of nexusAnalyzerEnabled.</span></pre></td></tr>
<tr> <td class="numLine"> 427</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isNexusAnalyzerEnabled() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> nexusAnalyzerEnabled;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of nexusAnalyzerEnabled</span></pre></td></tr>
<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isNexusAnalyzerEnabled() {</pre></td></tr>
<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> nexusAnalyzerEnabled;</pre></td></tr>
<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of nexusAnalyzerEnabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param nexusAnalyzerEnabled new value of nexusAnalyzerEnabled</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of nexusAnalyzerEnabled.</span></pre></td></tr>
<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNexusAnalyzerEnabled(<span class="keyword">boolean</span> nexusAnalyzerEnabled) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.nexusAnalyzerEnabled = nexusAnalyzerEnabled;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param nexusAnalyzerEnabled new value of nexusAnalyzerEnabled</span></pre></td></tr>
<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNexusAnalyzerEnabled(<span class="keyword">boolean</span> nexusAnalyzerEnabled) {</pre></td></tr>
<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.nexusAnalyzerEnabled = nexusAnalyzerEnabled;</pre></td></tr>
<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The URL of the Nexus server.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String nexusUrl;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The URL of the Nexus server.</span></pre></td></tr>
<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of nexusUrl.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String nexusUrl;</pre></td></tr>
<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of nexusUrl</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of nexusUrl.</span></pre></td></tr>
<tr> <td class="numLine"> 450</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getNexusUrl() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 451</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> nexusUrl;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of nexusUrl</span></pre></td></tr>
<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 453</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getNexusUrl() {</pre></td></tr>
<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> nexusUrl;</pre></td></tr>
<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of nexusUrl.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 456</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param nexusUrl new value of nexusUrl</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 458</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of nexusUrl.</span></pre></td></tr>
<tr> <td class="numLine"> 459</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNexusUrl(String nexusUrl) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 460</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.nexusUrl = nexusUrl;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param nexusUrl new value of nexusUrl</span></pre></td></tr>
<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNexusUrl(String nexusUrl) {</pre></td></tr>
<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.nexusUrl = nexusUrl;</pre></td></tr>
<tr> <td class="numLine"> 464</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Whether or not the defined proxy should be used when connecting to Nexus.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 466</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> nexusUsesProxy = <span class="keyword">true</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Whether or not the defined proxy should be used when connecting to Nexus.</span></pre></td></tr>
<tr> <td class="numLine"> 468</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 469</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of nexusUsesProxy.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 469</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> nexusUsesProxy = <span class="keyword">true</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 470</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 471</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of nexusUsesProxy</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 472</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of nexusUsesProxy.</span></pre></td></tr>
<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isNexusUsesProxy() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> nexusUsesProxy;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of nexusUsesProxy</span></pre></td></tr>
<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isNexusUsesProxy() {</pre></td></tr>
<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> nexusUsesProxy;</pre></td></tr>
<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of nexusUsesProxy.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param nexusUsesProxy new value of nexusUsesProxy</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of nexusUsesProxy.</span></pre></td></tr>
<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNexusUsesProxy(<span class="keyword">boolean</span> nexusUsesProxy) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.nexusUsesProxy = nexusUsesProxy;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param nexusUsesProxy new value of nexusUsesProxy</span></pre></td></tr>
<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNexusUsesProxy(<span class="keyword">boolean</span> nexusUsesProxy) {</pre></td></tr>
<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.nexusUsesProxy = nexusUsesProxy;</pre></td></tr>
<tr> <td class="numLine"> 487</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The database driver name; such as org.h2.Driver.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 488</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 489</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String databaseDriverName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 490</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The database driver name; such as org.h2.Driver.</span></pre></td></tr>
<tr> <td class="numLine"> 491</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 492</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of databaseDriverName.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String databaseDriverName;</pre></td></tr>
<tr> <td class="numLine"> 493</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 494</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of databaseDriverName</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 495</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of databaseDriverName.</span></pre></td></tr>
<tr> <td class="numLine"> 496</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabaseDriverName() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> databaseDriverName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of databaseDriverName</span></pre></td></tr>
<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabaseDriverName() {</pre></td></tr>
<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> databaseDriverName;</pre></td></tr>
<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of databaseDriverName.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param databaseDriverName new value of databaseDriverName</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 504</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of databaseDriverName.</span></pre></td></tr>
<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabaseDriverName(String databaseDriverName) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 506</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.databaseDriverName = databaseDriverName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param databaseDriverName new value of databaseDriverName</span></pre></td></tr>
<tr> <td class="numLine"> 507</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 508</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabaseDriverName(String databaseDriverName) {</pre></td></tr>
<tr> <td class="numLine"> 509</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.databaseDriverName = databaseDriverName;</pre></td></tr>
<tr> <td class="numLine"> 510</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The path to the database driver JAR file if it is not on the class path.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 511</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 512</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String databaseDriverPath;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 513</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The path to the database driver JAR file if it is not on the class path.</span></pre></td></tr>
<tr> <td class="numLine"> 514</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 515</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of databaseDriverPath.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String databaseDriverPath;</pre></td></tr>
<tr> <td class="numLine"> 516</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of databaseDriverPath</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of databaseDriverPath.</span></pre></td></tr>
<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabaseDriverPath() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> databaseDriverPath;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of databaseDriverPath</span></pre></td></tr>
<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabaseDriverPath() {</pre></td></tr>
<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> databaseDriverPath;</pre></td></tr>
<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of databaseDriverPath.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 525</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 526</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param databaseDriverPath new value of databaseDriverPath</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 527</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of databaseDriverPath.</span></pre></td></tr>
<tr> <td class="numLine"> 528</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabaseDriverPath(String databaseDriverPath) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 529</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.databaseDriverPath = databaseDriverPath;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param databaseDriverPath new value of databaseDriverPath</span></pre></td></tr>
<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 531</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabaseDriverPath(String databaseDriverPath) {</pre></td></tr>
<tr> <td class="numLine"> 532</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.databaseDriverPath = databaseDriverPath;</pre></td></tr>
<tr> <td class="numLine"> 533</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The database connection string.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 534</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 535</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String connectionString;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The database connection string.</span></pre></td></tr>
<tr> <td class="numLine"> 537</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of connectionString.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String connectionString;</pre></td></tr>
<tr> <td class="numLine"> 539</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 540</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of connectionString</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 541</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of connectionString.</span></pre></td></tr>
<tr> <td class="numLine"> 542</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getConnectionString() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 543</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> connectionString;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of connectionString</span></pre></td></tr>
<tr> <td class="numLine"> 544</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 545</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getConnectionString() {</pre></td></tr>
<tr> <td class="numLine"> 546</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> connectionString;</pre></td></tr>
<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of connectionString.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 548</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 549</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param connectionString new value of connectionString</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 550</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of connectionString.</span></pre></td></tr>
<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setConnectionString(String connectionString) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 552</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.connectionString = connectionString;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param connectionString new value of connectionString</span></pre></td></tr>
<tr> <td class="numLine"> 553</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 554</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setConnectionString(String connectionString) {</pre></td></tr>
<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.connectionString = connectionString;</pre></td></tr>
<tr> <td class="numLine"> 556</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The user name for connecting to the database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 557</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 558</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String databaseUser;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 559</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The user name for connecting to the database.</span></pre></td></tr>
<tr> <td class="numLine"> 560</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 561</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of databaseUser.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String databaseUser;</pre></td></tr>
<tr> <td class="numLine"> 562</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 563</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of databaseUser</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 564</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of databaseUser.</span></pre></td></tr>
<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabaseUser() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 566</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> databaseUser;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of databaseUser</span></pre></td></tr>
<tr> <td class="numLine"> 567</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 568</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabaseUser() {</pre></td></tr>
<tr> <td class="numLine"> 569</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> databaseUser;</pre></td></tr>
<tr> <td class="numLine"> 570</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of databaseUser.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 571</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 572</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param databaseUser new value of databaseUser</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 573</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of databaseUser.</span></pre></td></tr>
<tr> <td class="numLine"> 574</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabaseUser(String databaseUser) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 575</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.databaseUser = databaseUser;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param databaseUser new value of databaseUser</span></pre></td></tr>
<tr> <td class="numLine"> 576</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 577</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabaseUser(String databaseUser) {</pre></td></tr>
<tr> <td class="numLine"> 578</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.databaseUser = databaseUser;</pre></td></tr>
<tr> <td class="numLine"> 579</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The password to use when connecting to the database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 580</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 581</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String databasePassword;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 582</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The password to use when connecting to the database.</span></pre></td></tr>
<tr> <td class="numLine"> 583</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 584</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of databasePassword.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String databasePassword;</pre></td></tr>
<tr> <td class="numLine"> 585</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 586</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of databasePassword</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 587</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of databasePassword.</span></pre></td></tr>
<tr> <td class="numLine"> 588</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabasePassword() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 589</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> databasePassword;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of databasePassword</span></pre></td></tr>
<tr> <td class="numLine"> 590</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 591</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getDatabasePassword() {</pre></td></tr>
<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> databasePassword;</pre></td></tr>
<tr> <td class="numLine"> 593</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of databasePassword.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 594</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 595</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param databasePassword new value of databasePassword</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 596</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of databasePassword.</span></pre></td></tr>
<tr> <td class="numLine"> 597</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabasePassword(String databasePassword) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 598</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.databasePassword = databasePassword;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param databasePassword new value of databasePassword</span></pre></td></tr>
<tr> <td class="numLine"> 599</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 600</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDatabasePassword(String databasePassword) {</pre></td></tr>
<tr> <td class="numLine"> 601</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.databasePassword = databasePassword;</pre></td></tr>
<tr> <td class="numLine"> 602</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Additional ZIP File extensions to add analyze. This should be a comma-separated list of file extensions to treat</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 603</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * like ZIP files.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 604</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 605</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String zipExtensions;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Additional ZIP File extensions to add analyze. This should be a comma-separated list of file extensions to treat</span></pre></td></tr>
<tr> <td class="numLine"> 606</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * like ZIP files.</span></pre></td></tr>
<tr> <td class="numLine"> 607</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 608</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of zipExtensions.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String zipExtensions;</pre></td></tr>
<tr> <td class="numLine"> 609</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 610</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of zipExtensions</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 611</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of zipExtensions.</span></pre></td></tr>
<tr> <td class="numLine"> 612</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getZipExtensions() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 613</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> zipExtensions;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of zipExtensions</span></pre></td></tr>
<tr> <td class="numLine"> 614</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 615</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getZipExtensions() {</pre></td></tr>
<tr> <td class="numLine"> 616</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> zipExtensions;</pre></td></tr>
<tr> <td class="numLine"> 617</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of zipExtensions.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 618</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 619</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param zipExtensions new value of zipExtensions</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 620</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of zipExtensions.</span></pre></td></tr>
<tr> <td class="numLine"> 621</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setZipExtensions(String zipExtensions) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 622</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.zipExtensions = zipExtensions;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param zipExtensions new value of zipExtensions</span></pre></td></tr>
<tr> <td class="numLine"> 623</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 624</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setZipExtensions(String zipExtensions) {</pre></td></tr>
<tr> <td class="numLine"> 625</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.zipExtensions = zipExtensions;</pre></td></tr>
<tr> <td class="numLine"> 626</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The url for the modified NVD CVE (1.2 schema).</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 627</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 628</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl12Modified;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 629</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The url for the modified NVD CVE (1.2 schema).</span></pre></td></tr>
<tr> <td class="numLine"> 630</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 631</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl12Modified.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl12Modified;</pre></td></tr>
<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl12Modified</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 634</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl12Modified.</span></pre></td></tr>
<tr> <td class="numLine"> 635</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl12Modified() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 636</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl12Modified;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl12Modified</span></pre></td></tr>
<tr> <td class="numLine"> 637</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 638</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl12Modified() {</pre></td></tr>
<tr> <td class="numLine"> 639</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl12Modified;</pre></td></tr>
<tr> <td class="numLine"> 640</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl12Modified.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 641</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 642</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl12Modified new value of cveUrl12Modified</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 643</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl12Modified.</span></pre></td></tr>
<tr> <td class="numLine"> 644</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl12Modified(String cveUrl12Modified) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 645</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl12Modified = cveUrl12Modified;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl12Modified new value of cveUrl12Modified</span></pre></td></tr>
<tr> <td class="numLine"> 646</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 647</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl12Modified(String cveUrl12Modified) {</pre></td></tr>
<tr> <td class="numLine"> 648</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl12Modified = cveUrl12Modified;</pre></td></tr>
<tr> <td class="numLine"> 649</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The url for the modified NVD CVE (2.0 schema).</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 650</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 651</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl20Modified;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 652</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The url for the modified NVD CVE (2.0 schema).</span></pre></td></tr>
<tr> <td class="numLine"> 653</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 654</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl20Modified.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl20Modified;</pre></td></tr>
<tr> <td class="numLine"> 655</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 656</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl20Modified</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 657</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl20Modified.</span></pre></td></tr>
<tr> <td class="numLine"> 658</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl20Modified() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 659</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl20Modified;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl20Modified</span></pre></td></tr>
<tr> <td class="numLine"> 660</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 661</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl20Modified() {</pre></td></tr>
<tr> <td class="numLine"> 662</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl20Modified;</pre></td></tr>
<tr> <td class="numLine"> 663</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl20Modified.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 664</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 665</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl20Modified new value of cveUrl20Modified</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 666</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl20Modified.</span></pre></td></tr>
<tr> <td class="numLine"> 667</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl20Modified(String cveUrl20Modified) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 668</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl20Modified = cveUrl20Modified;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl20Modified new value of cveUrl20Modified</span></pre></td></tr>
<tr> <td class="numLine"> 669</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 670</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl20Modified(String cveUrl20Modified) {</pre></td></tr>
<tr> <td class="numLine"> 671</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl20Modified = cveUrl20Modified;</pre></td></tr>
<tr> <td class="numLine"> 672</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Base Data Mirror URL for CVE 1.2.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 673</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 674</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl12Base;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 675</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Base Data Mirror URL for CVE 1.2.</span></pre></td></tr>
<tr> <td class="numLine"> 676</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 677</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl12Base.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl12Base;</pre></td></tr>
<tr> <td class="numLine"> 678</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 679</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl12Base</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 680</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl12Base.</span></pre></td></tr>
<tr> <td class="numLine"> 681</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl12Base() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 682</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl12Base;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl12Base</span></pre></td></tr>
<tr> <td class="numLine"> 683</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 684</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl12Base() {</pre></td></tr>
<tr> <td class="numLine"> 685</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl12Base;</pre></td></tr>
<tr> <td class="numLine"> 686</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl12Base.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 687</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 688</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl12Base new value of cveUrl12Base</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 689</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl12Base.</span></pre></td></tr>
<tr> <td class="numLine"> 690</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl12Base(String cveUrl12Base) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 691</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl12Base = cveUrl12Base;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl12Base new value of cveUrl12Base</span></pre></td></tr>
<tr> <td class="numLine"> 692</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 693</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl12Base(String cveUrl12Base) {</pre></td></tr>
<tr> <td class="numLine"> 694</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl12Base = cveUrl12Base;</pre></td></tr>
<tr> <td class="numLine"> 695</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Data Mirror URL for CVE 2.0.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 696</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 697</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl20Base;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 698</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Data Mirror URL for CVE 2.0.</span></pre></td></tr>
<tr> <td class="numLine"> 699</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 700</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl20Base.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String cveUrl20Base;</pre></td></tr>
<tr> <td class="numLine"> 701</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 702</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl20Base</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 703</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of cveUrl20Base.</span></pre></td></tr>
<tr> <td class="numLine"> 704</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl20Base() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 705</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl20Base;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of cveUrl20Base</span></pre></td></tr>
<tr> <td class="numLine"> 706</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 707</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getCveUrl20Base() {</pre></td></tr>
<tr> <td class="numLine"> 708</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> cveUrl20Base;</pre></td></tr>
<tr> <td class="numLine"> 709</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl20Base.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 710</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 711</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl20Base new value of cveUrl20Base</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 712</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of cveUrl20Base.</span></pre></td></tr>
<tr> <td class="numLine"> 713</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl20Base(String cveUrl20Base) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 714</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl20Base = cveUrl20Base;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cveUrl20Base new value of cveUrl20Base</span></pre></td></tr>
<tr> <td class="numLine"> 715</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 716</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveUrl20Base(String cveUrl20Base) {</pre></td></tr>
<tr> <td class="numLine"> 717</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.cveUrl20Base = cveUrl20Base;</pre></td></tr>
<tr> <td class="numLine"> 718</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The path to Mono for .NET assembly analysis on non-windows systems.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 719</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 720</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String pathToMono;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 721</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The path to Mono for .NET assembly analysis on non-windows systems.</span></pre></td></tr>
<tr> <td class="numLine"> 722</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 723</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of pathToMono.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String pathToMono;</pre></td></tr>
<tr> <td class="numLine"> 724</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 725</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of pathToMono</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 726</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of pathToMono.</span></pre></td></tr>
<tr> <td class="numLine"> 727</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getPathToMono() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 728</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> pathToMono;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of pathToMono</span></pre></td></tr>
<tr> <td class="numLine"> 729</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 730</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getPathToMono() {</pre></td></tr>
<tr> <td class="numLine"> 731</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> pathToMono;</pre></td></tr>
<tr> <td class="numLine"> 732</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of pathToMono.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 733</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 734</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param pathToMono new value of pathToMono</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 735</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of pathToMono.</span></pre></td></tr>
<tr> <td class="numLine"> 736</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPathToMono(String pathToMono) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 737</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.pathToMono = pathToMono;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param pathToMono new value of pathToMono</span></pre></td></tr>
<tr> <td class="numLine"> 738</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 739</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPathToMono(String pathToMono) {</pre></td></tr>
<tr> <td class="numLine"> 740</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.pathToMono = pathToMono;</pre></td></tr>
<tr> <td class="numLine"> 741</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Executes the Dependency-Check on the dependent libraries.</span></pre></td></tr>
-<tr> <td class="numLine"> 742</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 743</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the Engine used to scan the dependencies.</span></pre></td></tr>
-<tr> <td class="numLine"> 744</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws org.owasp.dependencycheck.data.nvdcve.DatabaseException thrown if there is an exception connecting to the</span></pre></td></tr>
-<tr> <td class="numLine"> 745</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * database</span></pre></td></tr>
-<tr> <td class="numLine"> 746</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 747</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Engine executeDependencyCheck() <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 748</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> populateSettings();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 749</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Engine engine = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 750</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 751</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine = <span class="keyword">new</span> Engine();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 752</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.setDependencies(<span class="keyword">this</span>.dependencies);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 753</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.analyzeDependencies();</span></pre></td></tr>
-<tr> <td class="numLine"> 754</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 755</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 756</td> <td class="nbHitsUncovered"><a title="Line 756: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 756: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (engine != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 757</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.cleanup();</span></pre></td></tr>
-<tr> <td class="numLine"> 758</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 759</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 760</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> engine;</span></pre></td></tr>
-<tr> <td class="numLine"> 761</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 762</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 742</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 763</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 743</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 764</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generates the reports for a given dependency-check engine.</span></pre></td></tr>
-<tr> <td class="numLine"> 765</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 744</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Executes the Dependency-Check on the dependent libraries.</span></pre></td></tr>
+<tr> <td class="numLine"> 745</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 766</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param engine a dependency-check engine</span></pre></td></tr>
-<tr> <td class="numLine"> 767</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param outDirectory the directory to write the reports to</span></pre></td></tr>
-<tr> <td class="numLine"> 768</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 746</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the Engine used to scan the dependencies.</span></pre></td></tr>
+<tr> <td class="numLine"> 747</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws org.owasp.dependencycheck.data.nvdcve.DatabaseException thrown if there is an exception connecting to the</span></pre></td></tr>
+<tr> <td class="numLine"> 748</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * database</span></pre></td></tr>
+<tr> <td class="numLine"> 749</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 769</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 750</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Engine executeDependencyCheck() <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 751</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> populateSettings();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 752</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Engine engine = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 753</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine = <span class="keyword">new</span> Engine();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 754</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.setDependencies(<span class="keyword">this</span>.dependencies);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 755</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.analyzeDependencies();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 756</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> engine;</span></pre></td></tr>
+<tr> <td class="numLine"> 757</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 758</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 759</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 760</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Generates the reports for a given dependency-check engine.</span></pre></td></tr>
+<tr> <td class="numLine"> 761</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 762</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param engine a dependency-check engine</span></pre></td></tr>
+<tr> <td class="numLine"> 763</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param outDirectory the directory to write the reports to</span></pre></td></tr>
+<tr> <td class="numLine"> 764</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 765</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> generateExternalReports(Engine engine, File outDirectory) {</pre></td></tr>
-<tr> <td class="numLineCover"> 770</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DatabaseProperties prop = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 771</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> CveDB cve = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 772</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 766</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DatabaseProperties prop = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 767</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> CveDB cve = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 768</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 773</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve = <span class="keyword">new</span> CveDB();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 774</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.open();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 775</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> prop = cve.getDatabaseProperties();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 776</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 777</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Unable to retrieve DB Properties"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 778</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 769</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve = <span class="keyword">new</span> CveDB();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 770</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.open();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 771</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> prop = cve.getDatabaseProperties();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 772</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 773</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Unable to retrieve DB Properties"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 774</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 779</td> <td class="nbHitsUncovered"><a title="Line 779: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 779: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (cve != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 780</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.close();</span></pre></td></tr>
-<tr> <td class="numLine"> 781</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 775</td> <td class="nbHitsUncovered"><a title="Line 775: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 775: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (cve != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 776</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.close();</span></pre></td></tr>
+<tr> <td class="numLine"> 777</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 782</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 778</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 783</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ReportGenerator r = <span class="keyword">new</span> ReportGenerator(<span class="keyword">this</span>.applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);</span></pre></td></tr>
-<tr> <td class="numLine"> 784</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 779</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ReportGenerator r = <span class="keyword">new</span> ReportGenerator(<span class="keyword">this</span>.applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);</span></pre></td></tr>
+<tr> <td class="numLine"> 780</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 785</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> r.generateReports(outDirectory.getCanonicalPath(), <span class="keyword">this</span>.reportFormat.name());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 786</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 787</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.SEVERE,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 781</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> r.generateReports(outDirectory.getCanonicalPath(), <span class="keyword">this</span>.reportFormat.name());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 782</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 783</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE,</span></pre></td></tr>
+<tr> <td class="numLine"> 784</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"Unexpected exception occurred during analysis; please see the verbose error log for more details."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 785</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 786</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 787</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE,</span></pre></td></tr>
<tr> <td class="numLine"> 788</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Unexpected exception occurred during analysis; please see the verbose error log for more details."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 789</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 790</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 791</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.SEVERE,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 789</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 790</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 791</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 792</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Unexpected exception occurred during analysis; please see the verbose error log for more details."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 793</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 794</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 795</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 796</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 797</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 793</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 798</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 794</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system</span></pre></td></tr>
-<tr> <td class="numLine"> 799</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 795</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * properties required to change the proxy url, port, and connection timeout.</span></pre></td></tr>
-<tr> <td class="numLine"> 800</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 796</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 801</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 797</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> populateSettings() {</pre></td></tr>
-<tr> <td class="numLineCover"> 802</td> <td class="nbHitsUncovered"><a title="Line 802: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 802: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dataDirectory != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 803</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);</span></pre></td></tr>
-<tr> <td class="numLine"> 804</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 798</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.initialize();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 799</td> <td class="nbHitsUncovered"><a title="Line 799: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 799: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dataDirectory != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 800</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);</span></pre></td></tr>
+<tr> <td class="numLine"> 801</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 805</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File jarPath = <span class="keyword">new</span> File(DependencyCheckScanAgent.<span class="keyword">class</span>.getProtectionDomain().getCodeSource().getLocation().getPath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 806</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File base = jarPath.getParentFile();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 807</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 808</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File dataDir = <span class="keyword">new</span> File(base, sub);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 809</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLine"> 810</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 802</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File jarPath = <span class="keyword">new</span> File(DependencyCheckScanAgent.<span class="keyword">class</span>.getProtectionDomain().getCodeSource().getLocation().getPath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 803</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File base = jarPath.getParentFile();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 804</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 805</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File dataDir = <span class="keyword">new</span> File(base, sub);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 806</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLine"> 807</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 811</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 808</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 812</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 809</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);</span></pre></td></tr>
+<tr> <td class="numLine"> 810</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 811</td> <td class="nbHitsUncovered"><a title="Line 811: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 811: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyUrl != <span class="keyword">null</span> && !proxyUrl.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 812</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);</span></pre></td></tr>
<tr> <td class="numLine"> 813</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 814</td> <td class="nbHitsUncovered"><a title="Line 814: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 814: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyUrl != <span class="keyword">null</span> && !proxyUrl.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 815</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 814</td> <td class="nbHitsUncovered"><a title="Line 814: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 814: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyPort != <span class="keyword">null</span> && !proxyPort.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 815</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);</span></pre></td></tr>
<tr> <td class="numLine"> 816</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 817</td> <td class="nbHitsUncovered"><a title="Line 817: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 817: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyPort != <span class="keyword">null</span> && !proxyPort.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 818</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 817</td> <td class="nbHitsUncovered"><a title="Line 817: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 817: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyUsername != <span class="keyword">null</span> && !proxyUsername.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 818</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);</span></pre></td></tr>
<tr> <td class="numLine"> 819</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 820</td> <td class="nbHitsUncovered"><a title="Line 820: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 820: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyUsername != <span class="keyword">null</span> && !proxyUsername.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 821</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 820</td> <td class="nbHitsUncovered"><a title="Line 820: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 820: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyPassword != <span class="keyword">null</span> && !proxyPassword.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 821</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);</span></pre></td></tr>
<tr> <td class="numLine"> 822</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 823</td> <td class="nbHitsUncovered"><a title="Line 823: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 823: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (proxyPassword != <span class="keyword">null</span> && !proxyPassword.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 824</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 823</td> <td class="nbHitsUncovered"><a title="Line 823: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 823: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (connectionTimeout != <span class="keyword">null</span> && !connectionTimeout.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 824</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);</span></pre></td></tr>
<tr> <td class="numLine"> 825</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 826</td> <td class="nbHitsUncovered"><a title="Line 826: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 826: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (connectionTimeout != <span class="keyword">null</span> && !connectionTimeout.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 827</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 826</td> <td class="nbHitsUncovered"><a title="Line 826: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 826: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (suppressionFile != <span class="keyword">null</span> && !suppressionFile.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 827</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);</span></pre></td></tr>
<tr> <td class="numLine"> 828</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 829</td> <td class="nbHitsUncovered"><a title="Line 829: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 829: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (suppressionFile != <span class="keyword">null</span> && !suppressionFile.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 830</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);</span></pre></td></tr>
-<tr> <td class="numLine"> 831</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 829</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 830</td> <td class="nbHitsUncovered"><a title="Line 830: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 830: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (nexusUrl != <span class="keyword">null</span> && !nexusUrl.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 831</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);</span></pre></td></tr>
+<tr> <td class="numLine"> 832</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 832</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 833</td> <td class="nbHitsUncovered"><a title="Line 833: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 833: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (nexusUrl != <span class="keyword">null</span> && !nexusUrl.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 834</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);</span></pre></td></tr>
-<tr> <td class="numLine"> 835</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 833</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 834</td> <td class="nbHitsUncovered"><a title="Line 834: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 834: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databaseDriverName != <span class="keyword">null</span> && !databaseDriverName.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 835</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);</span></pre></td></tr>
+<tr> <td class="numLine"> 836</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 836</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 837</td> <td class="nbHitsUncovered"><a title="Line 837: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 837: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databaseDriverName != <span class="keyword">null</span> && !databaseDriverName.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 838</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 837</td> <td class="nbHitsUncovered"><a title="Line 837: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 837: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databaseDriverPath != <span class="keyword">null</span> && !databaseDriverPath.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 838</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);</span></pre></td></tr>
<tr> <td class="numLine"> 839</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 840</td> <td class="nbHitsUncovered"><a title="Line 840: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 840: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databaseDriverPath != <span class="keyword">null</span> && !databaseDriverPath.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 841</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 840</td> <td class="nbHitsUncovered"><a title="Line 840: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 840: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (connectionString != <span class="keyword">null</span> && !connectionString.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 841</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);</span></pre></td></tr>
<tr> <td class="numLine"> 842</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 843</td> <td class="nbHitsUncovered"><a title="Line 843: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 843: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (connectionString != <span class="keyword">null</span> && !connectionString.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 844</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 843</td> <td class="nbHitsUncovered"><a title="Line 843: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 843: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databaseUser != <span class="keyword">null</span> && !databaseUser.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 844</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_USER, databaseUser);</span></pre></td></tr>
<tr> <td class="numLine"> 845</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 846</td> <td class="nbHitsUncovered"><a title="Line 846: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 846: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databaseUser != <span class="keyword">null</span> && !databaseUser.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 847</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_USER, databaseUser);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 846</td> <td class="nbHitsUncovered"><a title="Line 846: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 846: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databasePassword != <span class="keyword">null</span> && !databasePassword.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 847</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);</span></pre></td></tr>
<tr> <td class="numLine"> 848</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 849</td> <td class="nbHitsUncovered"><a title="Line 849: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 849: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (databasePassword != <span class="keyword">null</span> && !databasePassword.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 850</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 849</td> <td class="nbHitsUncovered"><a title="Line 849: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 849: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (zipExtensions != <span class="keyword">null</span> && !zipExtensions.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 850</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);</span></pre></td></tr>
<tr> <td class="numLine"> 851</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 852</td> <td class="nbHitsUncovered"><a title="Line 852: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 852: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (zipExtensions != <span class="keyword">null</span> && !zipExtensions.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 853</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 852</td> <td class="nbHitsUncovered"><a title="Line 852: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 852: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl12Modified != <span class="keyword">null</span> && !cveUrl12Modified.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 853</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);</span></pre></td></tr>
<tr> <td class="numLine"> 854</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 855</td> <td class="nbHitsUncovered"><a title="Line 855: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 855: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl12Modified != <span class="keyword">null</span> && !cveUrl12Modified.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 856</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 855</td> <td class="nbHitsUncovered"><a title="Line 855: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 855: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl20Modified != <span class="keyword">null</span> && !cveUrl20Modified.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 856</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);</span></pre></td></tr>
<tr> <td class="numLine"> 857</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 858</td> <td class="nbHitsUncovered"><a title="Line 858: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 858: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl20Modified != <span class="keyword">null</span> && !cveUrl20Modified.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 859</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 858</td> <td class="nbHitsUncovered"><a title="Line 858: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 858: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl12Base != <span class="keyword">null</span> && !cveUrl12Base.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 859</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);</span></pre></td></tr>
<tr> <td class="numLine"> 860</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 861</td> <td class="nbHitsUncovered"><a title="Line 861: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 861: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl12Base != <span class="keyword">null</span> && !cveUrl12Base.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 862</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 861</td> <td class="nbHitsUncovered"><a title="Line 861: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 861: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl20Base != <span class="keyword">null</span> && !cveUrl20Base.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 862</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);</span></pre></td></tr>
<tr> <td class="numLine"> 863</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 864</td> <td class="nbHitsUncovered"><a title="Line 864: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 864: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cveUrl20Base != <span class="keyword">null</span> && !cveUrl20Base.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 865</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 864</td> <td class="nbHitsUncovered"><a title="Line 864: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 864: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pathToMono != <span class="keyword">null</span> && !pathToMono.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 865</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);</span></pre></td></tr>
<tr> <td class="numLine"> 866</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 867</td> <td class="nbHitsUncovered"><a title="Line 867: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 867: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pathToMono != <span class="keyword">null</span> && !pathToMono.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 868</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);</span></pre></td></tr>
-<tr> <td class="numLine"> 869</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 870</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 871</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 867</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 868</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 872</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 869</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 873</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 870</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Executes the dependency-check and generates the report.</span></pre></td></tr>
-<tr> <td class="numLine"> 874</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 871</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 875</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 872</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws org.owasp.dependencycheck.exception.ScanAgentException thrown if there is an exception executing the</span></pre></td></tr>
-<tr> <td class="numLine"> 876</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 873</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * scan.</span></pre></td></tr>
-<tr> <td class="numLine"> 877</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 874</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 878</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 875</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> execute() <span class="keyword">throws</span> ScanAgentException {</pre></td></tr>
-<tr> <td class="numLineCover"> 879</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Engine engine = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 880</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 876</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Engine engine = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 877</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 881</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine = executeDependencyCheck();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 882</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateExternalReports(engine, <span class="keyword">new</span> File(<span class="keyword">this</span>.reportOutputDirectory));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 883</td> <td class="nbHitsUncovered"><a title="Line 883: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 883: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.showSummary) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 884</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> showSummary(engine.getDependencies());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 878</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine = executeDependencyCheck();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 879</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateExternalReports(engine, <span class="keyword">new</span> File(<span class="keyword">this</span>.reportOutputDirectory));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 880</td> <td class="nbHitsUncovered"><a title="Line 880: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 880: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.showSummary) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 881</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> showSummary(engine.getDependencies());</span></pre></td></tr>
+<tr> <td class="numLine"> 882</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 883</td> <td class="nbHitsUncovered"><a title="Line 883: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 883: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.failBuildOnCVSS <= 10) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 884</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> checkForFailure(engine.getDependencies());</span></pre></td></tr>
<tr> <td class="numLine"> 885</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 886</td> <td class="nbHitsUncovered"><a title="Line 886: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 886: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.failBuildOnCVSS <= 10) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 887</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> checkForFailure(engine.getDependencies());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 886</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 887</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE,</span></pre></td></tr>
<tr> <td class="numLine"> 888</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 889</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 890</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.SEVERE,</span></pre></td></tr>
-<tr> <td class="numLine"> 891</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Unable to connect to the dependency-check database; analysis has stopped"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 892</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 893</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 889</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 890</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 894</td> <td class="nbHitsUncovered"><a title="Line 894: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 894: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (engine != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 895</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.cleanup();</span></pre></td></tr>
-<tr> <td class="numLine"> 896</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 891</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.cleanup();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 892</td> <td class="nbHitsUncovered"><a title="Line 892: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 892: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (engine != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 893</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.cleanup();</span></pre></td></tr>
+<tr> <td class="numLine"> 894</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 895</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 896</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 897</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 898</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 898</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 899</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 900</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 901</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the</span></pre></td></tr>
-<tr> <td class="numLine"> 902</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 900</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * configuration.</span></pre></td></tr>
-<tr> <td class="numLine"> 903</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 901</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 904</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 902</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependencies the list of dependency objects</span></pre></td></tr>
-<tr> <td class="numLine"> 905</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 903</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws org.owasp.dependencycheck.exception.ScanAgentException thrown if there is an exception executing the</span></pre></td></tr>
-<tr> <td class="numLine"> 906</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 904</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * scan.</span></pre></td></tr>
-<tr> <td class="numLine"> 907</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 905</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 908</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 906</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> checkForFailure(List<Dependency> dependencies) <span class="keyword">throws</span> ScanAgentException {</pre></td></tr>
-<tr> <td class="numLineCover"> 909</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder ids = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 910</td> <td class="nbHitsUncovered"><a title="Line 910: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 910: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependencies) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 911</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> addName = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 912</td> <td class="nbHitsUncovered"><a title="Line 912: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 912: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Vulnerability v : d.getVulnerabilities()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 913</td> <td class="nbHitsUncovered"><a title="Line 913: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 913: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (v.getCvssScore() >= failBuildOnCVSS) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 914</td> <td class="nbHitsUncovered"><a title="Line 914: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 914: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (addName) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 915</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addName = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 916</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(NEW_LINE).append(d.getFileName()).append(<span class="string">": "</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 917</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(v.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 907</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder ids = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 908</td> <td class="nbHitsUncovered"><a title="Line 908: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 908: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependencies) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 909</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> addName = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 910</td> <td class="nbHitsUncovered"><a title="Line 910: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 910: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Vulnerability v : d.getVulnerabilities()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 911</td> <td class="nbHitsUncovered"><a title="Line 911: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 911: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (v.getCvssScore() >= failBuildOnCVSS) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 912</td> <td class="nbHitsUncovered"><a title="Line 912: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 912: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (addName) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 913</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addName = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 914</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(NEW_LINE).append(d.getFileName()).append(<span class="string">": "</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 915</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(v.getName());</span></pre></td></tr>
+<tr> <td class="numLine"> 916</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 917</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(<span class="string">", "</span>).append(v.getName());</span></pre></td></tr>
<tr> <td class="numLine"> 918</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 919</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(<span class="string">", "</span>).append(v.getName());</span></pre></td></tr>
-<tr> <td class="numLine"> 920</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 921</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 919</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 922</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 923</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 924</td> <td class="nbHitsUncovered"><a title="Line 924: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 924: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ids.length() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 925</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%n%nDependency-Check Failure:%n"</span></span></pre></td></tr>
-<tr> <td class="numLine"> 926</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 920</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 921</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 922</td> <td class="nbHitsUncovered"><a title="Line 922: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 922: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ids.length() > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 923</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%n%nDependency-Check Failure:%n"</span></span></pre></td></tr>
+<tr> <td class="numLine"> 924</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"</span></pre></td></tr>
-<tr> <td class="numLine"> 927</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 925</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"See the dependency-check report for more details.%n%n"</span>, failBuildOnCVSS, ids.toString());</pre></td></tr>
+<tr> <td class="numLine"> 926</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 927</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ScanAgentException(msg);</span></pre></td></tr>
<tr> <td class="numLine"> 928</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 929</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ScanAgentException(msg);</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 929</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 930</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 931</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 932</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 933</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 931</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 934</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 932</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries.</span></pre></td></tr>
-<tr> <td class="numLine"> 935</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 933</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 936</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 934</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependencies a list of dependency objects</span></pre></td></tr>
-<tr> <td class="numLine"> 937</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 935</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 938</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 936</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> showSummary(List<Dependency> dependencies) {</pre></td></tr>
-<tr> <td class="numLineCover"> 939</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder summary = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 940</td> <td class="nbHitsUncovered"><a title="Line 940: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 940: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependencies) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 941</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> firstEntry = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 942</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder ids = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 943</td> <td class="nbHitsUncovered"><a title="Line 943: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 943: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Vulnerability v : d.getVulnerabilities()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 944</td> <td class="nbHitsUncovered"><a title="Line 944: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 944: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (firstEntry) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 945</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> firstEntry = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 946</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 937</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder summary = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 938</td> <td class="nbHitsUncovered"><a title="Line 938: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 938: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependencies) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 939</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> firstEntry = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 940</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder ids = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 941</td> <td class="nbHitsUncovered"><a title="Line 941: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 941: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Vulnerability v : d.getVulnerabilities()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 942</td> <td class="nbHitsUncovered"><a title="Line 942: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 942: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (firstEntry) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 943</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> firstEntry = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 944</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 947</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(<span class="string">", "</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 948</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 945</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(<span class="string">", "</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 946</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 949</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(v.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 950</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 951</td> <td class="nbHitsUncovered"><a title="Line 951: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 951: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ids.length() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 952</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(d.getFileName()).append(<span class="string">" ("</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 953</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> firstEntry = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 954</td> <td class="nbHitsUncovered"><a title="Line 954: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 954: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Identifier id : d.getIdentifiers()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 955</td> <td class="nbHitsUncovered"><a title="Line 955: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 955: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (firstEntry) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 956</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> firstEntry = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 957</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 947</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.append(v.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 948</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 949</td> <td class="nbHitsUncovered"><a title="Line 949: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 949: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ids.length() > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 950</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(d.getFileName()).append(<span class="string">" ("</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 951</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> firstEntry = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 952</td> <td class="nbHitsUncovered"><a title="Line 952: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 952: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Identifier id : d.getIdentifiers()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 953</td> <td class="nbHitsUncovered"><a title="Line 953: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 953: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (firstEntry) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 954</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> firstEntry = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 955</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 958</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(<span class="string">", "</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 959</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 956</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(<span class="string">", "</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 957</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 960</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(id.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 961</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 962</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(<span class="string">") : "</span>).append(ids).append(NEW_LINE);</span></pre></td></tr>
-<tr> <td class="numLine"> 963</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 958</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(id.getValue());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 959</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 960</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> summary.append(<span class="string">") : "</span>).append(ids).append(NEW_LINE);</span></pre></td></tr>
+<tr> <td class="numLine"> 961</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 964</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 965</td> <td class="nbHitsUncovered"><a title="Line 965: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 965: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (summary.length() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 966</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%n%n"</span></span></pre></td></tr>
-<tr> <td class="numLine"> 967</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 962</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 963</td> <td class="nbHitsUncovered"><a title="Line 963: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 963: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (summary.length() > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 964</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"%n%n"</span></span></pre></td></tr>
+<tr> <td class="numLine"> 965</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"One or more dependencies were identified with known vulnerabilities:%n%n%s"</span></pre></td></tr>
-<tr> <td class="numLine"> 968</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 966</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"%n%nSee the dependency-check report for more details.%n%n"</span>, summary.toString());</pre></td></tr>
-<tr> <td class="numLineCover"> 969</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyCheckScanAgent.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 970</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 967</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 968</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 971</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 972</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 969</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 970</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 973</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 971</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 bcb2cf808..c00ca7438 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html">AbstractAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator"> </div>
@@ -83,7 +83,7 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//do nothing</span></pre></td></tr>
-<tr> <td class="numLineCover"> 34</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
@@ -102,11 +102,11 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() <span class="keyword">throws</span> Exception {</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//do nothing</span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 3cb332227..cf5a5b917 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 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6153846153846154;</span>1.615</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html">AbstractFileTypeAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">74%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:74px"><span class="text">26/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">8/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6153846153846154;</span>1.615</td></tr>
</table>
<div class="separator"> </div>
@@ -101,39 +101,39 @@
<td class="src"><pre class="src"> <span class="comment"> * enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> AbstractFileTypeAnalyzer() {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String key = getAnalyzerEnabledSettingKey();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AbstractFileTypeAnalyzer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String key = getAnalyzerEnabledSettingKey();</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> enabled = Settings.getBoolean(key, <span class="keyword">true</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> enabled = Settings.getBoolean(key, <span class="keyword">true</span>);</pre></td></tr>
<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidSettingException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String msg = String.format(<span class="string">"Invalid settting for property '%s'"</span>, key);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String msg = String.format(<span class="string">"Invalid setting for property '%s'"</span>, key);</span></pre></td></tr>
<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> msg = String.format(<span class="string">"%s has been disabled"</span>, getName());</span></pre></td></tr>
<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Field defentitions"></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Field definitions"></span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(AbstractFileTypeAnalyzer.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(AbstractFileTypeAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Whether the file type analyzer detected any files it needs to analyze.</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> filesMatched = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> filesMatched = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
@@ -178,7 +178,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A flag indicating whether or not the analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> enabled = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> enabled = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
@@ -321,14 +321,14 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"><a title="Line 160: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 160: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (filesMatched) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> initializeFileTypeAnalyzer();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"><a title="Line 160: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 160: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (filesMatched) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> initializeFileTypeAnalyzer();</pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> enabled = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> enabled = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
@@ -351,11 +351,11 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">void</span> analyze(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"><a title="Line 177: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 177: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (enabled) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzeFileType(dependency, engine);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"><a title="Line 177: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 177: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (enabled) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> analyzeFileType(dependency, engine);</pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
@@ -374,25 +374,25 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">boolean</span> supportsExtension(String extension) {</pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"><a title="Line 190: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 190: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!enabled) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"><a title="Line 190: Conditional coverage 100% (2/2)."> 4259</a></td> <td class="src"><pre class="src"> <a title="Line 190: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!enabled) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 854</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<String> ext = getSupportedExtensions();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"><a title="Line 194: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 194: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ext == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"> 3405</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<String> ext = getSupportedExtensions();</pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"><a title="Line 194: Conditional coverage 50% (1/2)."> 3405</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 194: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (ext == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"The '%s' analyzer is misconfigured and does not have any file extensions;"</span></span></pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">" it will be disabled"</span>, getName());</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractFileTypeAnalyzer.<span class="keyword">class</span>.getName()).log(Level.SEVERE, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, msg);</span></pre></td></tr>
<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> match = ext.contains(extension);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"><a title="Line 201: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 201: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (match) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> filesMatched = match;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"> 3405</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">boolean</span> match = ext.contains(extension);</pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"><a title="Line 201: Conditional coverage 100% (2/2)."> 3405</a></td> <td class="src"><pre class="src"> <a title="Line 201: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (match) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> filesMatched = match;</pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> match;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 3405</td> <td class="src"><pre class="src"> <span class="keyword">return</span> match;</pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
@@ -429,11 +429,11 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">static</span> Set<String> newHashSet(String... strings) {</pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<String> set = <span class="keyword">new</span> HashSet<String>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<String> set = <span class="keyword">new</span> HashSet<String>();</pre></td></tr>
<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Collections.addAll(set, strings);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> set;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Collections.addAll(set, strings);</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> set;</pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
@@ -442,6 +442,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 26988d67e..938ebd345 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/45</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html">AbstractSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">48%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:48px"><span class="text">25/52</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">6/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.6666666666666665;</span>3.667</td></tr>
</table>
<div class="separator"> </div>
@@ -60,218 +60,257 @@
<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.io.IOException;</pre></td></tr>
<tr> <td class="numLine"> 22</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.MalformedURLException;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.io.InputStream;</pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URL;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.MalformedURLException;</pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.List;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URL;</pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Set;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.List;</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Set;</pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.regex.Pattern;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.suppression.SuppressionParseException;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.regex.Pattern;</pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.suppression.SuppressionParser;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.suppression.SuppressionParseException;</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.suppression.SuppressionRule;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.suppression.SuppressionParser;</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.DownloadFailedException;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.suppression.SuppressionRule;</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Downloader;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.DownloadFailedException;</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.FileUtils;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Downloader;</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.FileUtils;</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Abstract base suppression analyzer that contains methods for parsing the suppression xml file.</span></pre></td></tr>
-<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
-<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> AbstractSuppressionAnalyzer <span class="keyword">extends</span> AbstractAnalyzer {</pre></td></tr>
-<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Abstract base suppression analyzer that contains methods for parsing the suppression xml file.</span></pre></td></tr>
+<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
+<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> AbstractSuppressionAnalyzer <span class="keyword">extends</span> AbstractAnalyzer {</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a list of file EXTENSIONS supported by this analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger for use throughout the class</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a list of file EXTENSIONS supported by this analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a list of file EXTENSIONS supported by this analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a list of file EXTENSIONS supported by this analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The initialize method loads the suppression XML file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws Exception thrown if there is an exception</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">super</span>.initialize();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> loadSuppressionData();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The list of suppression rules</span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> List<SuppressionRule> rules;</pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of rules.</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The initialize method loads the suppression XML file.</span></pre></td></tr>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws Exception thrown if there is an exception</span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">super</span>.initialize();</pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> loadSuppressionData();</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of rules</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The list of suppression rules</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> List<SuppressionRule> getRules() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> List<SuppressionRule> rules;</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> rules;</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of rules.</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of rules.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of rules</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param rules new value of rules</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> List<SuppressionRule> getRules() {</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> rules;</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setRules(List<SuppressionRule> rules) {</pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.rules = rules;</pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads the suppression rules file.</span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of rules.</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SuppressionParseException thrown if the XML cannot be parsed.</span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param rules new value of rules</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setRules(List<SuppressionRule> rules) {</pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.rules = rules;</pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> loadSuppressionData() <span class="keyword">throws</span> SuppressionParseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String suppressionFilePath = Settings.getString(Settings.KEYS.SUPPRESSION_FILE);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"><a title="Line 95: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 95: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (suppressionFilePath == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> File file = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> deleteTempFile = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Pattern uriRx = Pattern.compile(<span class="string">"^(https?|file)\\:.*"</span>, Pattern.CASE_INSENSITIVE);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"><a title="Line 102: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 102: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (uriRx.matcher(suppressionFilePath).matches()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleteTempFile = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file = FileUtils.getTempFile(<span class="string">"suppression"</span>, <span class="string">"xml"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URL url = <span class="keyword">new</span> URL(suppressionFilePath);</span></pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Downloader.fetchFile(url, file, <span class="keyword">false</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Downloader.fetchFile(url, file, <span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file = <span class="keyword">new</span> File(suppressionFilePath);</span></pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SuppressionParser parser = <span class="keyword">new</span> SuppressionParser();</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads the suppression rules file.</span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SuppressionParseException thrown if the XML cannot be parsed.</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> loadSuppressionData() <span class="keyword">throws</span> SuppressionParseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String suppressionFilePath = Settings.getString(Settings.KEYS.SUPPRESSION_FILE);</pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"><a title="Line 102: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 102: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (suppressionFilePath == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> File file = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> deleteTempFile = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Pattern uriRx = Pattern.compile(<span class="string">"^(https?|file)\\:.*"</span>, Pattern.CASE_INSENSITIVE);</pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"><a title="Line 109: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 109: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (uriRx.matcher(suppressionFilePath).matches()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> deleteTempFile = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> file = FileUtils.getTempFile(<span class="string">"suppression"</span>, <span class="string">"xml"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> URL url = <span class="keyword">new</span> URL(suppressionFilePath);</pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rules = parser.parseSuppressionRules(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, rules.size() + <span class="string">" suppression rules were loaded."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SuppressionParseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to parse suppression xml file '%s'"</span>, file.getPath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.WARNING, ex.getMessage());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.WARNING,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Downloader.fetchFile(url, file, <span class="keyword">false</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Downloader.fetchFile(url, file, <span class="keyword">true</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file = <span class="keyword">new</span> File(suppressionFilePath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"><a title="Line 120: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 120: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!file.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputStream suppressionsFromClasspath = <span class="keyword">this</span>.getClass().getClassLoader().getResourceAsStream(suppressionFilePath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"><a title="Line 122: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 122: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (suppressionsFromClasspath != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleteTempFile = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file = FileUtils.getTempFile(<span class="string">"suppression"</span>, <span class="string">"xml"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> org.apache.commons.io.FileUtils.copyInputStreamToFile(suppressionsFromClasspath, file);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> throwSuppressionParseException(<span class="string">"Unable to locate suppressions file in classpath"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Unable to fetch the configured suppression file"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(<span class="string">"Unable to fetch the configured suppression file"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.WARNING,</span></pre></td></tr>
-<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Configured suppression file has an invalid URL"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(<span class="string">"Configured suppression file has an invalid URL"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.WARNING,</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Unable to create temp file for suppressions"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AbstractSuppressionAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(<span class="string">"Unable to create temp file for suppressions"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"><a title="Line 144: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 144: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (deleteTempFile && file != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FileUtils.delete(file);</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"><a title="Line 134: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 134: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (file != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> SuppressionParser parser = <span class="keyword">new</span> SuppressionParser();</pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> rules = parser.parseSuppressionRules(file);</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, rules.size() + <span class="string">" suppression rules were loaded."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SuppressionParseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to parse suppression xml file '%s'"</span>, file.getPath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, ex.getMessage());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> throwSuppressionParseException(<span class="string">"Unable to fetch the configured suppression file"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> throwSuppressionParseException(<span class="string">"Configured suppression file has an invalid URL"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> throwSuppressionParseException(<span class="string">"Unable to create temp file for suppressions"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"><a title="Line 154: Conditional coverage 10% (2/20) [each condition: 50%, 50%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 154: Conditional coverage 10% (2/20) [each condition: 50%, 50%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (deleteTempFile && file != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> FileUtils.delete(file);</pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Utility method to throw parse exceptions.</span></pre></td></tr>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param message the exception message</span></pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param exception the cause of the exception</span></pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SuppressionParseException throws the generated SuppressionParseException</span></pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> throwSuppressionParseException(String message, Exception exception) <span class="keyword">throws</span> SuppressionParseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, message);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, exception);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(message, exception);</span></pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 fcc51cc2e..d058d75d4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalysisPhase.html">AnalysisPhase</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">10/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
</table>
<div class="separator"> </div>
@@ -65,7 +65,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 25</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> enum AnalysisPhase {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">public</span> enum AnalysisPhase {</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
@@ -74,67 +74,67 @@
<td class="src"><pre class="src"> <span class="comment"> * Initialization phase.</span></pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 30</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> INITIAL,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> INITIAL,</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Information collection phase.</span></pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 34</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> INFORMATION_COLLECTION,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> INFORMATION_COLLECTION,</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Pre identifier analysis phase.</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> PRE_IDENTIFIER_ANALYSIS,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> PRE_IDENTIFIER_ANALYSIS,</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Identifier analysis phase.</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> IDENTIFIER_ANALYSIS,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> IDENTIFIER_ANALYSIS,</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Post identifier analysis phase.</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> POST_IDENTIFIER_ANALYSIS,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> POST_IDENTIFIER_ANALYSIS,</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Pre finding analysis phase.</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> PRE_FINDING_ANALYSIS,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> PRE_FINDING_ANALYSIS,</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Finding analysis phase.</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FINDING_ANALYSIS,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> FINDING_ANALYSIS,</pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Post analysis phase.</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> POST_FINDING_ANALYSIS,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> POST_FINDING_ANALYSIS,</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The final analysis phase.</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FINAL</span></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> FINAL</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 53c70ace1..617d8fa0d 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 75febe131..39f9019a3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/7</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AnalyzerService.html">AnalyzerService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator"> </div>
@@ -64,84 +64,63 @@
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Analyzer Service Loader. This class loads all services that implement</span></pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * org.owasp.dependencycheck.analyzer.Analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> AnalyzerService {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> AnalyzerService {</pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The analyzer service singleton.</span></pre></td></tr>
-<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> AnalyzerService service;</pre></td></tr>
-<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The service loader for analyzers.</span></pre></td></tr>
-<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ServiceLoader<Analyzer> loader;</pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The service loader for analyzers.</span></pre></td></tr>
+<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ServiceLoader<Analyzer> loader;</pre></td></tr>
+<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Creates a new instance of AnalyzerService.</span></pre></td></tr>
+<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param classLoader the ClassLoader to use when dynamically loading Analyzer and Update services</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> AnalyzerService() {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> loader = ServiceLoader.load(Analyzer.<span class="keyword">class</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AnalyzerService(ClassLoader classLoader) {</pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> loader = ServiceLoader.load(Analyzer.<span class="keyword">class</span>, classLoader);</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieve the singleton instance of AnalyzerService.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns an Iterator for all instances of the Analyzer interface.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a singleton AnalyzerService.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an iterator of Analyzers.</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">synchronized</span> AnalyzerService getInstance() {</pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"><a title="Line 51: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 51: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (service == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> service = <span class="keyword">new</span> AnalyzerService();</span></pre></td></tr>
-<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> service;</span></pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns an Iterator for all instances of the Analyzer interface.</span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an iterator of Analyzers.</span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Iterator<Analyzer> getAnalyzers() {</pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> loader.iterator();</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> loader.iterator();</pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 a4193476b..90f98be0e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/163</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/70</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.454545454545454;</span>6.455</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html">ArchiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">38%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:38px"><span class="text">62/159</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">19/66</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.181818181818182;</span>6.182</td></tr>
</table>
<div class="separator"> </div>
@@ -137,7 +137,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(ArchiveAnalyzer.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(ArchiveAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
@@ -152,7 +152,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The count of directories created during analysis. This is used for creating temporary directories.</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">int</span> dirCount = 0;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">int</span> dirCount = 0;</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
@@ -167,7 +167,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The max scan depth that the analyzer will recursively extract nested archives.</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> MAX_SCAN_DEPTH = Settings.getInt(<span class="string">"archive.scan.depth"</span>, 3);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> MAX_SCAN_DEPTH = Settings.getInt(<span class="string">"archive.scan.depth"</span>, 3);</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
@@ -194,14 +194,14 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INITIAL;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INITIAL;</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The set of things we can handle with Zip methods</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> ZIPPABLES = newHashSet(<span class="string">"zip"</span>, <span class="string">"ear"</span>, <span class="string">"war"</span>, <span class="string">"nupkg"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> ZIPPABLES = newHashSet(<span class="string">"zip"</span>, <span class="string">"ear"</span>, <span class="string">"war"</span>, <span class="string">"jar"</span>, <span class="string">"sar"</span>, <span class="string">"apk"</span>, <span class="string">"nupkg"</span>);</pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
@@ -210,19 +210,19 @@
<td class="src"><pre class="src"> <span class="comment"> * to be explicitly handled in extractFiles().</span></pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> EXTENSIONS = newHashSet(<span class="string">"tar"</span>, <span class="string">"gz"</span>, <span class="string">"tgz"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> EXTENSIONS = newHashSet(<span class="string">"tar"</span>, <span class="string">"gz"</span>, <span class="string">"tgz"</span>);</pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">static</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String additionalZipExt = Settings.getString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">if</span> (additionalZipExt != <span class="keyword">null</span>) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String additionalZipExt = Settings.getString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS);</pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">if</span> (additionalZipExt != <span class="keyword">null</span>) {</pre></td></tr>
<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> HashSet ext = <span class="keyword">new</span> HashSet<String>(Arrays.asList(additionalZipExt));</span></pre></td></tr>
<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ZIPPABLES.addAll(ext);</span></pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> EXTENSIONS.addAll(ZIPPABLES);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> EXTENSIONS.addAll(ZIPPABLES);</pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
@@ -239,7 +239,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EXTENSIONS;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 850</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EXTENSIONS;</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
@@ -258,7 +258,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
@@ -277,7 +277,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
@@ -298,7 +298,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> String getAnalyzerEnabledSettingKey() {</pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_ARCHIVE_ENABLED;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_ARCHIVE_ENABLED;</pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
@@ -317,391 +317,377 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initializeFileTypeAnalyzer() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File baseDir = Settings.getTempDirectory();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"><a title="Line 160: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 160: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!baseDir.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!baseDir.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to make a temporary folder '%s'"</span>, baseDir.getPath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File baseDir = Settings.getTempDirectory();</pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> tempFileLocation = File.createTempFile(<span class="string">"check"</span>, <span class="string">"tmp"</span>, baseDir);</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!tempFileLocation.delete()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to delete temporary file '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tempFileLocation = File.createTempFile(<span class="string">"check"</span>, <span class="string">"tmp"</span>, baseDir);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"><a title="Line 167: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 167: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!tempFileLocation.delete()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to delete temporary file '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"><a title="Line 165: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 165: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!tempFileLocation.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create directory '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"><a title="Line 171: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 171: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!tempFileLocation.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create directory '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The close method deletes any temporary files and directories created during analysis.</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws Exception thrown if there is an exception deleting temporary files</span></pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"><a title="Line 184: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 184: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (tempFileLocation != <span class="keyword">null</span> && tempFileLocation.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Attempting to delete temporary files"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> success = FileUtils.delete(tempFileLocation);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"><a title="Line 187: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 187: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!success) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Failed to delete some temporary files, see the log for more details"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"><a title="Line 178: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 178: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (tempFileLocation != <span class="keyword">null</span> && tempFileLocation.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Attempting to delete temporary files"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">boolean</span> success = FileUtils.delete(tempFileLocation);</pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!success) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Failed to delete some temporary files, see the log for more details"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Analyzes a given dependency. If the dependency is an archive, such as a WAR or EAR, the contents are extracted,</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * scanned, and added to the list of dependencies within the engine.</span></pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to analyze</span></pre></td></tr>
-<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param engine the engine scanning</span></pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException thrown if there is an analysis exception</span></pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyzeFileType(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File f = <span class="keyword">new</span> File(dependency.getActualFilePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File tmpDir = getNextTempDirectory();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractFiles(f, tmpDir, engine);</span></pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File f = <span class="keyword">new</span> File(dependency.getActualFilePath());</pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File tmpDir = getNextTempDirectory();</pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> extractFiles(f, tmpDir, engine);</pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//make a copy</span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Dependency> dependencies = <span class="keyword">new</span> ArrayList<Dependency>(engine.getDependencies());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.scan(tmpDir);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Dependency> newDependencies = engine.getDependencies();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"><a title="Line 211: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 211: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dependencies.size() != newDependencies.size()) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<Dependency> dependencies = <span class="keyword">new</span> ArrayList<Dependency>(engine.getDependencies());</pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> engine.scan(tmpDir);</pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<Dependency> newDependencies = engine.getDependencies();</pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"><a title="Line 205: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 205: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (dependencies.size() != newDependencies.size()) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//get the new dependencies</span></pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Dependency> dependencySet = <span class="keyword">new</span> HashSet<Dependency>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependencySet.addAll(newDependencies);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependencySet.removeAll(dependencies);</span></pre></td></tr>
-<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Dependency> dependencySet = <span class="keyword">new</span> HashSet<Dependency>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependencySet.addAll(newDependencies);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependencySet.removeAll(dependencies);</span></pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"><a title="Line 217: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 217: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependencySet) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"><a title="Line 211: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 211: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependencySet) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//fix the dependency's display name and path</span></pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String displayPath = String.format(<span class="string">"%s%s"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String displayPath = String.format(<span class="string">"%s%s"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> dependency.getFilePath(),</pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> d.getActualFilePath().substring(tmpDir.getAbsolutePath().length()));</pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String displayName = String.format(<span class="string">"%s%s%s"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String displayName = String.format(<span class="string">"%s%s%s"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> dependency.getFileName(),</pre></td></tr>
-<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> File.separator,</pre></td></tr>
-<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> d.getFileName());</pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> d.setFilePath(displayPath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> d.setFileName(displayName);</span></pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> d.setFilePath(displayPath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> d.setFileName(displayName);</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//TODO - can we get more evidence from the parent? EAR contains module name, etc.</span></pre></td></tr>
-<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//analyze the dependency (i.e. extract files) if it is a supported type.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.supportsExtension(d.getFileExtension()) && scanDepth < MAX_SCAN_DEPTH) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanDepth += 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyze(d, engine);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanDepth -= 1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"><a title="Line 225: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 225: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.supportsExtension(d.getFileExtension()) && scanDepth < MAX_SCAN_DEPTH) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanDepth += 1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyze(d, engine);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scanDepth -= 1;</span></pre></td></tr>
+<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Collections.sort(engine.getDependencies());</pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Collections.sort(engine.getDependencies());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Retrieves the next temporary directory to extract an archive too.</span></pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return a directory</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException thrown if unable to create temporary directory</span></pre></td></tr>
-<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> File getNextTempDirectory() <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dirCount += 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File directory = <span class="keyword">new</span> File(tempFileLocation, String.valueOf(dirCount));</span></pre></td></tr>
-<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dirCount += 1;</pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File directory = <span class="keyword">new</span> File(tempFileLocation, String.valueOf(dirCount));</pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//getting an exception for some directories not being able to be created; might be because the directory already exists?</span></pre></td></tr>
-<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"><a title="Line 251: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 251: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (directory.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getNextTempDirectory();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"><a title="Line 245: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 245: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (directory.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getNextTempDirectory();</span></pre></td></tr>
+<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"><a title="Line 248: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 248: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!directory.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create temp directory '%s'."</span>, directory.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> directory;</pre></td></tr>
<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"><a title="Line 254: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 254: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!directory.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create temp directory '%s'."</span>, directory.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> directory;</span></pre></td></tr>
-<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Extracts the contents of an archive into the specified directory.</span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param archive an archive file such as a WAR or EAR</span></pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param destination a directory to extract the contents to</span></pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param engine the scanning engine</span></pre></td></tr>
-<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException thrown if the archive is not found</span></pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> extractFiles(File archive, File destination, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"><a title="Line 270: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 270: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (archive == <span class="keyword">null</span> || destination == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"><a title="Line 264: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 264: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (archive == <span class="keyword">null</span> || destination == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FileInputStream fis = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> FileInputStream fis = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fis = <span class="keyword">new</span> FileInputStream(archive);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Archive file was not found."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String archiveExt = FileUtils.getFileExtension(archive.getName()).toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 270</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fis = <span class="keyword">new</span> FileInputStream(archive);</pre></td></tr>
+<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Archive file was not found."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String archiveExt = FileUtils.getFileExtension(archive.getName()).toLowerCase();</pre></td></tr>
+<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"><a title="Line 283: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 283: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ZIPPABLES.contains(archiveExt)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractArchive(<span class="keyword">new</span> ZipArchiveInputStream(<span class="keyword">new</span> BufferedInputStream(fis)), destination, engine);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"><a title="Line 285: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 285: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"tar"</span>.equals(archiveExt)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractArchive(<span class="keyword">new</span> TarArchiveInputStream(<span class="keyword">new</span> BufferedInputStream(fis)), destination, engine);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"><a title="Line 287: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 287: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"gz"</span>.equals(archiveExt) || <span class="string">"tgz"</span>.equals(archiveExt)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String uncompressedName = GzipUtils.getUncompressedFilename(archive.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String uncompressedExt = FileUtils.getFileExtension(uncompressedName).toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"><a title="Line 290: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 290: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (engine.supportsExtension(uncompressedExt)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> decompressFile(<span class="keyword">new</span> GzipCompressorInputStream(<span class="keyword">new</span> BufferedInputStream(fis)), <span class="keyword">new</span> File(destination, uncompressedName));</span></pre></td></tr>
-<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"><a title="Line 277: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 277: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (ZIPPABLES.contains(archiveExt)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> extractArchive(<span class="keyword">new</span> ZipArchiveInputStream(<span class="keyword">new</span> BufferedInputStream(fis)), destination, engine);</pre></td></tr>
+<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"><a title="Line 279: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 279: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"tar"</span>.equals(archiveExt)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractArchive(<span class="keyword">new</span> TarArchiveInputStream(<span class="keyword">new</span> BufferedInputStream(fis)), destination, engine);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"><a title="Line 281: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 281: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"gz"</span>.equals(archiveExt) || <span class="string">"tgz"</span>.equals(archiveExt)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String uncompressedName = GzipUtils.getUncompressedFilename(archive.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String uncompressedExt = FileUtils.getFileExtension(uncompressedName).toLowerCase();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"><a title="Line 284: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 284: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (engine.supportsExtension(uncompressedExt)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> decompressFile(<span class="keyword">new</span> GzipCompressorInputStream(<span class="keyword">new</span> BufferedInputStream(fis)), <span class="keyword">new</span> File(destination, uncompressedName));</span></pre></td></tr>
+<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ArchiveExtractionException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception extracting archive '%s'."</span>, archive.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception reading archive '%s'."</span>, archive.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ArchiveExtractionException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception extracting archive '%s'."</span>, archive.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception reading archive '%s'."</span>, archive.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">try</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fis.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 306</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 307</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">try</span> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fis.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 303</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Extracts files from an archive.</span></pre></td></tr>
-<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param input the archive to extract files from</span></pre></td></tr>
-<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param destination the location to write the files too</span></pre></td></tr>
-<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param engine the dependency-check engine</span></pre></td></tr>
-<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws ArchiveExtractionException thrown if there is an exception extracting files from the archive</span></pre></td></tr>
-<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> extractArchive(ArchiveInputStream input, File destination, Engine engine) <span class="keyword">throws</span> ArchiveExtractionException {</pre></td></tr>
-<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ArchiveEntry entry;</pre></td></tr>
-<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"><a title="Line 322: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 322: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((entry = input.getNextEntry()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 323</td> <td class="nbHitsUncovered"><a title="Line 323: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 323: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (entry.isDirectory()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File d = <span class="keyword">new</span> File(destination, entry.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"><a title="Line 325: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 325: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!d.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"><a title="Line 326: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 326: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!d.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create directory '%s'."</span>, d.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 316</td> <td class="nbHitsCovered"><a title="Line 316: Conditional coverage 100% (2/2)."> 887</a></td> <td class="src"><pre class="src"> <a title="Line 316: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> ((entry = input.getNextEntry()) != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 317</td> <td class="nbHitsCovered"><a title="Line 317: Conditional coverage 100% (2/2)."> 885</a></td> <td class="src"><pre class="src"> <a title="Line 317: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (entry.isDirectory()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File d = <span class="keyword">new</span> File(destination, entry.getName());</pre></td></tr>
+<tr> <td class="numLineCover"> 319</td> <td class="nbHitsUncovered"><a title="Line 319: Conditional coverage 50% (1/2)."> 36</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 319: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!d.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"><a title="Line 320: Conditional coverage 50% (1/2)."> 36</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 320: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!d.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create directory '%s'."</span>, d.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 326</td> <td class="nbHitsCovered"> 849</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(destination, entry.getName());</pre></td></tr>
+<tr> <td class="numLineCover"> 327</td> <td class="nbHitsCovered"> 849</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String ext = FileUtils.getFileExtension(file.getName());</pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"><a title="Line 328: Conditional coverage 50% (1/2)."> 849</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 328: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (engine.supportsExtension(ext)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedOutputStream bos = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(destination, entry.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String ext = FileUtils.getFileExtension(file.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 334</td> <td class="nbHitsUncovered"><a title="Line 334: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 334: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (engine.supportsExtension(ext)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedOutputStream bos = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> FileOutputStream fos;</pre></td></tr>
-<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 338</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File parent = file.getParentFile();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 339</td> <td class="nbHitsUncovered"><a title="Line 339: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 339: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!parent.isDirectory()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 340</td> <td class="nbHitsUncovered"><a title="Line 340: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 340: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!parent.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 341</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to build directory '%s'."</span>, parent.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File parent = file.getParentFile();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"><a title="Line 333: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 333: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!parent.isDirectory()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 334</td> <td class="nbHitsUncovered"><a title="Line 334: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 334: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!parent.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 335</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to build directory '%s'."</span>, parent.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 345</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fos = <span class="keyword">new</span> FileOutputStream(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 346</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos = <span class="keyword">new</span> BufferedOutputStream(fos, BUFFER_SIZE);</span></pre></td></tr>
-<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fos = <span class="keyword">new</span> FileOutputStream(file);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 340</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos = <span class="keyword">new</span> BufferedOutputStream(fos, BUFFER_SIZE);</span></pre></td></tr>
+<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">int</span> count;</pre></td></tr>
-<tr> <td class="numLineCover"> 348</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span> data[] = <span class="keyword">new</span> <span class="keyword">byte</span>[BUFFER_SIZE];</span></pre></td></tr>
-<tr> <td class="numLineCover"> 349</td> <td class="nbHitsUncovered"><a title="Line 349: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 349: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((count = input.read(data, 0, BUFFER_SIZE)) != -1) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 350</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.write(data, 0, count);</span></pre></td></tr>
-<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span> data[] = <span class="keyword">new</span> <span class="keyword">byte</span>[BUFFER_SIZE];</span></pre></td></tr>
+<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"><a title="Line 343: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 343: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((count = input.read(data, 0, BUFFER_SIZE)) != -1) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.write(data, 0, count);</span></pre></td></tr>
+<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.flush();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 353</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ArchiveAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 346</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.flush();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 347</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 348</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 349</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to find file '%s'."</span>, file.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 350</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 353</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IO Exception while parsing file '%s'."</span>, file.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg, ex);</span></pre></td></tr>
<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to find file '%s'."</span>, file.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 359</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ArchiveAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IO Exception while parsing file '%s'."</span>, file.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 362</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 364</td> <td class="nbHitsUncovered"><a title="Line 364: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 364: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (bos != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"><a title="Line 356: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 356: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (bos != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 367</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ArchiveAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 374</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsCovered"> 849</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 376</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 377</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 378</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 367</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 381</td> <td class="nbHitsUncovered"><a title="Line 381: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 381: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (input != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 372</td> <td class="nbHitsUncovered"><a title="Line 372: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 372: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (input != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 383</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> input.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 384</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 385</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 386</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> input.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 375</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 376</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 377</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 389</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 380</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Decompresses a file.</span></pre></td></tr>
-<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param inputStream the compressed file</span></pre></td></tr>
-<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param outputFile the location to write the decompressed file</span></pre></td></tr>
-<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws ArchiveExtractionException thrown if there is an exception decompressing the file</span></pre></td></tr>
-<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> decompressFile(CompressorInputStream inputStream, File outputFile) <span class="keyword">throws</span> ArchiveExtractionException {</pre></td></tr>
-<tr> <td class="numLineCover"> 399</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FileOutputStream out = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 390</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FileOutputStream out = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 401</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> out = <span class="keyword">new</span> FileOutputStream(outputFile);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 402</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[BUFFER_SIZE];</span></pre></td></tr>
-<tr> <td class="numLineCover"> 403</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> n = 0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 404</td> <td class="nbHitsUncovered"><a title="Line 404: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 404: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (-1 != (n = inputStream.read(buffer))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 405</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> out.write(buffer, 0, n);</span></pre></td></tr>
-<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 392</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> out = <span class="keyword">new</span> FileOutputStream(outputFile);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 393</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[BUFFER_SIZE];</span></pre></td></tr>
+<tr> <td class="numLineCover"> 394</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> n = 0;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 395</td> <td class="nbHitsUncovered"><a title="Line 395: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 395: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (-1 != (n = inputStream.read(buffer))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 396</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> out.write(buffer, 0, n);</span></pre></td></tr>
+<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 407</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 408</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 409</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 410</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 411</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 412</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 398</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 399</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 400</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 401</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 402</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 403</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ArchiveExtractionException(ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 414</td> <td class="nbHitsUncovered"><a title="Line 414: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 414: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (out != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 405</td> <td class="nbHitsUncovered"><a title="Line 405: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 405: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (out != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 416</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> out.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 417</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 418</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 419</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 407</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> out.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 408</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 409</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 410</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 422</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 413</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 16a6e1105..6f68ccb3d 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/117</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/60</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.625;</span>6.625</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html">AssemblyAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">67%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">80/119</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">25/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.875;</span>6.875</td></tr>
</table>
<div class="separator"> </div>
@@ -135,14 +135,14 @@
<td class="src"><pre class="src"> <span class="comment"> * The analysis phase</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The list of supported extensions</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> SUPORTED_EXTENSIONS = newHashSet(<span class="string">"dll"</span>, <span class="string">"exe"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> SUPPORTED_EXTENSIONS = newHashSet(<span class="string">"dll"</span>, <span class="string">"exe"</span>);</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
@@ -165,7 +165,7 @@
<td class="src"><pre class="src"> <span class="comment"> * Logger</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOG = Logger.getLogger(AssemblyAnalyzer.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(AssemblyAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
@@ -182,8 +182,8 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> List<String> buildArgumentList() {</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Use file.separator as a wild guess as to whether this is Windows</span></pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> args = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"><a title="Line 86: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 86: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!<span class="string">"\\"</span>.equals(System.getProperty(<span class="string">"file.separator"</span>))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> args = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"><a title="Line 86: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 86: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!<span class="string">"\\"</span>.equals(System.getProperty(<span class="string">"file.separator"</span>))) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (Settings.getString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> args.add(Settings.getString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH));</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
@@ -193,10 +193,10 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> args.add(grokAssemblyExe.getPath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> args.add(grokAssemblyExe.getPath());</pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> args;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">return</span> args;</pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
@@ -221,63 +221,63 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyzeFileType(Dependency dependency, Engine engine)</pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"><a title="Line 108: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 108: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (grokAssemblyExe == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.warning(<span class="string">"GrokAssembly didn't get deployed"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"><a title="Line 108: Conditional coverage 50% (1/2)."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 108: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (grokAssemblyExe == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.warning(<span class="string">"GrokAssembly didn't get deployed"</span>);</span></pre></td></tr>
<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> args = buildArgumentList();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> args.add(dependency.getActualFilePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ProcessBuilder pb = <span class="keyword">new</span> ProcessBuilder(args);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedReader rdr = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> args = buildArgumentList();</pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> args.add(dependency.getActualFilePath());</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ProcessBuilder pb = <span class="keyword">new</span> ProcessBuilder(args);</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> BufferedReader rdr = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Process proc = pb.start();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Process proc = pb.start();</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Try evacuating the error stream</span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rdr = <span class="keyword">new</span> BufferedReader(<span class="keyword">new</span> InputStreamReader(proc.getErrorStream()));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String line = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"><a title="Line 122: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 122: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">while</span> (rdr.ready() && (line = rdr.readLine()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.log(Level.WARNING, <span class="string">"Error from GrokAssembly: {0}"</span>, line);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> rdr = <span class="keyword">new</span> BufferedReader(<span class="keyword">new</span> InputStreamReader(proc.getErrorStream(), <span class="string">"UTF-8"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> String line = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"><a title="Line 122: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 122: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">while</span> (rdr.ready() && (line = rdr.readLine()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Error from GrokAssembly: {0}"</span>, line);</span></pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> rc = 0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Document doc = builder.parse(proc.getInputStream());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">int</span> rc = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Document doc = builder.parse(proc.getInputStream());</pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// First, see if there was an error</span></pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String error = xpath.evaluate(<span class="string">"/assembly/error"</span>, doc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"><a title="Line 131: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 131: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (error != <span class="keyword">null</span> && !<span class="string">""</span>.equals(error)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(error);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String error = xpath.evaluate(<span class="string">"/assembly/error"</span>, doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"><a title="Line 131: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 131: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (error != <span class="keyword">null</span> && !<span class="string">""</span>.equals(error)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(error);</pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String version = xpath.evaluate(<span class="string">"/assembly/version"</span>, doc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"><a title="Line 136: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 136: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="keyword">new</span> Evidence(<span class="string">"grokassembly"</span>, <span class="string">"version"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String version = xpath.evaluate(<span class="string">"/assembly/version"</span>, doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"><a title="Line 136: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 136: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (version != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.getVersionEvidence().addEvidence(<span class="keyword">new</span> Evidence(<span class="string">"grokassembly"</span>, <span class="string">"version"</span>,</pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> version, Confidence.HIGHEST));</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String vendor = xpath.evaluate(<span class="string">"/assembly/company"</span>, doc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"><a title="Line 142: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 142: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (vendor != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="keyword">new</span> Evidence(<span class="string">"grokassembly"</span>, <span class="string">"vendor"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String vendor = xpath.evaluate(<span class="string">"/assembly/company"</span>, doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"><a title="Line 142: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 142: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (vendor != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="keyword">new</span> Evidence(<span class="string">"grokassembly"</span>, <span class="string">"vendor"</span>,</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> vendor, Confidence.HIGH));</pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String product = xpath.evaluate(<span class="string">"/assembly/product"</span>, doc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"><a title="Line 148: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 148: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (product != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="keyword">new</span> Evidence(<span class="string">"grokassembly"</span>, <span class="string">"product"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String product = xpath.evaluate(<span class="string">"/assembly/product"</span>, doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"><a title="Line 148: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 148: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (product != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(<span class="keyword">new</span> Evidence(<span class="string">"grokassembly"</span>, <span class="string">"product"</span>,</pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> product, Confidence.HIGH));</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
@@ -286,17 +286,17 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rc = proc.waitFor();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> rc = proc.waitFor();</pre></td></tr>
<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ie) {</span></pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"><a title="Line 158: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 158: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (rc == 3) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.log(Level.INFO, <span class="string">"{0} is not a valid assembly"</span>, dependency.getActualFilePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"><a title="Line 158: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 158: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (rc == 3) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.INFO, <span class="string">"{0} is not a valid assembly"</span>, dependency.getActualFilePath());</span></pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (rc != 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.log(Level.WARNING, <span class="string">"Return code {0} from GrokAssembly"</span>, rc);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (rc != 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Return code {0} from GrokAssembly"</span>, rc);</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
@@ -311,18 +311,18 @@
<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(xpe);</span></pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"><a title="Line 173: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 173: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (rdr != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"><a title="Line 173: Conditional coverage 25% (2/8) [each condition: 0%, 0%, 50%, 50%]."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 173: Conditional coverage 25% (2/8) [each condition: 0%, 0%, 50%, 50%]."> <span class="keyword">if</span> (rdr != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rdr.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> rdr.close();</pre></td></tr>
<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AssemblyAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="string">"ignore"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="string">"ignore"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
@@ -339,45 +339,45 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initializeFileTypeAnalyzer() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File tempFile = File.createTempFile(<span class="string">"GKA"</span>, <span class="string">".exe"</span>, Settings.getTempDirectory());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FileOutputStream fos = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> InputStream is = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File tempFile = File.createTempFile(<span class="string">"GKA"</span>, <span class="string">".exe"</span>, Settings.getTempDirectory());</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> FileOutputStream fos = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> InputStream is = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fos = <span class="keyword">new</span> FileOutputStream(tempFile);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> is = AssemblyAnalyzer.<span class="keyword">class</span>.getClassLoader().getResourceAsStream(<span class="string">"GrokAssembly.exe"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span>[] buff = <span class="keyword">new</span> <span class="keyword">byte</span>[4096];</span></pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> bread = -1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"><a title="Line 198: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 198: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((bread = is.read(buff)) >= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fos.write(buff, 0, bread);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> fos = <span class="keyword">new</span> FileOutputStream(tempFile);</pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> is = AssemblyAnalyzer.<span class="keyword">class</span>.getClassLoader().getResourceAsStream(<span class="string">"GrokAssembly.exe"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">byte</span>[] buff = <span class="keyword">new</span> <span class="keyword">byte</span>[4096];</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">int</span> bread = -1;</pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"><a title="Line 198: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 198: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> ((bread = is.read(buff)) >= 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> fos.write(buff, 0, bread);</pre></td></tr>
<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> grokAssemblyExe = tempFile;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> grokAssemblyExe = tempFile;</pre></td></tr>
<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Set the temp file to get deleted when we're done</span></pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> grokAssemblyExe.deleteOnExit();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.log(Level.FINE, <span class="string">"Extracted GrokAssembly.exe to {0}"</span>, grokAssemblyExe.getPath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> grokAssemblyExe.deleteOnExit();</pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Extracted GrokAssembly.exe to {0}"</span>, grokAssemblyExe.getPath());</pre></td></tr>
<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ioe) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.log(Level.WARNING, <span class="string">"Could not extract GrokAssembly.exe: {0}"</span>, ioe.getMessage());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Could not extract GrokAssembly.exe: {0}"</span>, ioe.getMessage());</span></pre></td></tr>
<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Could not extract GrokAssembly.exe"</span>, ioe);</span></pre></td></tr>
<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (fos != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (fos != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fos.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> fos.close();</pre></td></tr>
<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.fine(<span class="string">"Error closing output stream"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(<span class="string">"Error closing output stream"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"><a title="Line 216: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 216: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (is != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"><a title="Line 216: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 216: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (is != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> is.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> is.close();</pre></td></tr>
<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.fine(<span class="string">"Error closing input stream"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(<span class="string">"Error closing input stream"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
@@ -386,152 +386,156 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Now, need to see if GrokAssembly actually runs from this location.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> args = buildArgumentList();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedReader rdr = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> args = buildArgumentList();</pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> BufferedReader rdr = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ProcessBuilder pb = <span class="keyword">new</span> ProcessBuilder(args);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Process p = pb.start();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ProcessBuilder pb = <span class="keyword">new</span> ProcessBuilder(args);</pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Process p = pb.start();</pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Try evacuating the error stream</span></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rdr = <span class="keyword">new</span> BufferedReader(<span class="keyword">new</span> InputStreamReader(p.getErrorStream()));</span></pre></td></tr>
-<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String line;</pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"><a title="Line 234: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 234: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">while</span> (rdr.ready() && (line = rdr.readLine()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> rdr = <span class="keyword">new</span> BufferedReader(<span class="keyword">new</span> InputStreamReader(p.getErrorStream(), <span class="string">"UTF-8"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"><a title="Line 233: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 233: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">while</span> (rdr.ready() && rdr.readLine() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// We expect this to complain</span></pre></td></tr>
-<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(p.getInputStream());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String error = xpath.evaluate(<span class="string">"/assembly/error"</span>, doc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"><a title="Line 240: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 240: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (p.waitFor() != 1 || error == <span class="keyword">null</span> || <span class="string">""</span>.equals(error)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.warning(<span class="string">"An error occured with the .NET AssemblyAnalyzer, please see the log for more details."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.fine(<span class="string">"GrokAssembly.exe is not working properly"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> grokAssemblyExe = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Could not execute .NET AssemblyAnalyzer"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(p.getInputStream());</pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String error = xpath.evaluate(<span class="string">"/assembly/error"</span>, doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"><a title="Line 239: Conditional coverage 50% (3/6) [each condition: 50%, 50%, 50%]."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 239: Conditional coverage 50% (3/6) [each condition: 50%, 50%, 50%]."> <span class="keyword">if</span> (p.waitFor() != 1 || error == <span class="keyword">null</span> || <span class="string">""</span>.equals(error)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.warning(<span class="string">"An error occurred with the .NET AssemblyAnalyzer, please see the log for more details."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(<span class="string">"GrokAssembly.exe is not working properly"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> grokAssemblyExe = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Could not execute .NET AssemblyAnalyzer"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.warning(<span class="string">"An error occured with the .NET AssemblyAnalyzer; "</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"><a title="Line 246: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 246: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (e <span class="keyword">instanceof</span> AnalysisException) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> (AnalysisException) e;</span></pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"this can be ignored unless you are scanning .NET dlls. Please see the log for more details."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.log(Level.FINE, <span class="string">"Could not execute GrokAssembly {0}"</span>, e.getMessage());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"An error occured with the .NET AssemblyAnalyzer"</span>, e);</span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"><a title="Line 252: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 252: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (rdr != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.warning(<span class="string">"An error occured with the .NET AssemblyAnalyzer; "</span></span></pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"this can be ignored unless you are scanning .NET DLLs. Please see the log for more details."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Could not execute GrokAssembly {0}"</span>, e.getMessage());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"An error occured with the .NET AssemblyAnalyzer"</span>, e);</span></pre></td></tr>
<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rdr.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(AssemblyAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="string">"ignore"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"><a title="Line 255: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 255: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (rdr != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> rdr.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="string">"ignore"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">super</span>.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();</pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"><a title="Line 268: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 268: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (grokAssemblyExe != <span class="keyword">null</span> && !grokAssemblyExe.delete()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> grokAssemblyExe.deleteOnExit();</span></pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() <span class="keyword">throws</span> Exception {</pre></td></tr>
+<tr> <td class="numLineCover"> 269</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">super</span>.close();</pre></td></tr>
<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"><a title="Line 271: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 6</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 271: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (grokAssemblyExe != <span class="keyword">null</span> && !grokAssemblyExe.delete()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> grokAssemblyExe.deleteOnExit();</span></pre></td></tr>
+<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SecurityException se) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOG.fine(<span class="string">"Can't delete temporary GrokAssembly.exe"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the set of extensions supported by this analyzer.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SecurityException se) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(<span class="string">"Can't delete temporary GrokAssembly.exe"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the list of supported extensions</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the set of extensions supported by this analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> SUPORTED_EXTENSIONS;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the list of supported extensions</span></pre></td></tr>
+<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsCovered"> 853</td> <td class="src"><pre class="src"> <span class="keyword">return</span> SUPPORTED_EXTENSIONS;</pre></td></tr>
<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets this analyzer's name.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the analyzer name</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets this analyzer's name.</span></pre></td></tr>
<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the analyzer name</span></pre></td></tr>
+<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the phase this analyzer runs under.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the phase this runs under</span></pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
-<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the key used in the properties file to reference the analyzer's enabled property.</span></pre></td></tr>
-<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the phase this analyzer runs under.</span></pre></td></tr>
+<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the analyzer's enabled property setting key</span></pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the phase this runs under</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> String getAnalyzerEnabledSettingKey() {</pre></td></tr>
-<tr> <td class="numLineCover"> 313</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED;</span></pre></td></tr>
-<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the key used in the properties file to reference the analyzer's enabled property.</span></pre></td></tr>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the analyzer's enabled property setting key</span></pre></td></tr>
+<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> String getAnalyzerEnabledSettingKey() {</pre></td></tr>
+<tr> <td class="numLineCover"> 316</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED;</pre></td></tr>
+<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 0e027591c..ef5569a4c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
@@ -12,9 +12,9 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/193</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/126</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierConfidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierMatch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">171/194</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">75%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">95/126</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierConfidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">3/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CPEAnalyzer.html">CPEAnalyzer$IdentifierMatch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">40%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:40px"><span class="text">12/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">4/24</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.428571428571429;</span>4.429</td></tr>
</table>
<div class="separator"> </div>
@@ -138,1161 +138,1166 @@
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> CPEAnalyzer <span class="keyword">implements</span> Analyzer {</pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The maximum number of query results to return.</span></pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(CPEAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> MAX_QUERY_RESULTS = 25;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The maximum number of query results to return.</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The weighting boost to give terms when constructing the Lucene query.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> MAX_QUERY_RESULTS = 25;</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String WEIGHTING_BOOST = <span class="string">"^5"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The weighting boost to give terms when constructing the Lucene query.</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A string representation of a regular expression defining characters utilized within the CPE Names.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String WEIGHTING_BOOST = <span class="string">"^5"</span>;</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String CLEANSE_CHARACTER_RX = <span class="string">"[^A-Za-z0-9 ._-]"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A string representation of a regular expression defining characters utilized within the CPE Names.</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A string representation of a regular expression used to remove all but alpha characters.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String CLEANSE_CHARACTER_RX = <span class="string">"[^A-Za-z0-9 ._-]"</span>;</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String CLEANSE_NONALPHA_RX = <span class="string">"[^A-Za-z]*"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A string representation of a regular expression used to remove all but alpha characters.</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The additional size to add to a new StringBuilder to account for extra data that will be written into the string.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String CLEANSE_NONALPHA_RX = <span class="string">"[^A-Za-z]*"</span>;</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> STRING_BUILDER_BUFFER = 20;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The additional size to add to a new StringBuilder to account for extra data that will be written into the string.</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The CPE in memory index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> STRING_BUILDER_BUFFER = 20;</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> CpeMemoryIndex cpe;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The CPE in memory index.</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The CVE Database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> CpeMemoryIndex cpe;</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cve;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The CVE Database.</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the name of this analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cve;</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the name of this analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the name of this analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"CPE Analyzer"</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the name of this analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"CPE Analyzer"</span>;</pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the analysis phase that this analyzer should run in.</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the analysis phase that this analyzer should run in.</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> AnalysisPhase.IDENTIFIER_ANALYSIS;</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the analysis phase that this analyzer should run in.</span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the analysis phase that this analyzer should run in.</span></pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> AnalysisPhase.IDENTIFIER_ANALYSIS;</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates the CPE Lucene Index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an issue opening the index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates the CPE Lucene Index.</span></pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.open();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Opens the data source.</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the Lucene directory to be queried does not exist or is corrupt.</span></pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException when the database throws an exception. This usually occurs when the database is in use</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * by another process.</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an issue opening the index.</span></pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> open() <span class="keyword">throws</span> IOException, DatabaseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CPEAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Opening the CVE Database"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve = <span class="keyword">new</span> CveDB();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.open();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CPEAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Creating the Lucene CPE Index"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe = CpeMemoryIndex.getInstance();</span></pre></td></tr>
-<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe.open(cve);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IndexException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CPEAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"IndexException"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Closes the data sources.</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.open();</pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Opens the data source.</span></pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the Lucene directory to be queried does not exist or is corrupt.</span></pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException when the database throws an exception. This usually occurs when the database is in use</span></pre></td></tr>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * by another process.</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> open() <span class="keyword">throws</span> IOException, DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Opening the CVE Database"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cve = <span class="keyword">new</span> CveDB();</pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cve.open();</pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Creating the Lucene CPE Index"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cpe = CpeMemoryIndex.getInstance();</pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cpe.open(cve);</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IndexException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"IndexException"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() {</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"><a title="Line 146: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 146: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cpe != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe.close();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Closes the data sources.</span></pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"><a title="Line 149: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 149: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cve != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve.close();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() {</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"><a title="Line 149: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 149: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (cpe != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cpe.close();</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"><a title="Line 152: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 152: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (cve != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cve.close();</pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Searches the data store of CPE entries, trying to identify the CPE for the given dependency based on the evidence</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * contained within. The dependency passed in is updated with any identified CPE values.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to search for CPE entries on.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Searches the data store of CPE entries, trying to identify the CPE for the given dependency based on the evidence</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException is thrown when the Lucene index is corrupt.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * contained within. The dependency passed in is updated with any identified CPE values.</span></pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when an IOException occurs.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws ParseException is thrown when the Lucene query cannot be parsed.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to search for CPE entries on.</span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException is thrown when the Lucene index is corrupt.</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> determineCPE(Dependency dependency) <span class="keyword">throws</span> CorruptIndexException, IOException, ParseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Confidence confidence = Confidence.HIGHEST;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when an IOException occurs.</span></pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws ParseException is thrown when the Lucene query cannot be parsed.</span></pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String vendors = addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getVendorEvidence(), confidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String products = addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getProductEvidence(), confidence);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> determineCPE(Dependency dependency) <span class="keyword">throws</span> CorruptIndexException, IOException, ParseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Confidence confidence = Confidence.HIGHEST;</pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/* bug fix for #40 - version evidence is not showing up as "used" in the reports if there is no</span></pre></td></tr>
-<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * CPE identified. As such, we are "using" the evidence and ignoring the results. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getVersionEvidence(), confidence);</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String vendors = addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getVendorEvidence(), confidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String products = addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getProductEvidence(), confidence);</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/* bug fix for #40 - version evidence is not showing up as "used" in the reports if there is no</span></pre></td></tr>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * CPE identified. As such, we are "using" the evidence and ignoring the results. */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getVersionEvidence(), confidence);</pre></td></tr>
+<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> ctr = 0;</span></pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">do</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"><a title="Line 174: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 174: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (!vendors.isEmpty() && !products.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<IndexEntry> entries = searchCPE(vendors, products, dependency.getProductEvidence().getWeighting(),</span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">int</span> ctr = 0;</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">do</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"><a title="Line 177: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 177: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (!vendors.isEmpty() && !products.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<IndexEntry> entries = searchCPE(vendors, products, dependency.getProductEvidence().getWeighting(),</pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> dependency.getVendorEvidence().getWeighting());</pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"><a title="Line 178: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 178: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (IndexEntry e : entries) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (verifyEntry(e, dependency)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String vendor = e.getVendor();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String product = e.getProduct();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> determineIdentifiers(dependency, vendor, product);</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"><a title="Line 181: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 181: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (IndexEntry e : entries) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"><a title="Line 182: Conditional coverage 100% (2/2)."> 54</a></td> <td class="src"><pre class="src"> <a title="Line 182: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (verifyEntry(e, dependency)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String vendor = e.getVendor();</pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String product = e.getProduct();</pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> determineIdentifiers(dependency, vendor, product);</pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> confidence = reduceConfidence(confidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"><a title="Line 187: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 187: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dependency.getVendorEvidence().contains(confidence)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendors = addEvidenceWithoutDuplicateTerms(vendors, dependency.getVendorEvidence(), confidence);</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"><a title="Line 190: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 190: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dependency.getProductEvidence().contains(confidence)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> products = addEvidenceWithoutDuplicateTerms(products, dependency.getProductEvidence(), confidence);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> confidence = reduceConfidence(confidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"><a title="Line 190: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 190: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (dependency.getVendorEvidence().contains(confidence)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> vendors = addEvidenceWithoutDuplicateTerms(vendors, dependency.getVendorEvidence(), confidence);</pre></td></tr>
<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"><a title="Line 193: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 193: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (dependency.getProductEvidence().contains(confidence)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> products = addEvidenceWithoutDuplicateTerms(products, dependency.getProductEvidence(), confidence);</pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/* bug fix for #40 - version evidence is not showing up as "used" in the reports if there is no</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * CPE identified. As such, we are "using" the evidence and ignoring the results. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"><a title="Line 195: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 195: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dependency.getVersionEvidence().contains(confidence)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getVersionEvidence(), confidence);</span></pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"><a title="Line 198: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 198: Conditional coverage 0% (0/2)."> } <span class="keyword">while</span> ((++ctr) < 4);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * CPE identified. As such, we are "using" the evidence and ignoring the results. */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"><a title="Line 198: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 198: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (dependency.getVersionEvidence().contains(confidence)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> addEvidenceWithoutDuplicateTerms(<span class="string">""</span>, dependency.getVersionEvidence(), confidence);</pre></td></tr>
<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the text created by concatenating the text and the values from the EvidenceCollection (filtered for a</span></pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * specific confidence). This attempts to prevent duplicate terms from being added.<br/<br/> Note, if the evidence</span></pre></td></tr>
-<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * is longer then 200 characters it will be truncated.</span></pre></td></tr>
-<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param text the base text.</span></pre></td></tr>
-<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ec an EvidenceCollection</span></pre></td></tr>
-<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param confidenceFilter a Confidence level to filter the evidence by.</span></pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the new evidence text</span></pre></td></tr>
-<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String addEvidenceWithoutDuplicateTerms(<span class="keyword">final</span> String text, <span class="keyword">final</span> EvidenceCollection ec, Confidence confidenceFilter) {</pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"><a title="Line 212: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 212: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> String txt = (text == <span class="keyword">null</span>) ? <span class="string">""</span> : text;</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(txt.length() + (20 * ec.size()));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">' '</span>).append(txt).append(<span class="string">' '</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"><a title="Line 215: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 215: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : ec.iterator(confidenceFilter)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String value = e.getValue();</span></pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//hack to get around the fact that lucene does a really good job of recognizing domains and not</span></pre></td></tr>
-<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// splitting them. TODO - put together a better lucene analyzer specific to the domain.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"><a title="Line 220: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 220: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value.startsWith(<span class="string">"http://"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = value.substring(7).replaceAll(<span class="string">"\\."</span>, <span class="string">" "</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value.startsWith(<span class="string">"https://"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = value.substring(8).replaceAll(<span class="string">"\\."</span>, <span class="string">" "</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"><a title="Line 201: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 201: Conditional coverage 100% (2/2)."> } <span class="keyword">while</span> ((++ctr) < 4);</a></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the text created by concatenating the text and the values from the EvidenceCollection (filtered for a</span></pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * specific confidence). This attempts to prevent duplicate terms from being added.<br/<br/> Note, if the evidence</span></pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * is longer then 200 characters it will be truncated.</span></pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param text the base text.</span></pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ec an EvidenceCollection</span></pre></td></tr>
+<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param confidenceFilter a Confidence level to filter the evidence by.</span></pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the new evidence text</span></pre></td></tr>
+<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String addEvidenceWithoutDuplicateTerms(<span class="keyword">final</span> String text, <span class="keyword">final</span> EvidenceCollection ec, Confidence confidenceFilter) {</pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"><a title="Line 215: Conditional coverage 50% (1/2)."> 27</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 215: Conditional coverage 50% (1/2)."> <span class="keyword">final</span> String txt = (text == <span class="keyword">null</span>) ? <span class="string">""</span> : text;</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(txt.length() + (20 * ec.size()));</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> sb.append(<span class="string">' '</span>).append(txt).append(<span class="string">' '</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"><a title="Line 218: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 218: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Evidence e : ec.iterator(confidenceFilter)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 76</td> <td class="src"><pre class="src"> String value = e.getValue();</pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//hack to get around the fact that lucene does a really good job of recognizing domains and not</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// splitting them. TODO - put together a better lucene analyzer specific to the domain.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"><a title="Line 223: Conditional coverage 100% (2/2)."> 76</a></td> <td class="src"><pre class="src"> <a title="Line 223: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (value.startsWith(<span class="string">"http://"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> value = value.substring(7).replaceAll(<span class="string">"\\."</span>, <span class="string">" "</span>);</pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"><a title="Line 226: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 226: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (sb.indexOf(<span class="string">" "</span> + value + <span class="string">" "</span>) < 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(value).append(<span class="string">' '</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"><a title="Line 226: Conditional coverage 50% (1/2)."> 76</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 226: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (value.startsWith(<span class="string">"https://"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = value.substring(8).replaceAll(<span class="string">"\\."</span>, <span class="string">" "</span>);</span></pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> sb.toString().trim();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"><a title="Line 229: Conditional coverage 100% (2/2)."> 76</a></td> <td class="src"><pre class="src"> <a title="Line 229: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (sb.indexOf(<span class="string">" "</span> + value + <span class="string">" "</span>) < 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 48</td> <td class="src"><pre class="src"> sb.append(value).append(<span class="string">' '</span>);</pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Reduces the given confidence by one level. This returns LOW if the confidence passed in is not HIGH.</span></pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param c the confidence to reduce.</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return One less then the confidence passed in.</span></pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Confidence reduceConfidence(<span class="keyword">final</span> Confidence c) {</pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"><a title="Line 240: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 240: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (c == Confidence.HIGHEST) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Confidence.HIGH;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"><a title="Line 242: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 242: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (c == Confidence.HIGH) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Confidence.MEDIUM;</span></pre></td></tr>
-<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Confidence.LOW;</span></pre></td></tr>
-<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Searches the Lucene CPE index to identify possible CPE entries associated with the supplied vendor, product, and</span></pre></td></tr>
-<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * version.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * If either the vendorWeightings or productWeightings lists have been populated this data is used to add weighting</span></pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * factors to the search.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vendor the text used to search the vendor field</span></pre></td></tr>
-<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param product the text used to search the product field</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vendorWeightings a list of strings to use to add weighting factors to the vendor field</span></pre></td></tr>
-<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param productWeightings Adds a list of strings that will be used to add weighting factors to the product search</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a list of possible CPE values</span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException when the Lucene index is corrupt</span></pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the Lucene index is not found</span></pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws ParseException when the generated query is not valid</span></pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> List<IndexEntry> searchCPE(String vendor, String product,</pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Set<String> vendorWeightings, Set<String> productWeightings)</pre></td></tr>
-<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> CorruptIndexException, IOException, ParseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<IndexEntry> ret = <span class="keyword">new</span> ArrayList<IndexEntry>(MAX_QUERY_RESULTS);</span></pre></td></tr>
-<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String searchString = buildSearch(vendor, product, vendorWeightings, productWeightings);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"><a title="Line 273: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 273: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (searchString == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
-<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"><a title="Line 278: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 278: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (ScoreDoc d : docs.scoreDocs) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"><a title="Line 279: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 279: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (d.score >= 0.08) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Document doc = cpe.getDocument(d.doc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IndexEntry entry = <span class="keyword">new</span> IndexEntry();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setVendor(doc.get(Fields.VENDOR));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setProduct(doc.get(Fields.PRODUCT));</span></pre></td></tr>
-<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// if (d.score < 0.08) {</span></pre></td></tr>
-<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// System.out.print(entry.getVendor());</span></pre></td></tr>
-<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// System.out.print(":");</span></pre></td></tr>
-<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// System.out.print(entry.getProduct());</span></pre></td></tr>
-<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// System.out.print(":");</span></pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// System.out.println(d.score);</span></pre></td></tr>
-<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setSearchScore(d.score);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"><a title="Line 292: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 292: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!ret.contains(entry)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.add(entry);</span></pre></td></tr>
-<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
-<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 76</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> <span class="keyword">return</span> sb.toString().trim();</pre></td></tr>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Builds a Lucene search string by properly escaping data and constructing a valid search query.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Reduces the given confidence by one level. This returns LOW if the confidence passed in is not HIGH.</span></pre></td></tr>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param c the confidence to reduce.</span></pre></td></tr>
+<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return One less then the confidence passed in.</span></pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Confidence reduceConfidence(<span class="keyword">final</span> Confidence c) {</pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"><a title="Line 243: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 243: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (c == Confidence.HIGHEST) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Confidence.HIGH;</pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"><a title="Line 245: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 245: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (c == Confidence.HIGH) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Confidence.MEDIUM;</pre></td></tr>
+<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Confidence.LOW;</pre></td></tr>
+<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Searches the Lucene CPE index to identify possible CPE entries associated with the supplied vendor, product, and</span></pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * version.</p></span></pre></td></tr>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * If either the vendorWeightings or productWeightings lists have been populated this data is used to add weighting</span></pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * factors to the search.</p></span></pre></td></tr>
+<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vendor the text used to search the vendor field</span></pre></td></tr>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param product the text used to search the product field</span></pre></td></tr>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vendorWeightings a list of strings to use to add weighting factors to the vendor field</span></pre></td></tr>
+<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param productWeightings Adds a list of strings that will be used to add weighting factors to the product search</span></pre></td></tr>
+<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a list of possible CPE values</span></pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException when the Lucene index is corrupt</span></pre></td></tr>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the Lucene index is not found</span></pre></td></tr>
+<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws ParseException when the generated query is not valid</span></pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> List<IndexEntry> searchCPE(String vendor, String product,</pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Set<String> vendorWeightings, Set<String> productWeightings)</pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> CorruptIndexException, IOException, ParseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<IndexEntry> ret = <span class="keyword">new</span> ArrayList<IndexEntry>(MAX_QUERY_RESULTS);</pre></td></tr>
+<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String searchString = buildSearch(vendor, product, vendorWeightings, productWeightings);</pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"><a title="Line 276: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 276: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (searchString == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
+<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 280</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);</pre></td></tr>
+<tr> <td class="numLineCover"> 281</td> <td class="nbHitsCovered"><a title="Line 281: Conditional coverage 100% (2/2)."> 208</a></td> <td class="src"><pre class="src"> <a title="Line 281: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (ScoreDoc d : docs.scoreDocs) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 282</td> <td class="nbHitsCovered"><a title="Line 282: Conditional coverage 100% (2/2)."> 200</a></td> <td class="src"><pre class="src"> <a title="Line 282: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (d.score >= 0.08) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Document doc = cpe.getDocument(d.doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 284</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">final</span> IndexEntry entry = <span class="keyword">new</span> IndexEntry();</pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> entry.setVendor(doc.get(Fields.VENDOR));</pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> entry.setProduct(doc.get(Fields.PRODUCT));</pre></td></tr>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// if (d.score < 0.08) {</span></pre></td></tr>
+<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// System.out.print(entry.getVendor());</span></pre></td></tr>
+<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// System.out.print(":");</span></pre></td></tr>
+<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// System.out.print(entry.getProduct());</span></pre></td></tr>
+<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// System.out.print(":");</span></pre></td></tr>
+<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// System.out.println(d.score);</span></pre></td></tr>
+<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> entry.setSearchScore(d.score);</pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"><a title="Line 295: Conditional coverage 50% (1/2)."> 54</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 295: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!ret.contains(entry)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> ret.add(entry);</pre></td></tr>
+<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ret;</pre></td></tr>
+<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * If either the possibleVendor or possibleProducts lists have been populated this data is used to add weighting</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Builds a Lucene search string by properly escaping data and constructing a valid search query.</p></span></pre></td></tr>
<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * factors to the search string generated.</p></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vendor text to search the vendor field</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * If either the possibleVendor or possibleProducts lists have been populated this data is used to add weighting</span></pre></td></tr>
<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param product text to search the product field</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * factors to the search string generated.</p></span></pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vendorWeighting a list of strings to apply to the vendor to boost the terms weight</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param productWeightings a list of strings to apply to the product to boost the terms weight</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vendor text to search the vendor field</span></pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the Lucene query</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param product text to search the product field</span></pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vendorWeighting a list of strings to apply to the vendor to boost the terms weight</span></pre></td></tr>
<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> String buildSearch(String vendor, String product,</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param productWeightings a list of strings to apply to the product to boost the terms weight</span></pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the Lucene query</span></pre></td></tr>
+<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> String buildSearch(String vendor, String product,</pre></td></tr>
+<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Set<String> vendorWeighting, Set<String> productWeightings) {</pre></td></tr>
-<tr> <td class="numLineCover"> 316</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String v = vendor; <span class="comment">//.replaceAll("[^\\w\\d]", " ");</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String p = product; <span class="comment">//.replaceAll("[^\\w\\d]", " ");</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 318</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(v.length() + p.length()</span></pre></td></tr>
-<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 319</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String v = vendor; <span class="comment">//.replaceAll("[^\\w\\d]", " ");</span></pre></td></tr>
+<tr> <td class="numLineCover"> 320</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String p = product; <span class="comment">//.replaceAll("[^\\w\\d]", " ");</span></pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(v.length() + p.length()</pre></td></tr>
+<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + Fields.PRODUCT.length() + Fields.VENDOR.length() + STRING_BUILDER_BUFFER);</pre></td></tr>
-<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 321</td> <td class="nbHitsUncovered"><a title="Line 321: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 321: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!appendWeightedSearch(sb, Fields.PRODUCT, p, productWeightings)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"><a title="Line 324: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 324: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!appendWeightedSearch(sb, Fields.PRODUCT, p, productWeightings)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">" AND "</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"><a title="Line 325: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 325: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!appendWeightedSearch(sb, Fields.VENDOR, v, vendorWeighting)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> sb.toString();</span></pre></td></tr>
-<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 327</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> sb.append(<span class="string">" AND "</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"><a title="Line 328: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 328: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!appendWeightedSearch(sb, Fields.VENDOR, v, vendorWeighting)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 331</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">return</span> sb.toString();</pre></td></tr>
<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This method constructs a Lucene query for a given field. The searchText is split into separate words and if the</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * word is within the list of weighted words then an additional weighting is applied to the term as it is appended</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * into the query.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * This method constructs a Lucene query for a given field. The searchText is split into separate words and if the</span></pre></td></tr>
<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param sb a StringBuilder that the query text will be appended to.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * word is within the list of weighted words then an additional weighting is applied to the term as it is appended</span></pre></td></tr>
<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param field the field within the Lucene index that the query is searching.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * into the query.</span></pre></td></tr>
<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param searchText text used to construct the query.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param weightedText a list of terms that will be considered higher importance when searching.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param sb a StringBuilder that the query text will be appended to.</span></pre></td></tr>
<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return if the append was successful.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param field the field within the Lucene index that the query is searching.</span></pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param searchText text used to construct the query.</span></pre></td></tr>
<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> appendWeightedSearch(StringBuilder sb, String field, String searchText, Set<String> weightedText) {</pre></td></tr>
-<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">" "</span>).append(field).append(<span class="string">":( "</span>);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param weightedText a list of terms that will be considered higher importance when searching.</span></pre></td></tr>
+<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return if the append was successful.</span></pre></td></tr>
<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> appendWeightedSearch(StringBuilder sb, String field, String searchText, Set<String> weightedText) {</pre></td></tr>
+<tr> <td class="numLineCover"> 346</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> sb.append(<span class="string">" "</span>).append(field).append(<span class="string">":( "</span>);</pre></td></tr>
+<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 345</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cleanText = cleanseText(searchText);</span></pre></td></tr>
-<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 347</td> <td class="nbHitsUncovered"><a title="Line 347: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 347: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">""</span>.equals(cleanText)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 348</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 348</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String cleanText = cleanseText(searchText);</pre></td></tr>
<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"><a title="Line 351: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 351: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (weightedText == <span class="keyword">null</span> || weightedText.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LuceneUtils.appendEscapedLuceneQuery(sb, cleanText);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 350</td> <td class="nbHitsUncovered"><a title="Line 350: Conditional coverage 50% (1/2)."> 16</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 350: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">""</span>.equals(cleanText)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"><a title="Line 354: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 16</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 354: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (weightedText == <span class="keyword">null</span> || weightedText.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 355</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LuceneUtils.appendEscapedLuceneQuery(sb, cleanText);</span></pre></td></tr>
+<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringTokenizer tokens = <span class="keyword">new</span> StringTokenizer(cleanText);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 355</td> <td class="nbHitsUncovered"><a title="Line 355: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 355: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (tokens.hasMoreElements()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String word = tokens.nextToken();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String temp = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"><a title="Line 358: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 358: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String weighted : weightedText) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 359</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String weightedStr = cleanseText(weighted);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 360</td> <td class="nbHitsUncovered"><a title="Line 360: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 360: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 362</td> <td class="nbHitsUncovered"><a title="Line 362: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 362: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!word.equalsIgnoreCase(weightedStr)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 363</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> temp += <span class="string">" "</span> + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;</span></pre></td></tr>
-<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 357</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringTokenizer tokens = <span class="keyword">new</span> StringTokenizer(cleanText);</pre></td></tr>
+<tr> <td class="numLineCover"> 358</td> <td class="nbHitsCovered"><a title="Line 358: Conditional coverage 100% (2/2)."> 240</a></td> <td class="src"><pre class="src"> <a title="Line 358: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (tokens.hasMoreElements()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 224</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String word = tokens.nextToken();</pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsCovered"> 224</td> <td class="src"><pre class="src"> String temp = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 361</td> <td class="nbHitsCovered"><a title="Line 361: Conditional coverage 100% (2/2)."> 224</a></td> <td class="src"><pre class="src"> <a title="Line 361: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String weighted : weightedText) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 362</td> <td class="nbHitsCovered"> 408</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String weightedStr = cleanseText(weighted);</pre></td></tr>
+<tr> <td class="numLineCover"> 363</td> <td class="nbHitsCovered"><a title="Line 363: Conditional coverage 100% (2/2)."> 408</a></td> <td class="src"><pre class="src"> <a title="Line 363: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 364</td> <td class="nbHitsCovered"> 30</td> <td class="src"><pre class="src"> temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;</pre></td></tr>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsUncovered"><a title="Line 365: Conditional coverage 50% (1/2)."> 30</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 365: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!word.equalsIgnoreCase(weightedStr)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> temp += <span class="string">" "</span> + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;</span></pre></td></tr>
+<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 367</td> <td class="nbHitsUncovered"><a title="Line 367: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 367: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (temp == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> temp = LuceneUtils.escapeLuceneQuery(word);</span></pre></td></tr>
-<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">" "</span>).append(temp);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 371</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"> 408</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"><a title="Line 370: Conditional coverage 100% (2/2)."> 224</a></td> <td class="src"><pre class="src"> <a title="Line 370: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (temp == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 371</td> <td class="nbHitsCovered"> 194</td> <td class="src"><pre class="src"> temp = LuceneUtils.escapeLuceneQuery(word);</pre></td></tr>
<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 373</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">" ) "</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 374</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 373</td> <td class="nbHitsCovered"> 224</td> <td class="src"><pre class="src"> sb.append(<span class="string">" "</span>).append(temp);</pre></td></tr>
+<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 224</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 376</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> sb.append(<span class="string">" ) "</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 377</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Removes characters from the input text that are not used within the CPE index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param text is the text to remove the characters from.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the text having removed some characters.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Removes characters from the input text that are not used within the CPE index.</span></pre></td></tr>
<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String cleanseText(String text) {</pre></td></tr>
-<tr> <td class="numLineCover"> 384</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> text.replaceAll(CLEANSE_CHARACTER_RX, <span class="string">" "</span>);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param text is the text to remove the characters from.</span></pre></td></tr>
+<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the text having removed some characters.</span></pre></td></tr>
<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String cleanseText(String text) {</pre></td></tr>
+<tr> <td class="numLineCover"> 387</td> <td class="nbHitsCovered"> 424</td> <td class="src"><pre class="src"> <span class="keyword">return</span> text.replaceAll(CLEANSE_CHARACTER_RX, <span class="string">" "</span>);</pre></td></tr>
<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Compares two strings after lower casing them and removing the non-alpha characters.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param l string one to compare.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param r string two to compare.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Compares two strings after lower casing them and removing the non-alpha characters.</span></pre></td></tr>
<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the two strings are similar.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param l string one to compare.</span></pre></td></tr>
<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> equalsIgnoreCaseAndNonAlpha(String l, String r) {</pre></td></tr>
-<tr> <td class="numLineCover"> 395</td> <td class="nbHitsUncovered"><a title="Line 395: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 395: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (l == <span class="keyword">null</span> || r == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 396</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param r string two to compare.</span></pre></td></tr>
+<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the two strings are similar.</span></pre></td></tr>
+<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> equalsIgnoreCaseAndNonAlpha(String l, String r) {</pre></td></tr>
+<tr> <td class="numLineCover"> 398</td> <td class="nbHitsUncovered"><a title="Line 398: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 408</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 398: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (l == <span class="keyword">null</span> || r == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 399</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 401</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 399</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String left = l.replaceAll(CLEANSE_NONALPHA_RX, <span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 400</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String right = r.replaceAll(CLEANSE_NONALPHA_RX, <span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 401</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> left.equalsIgnoreCase(right);</span></pre></td></tr>
-<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover"> 402</td> <td class="nbHitsCovered"> 408</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String left = l.replaceAll(CLEANSE_NONALPHA_RX, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 403</td> <td class="nbHitsCovered"> 408</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String right = r.replaceAll(CLEANSE_NONALPHA_RX, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 404</td> <td class="nbHitsCovered"> 408</td> <td class="src"><pre class="src"> <span class="keyword">return</span> left.equalsIgnoreCase(right);</pre></td></tr>
<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Ensures that the CPE Identified matches the dependency. This validates that the product, vendor, and version</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * information for the CPE are contained within the dependencies evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param entry a CPE entry.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Ensures that the CPE Identified matches the dependency. This validates that the product, vendor, and version</span></pre></td></tr>
<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency that the CPE entries could be for.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * information for the CPE are contained within the dependencies evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the entry is valid.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param entry a CPE entry.</span></pre></td></tr>
<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> verifyEntry(<span class="keyword">final</span> IndexEntry entry, <span class="keyword">final</span> Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 413</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> isValid = <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency that the CPE entries could be for.</span></pre></td></tr>
+<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the entry is valid.</span></pre></td></tr>
<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsUncovered"><a title="Line 415: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 415: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())</a></span></pre></td></tr>
-<tr> <td class="numLine"> 416</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> verifyEntry(<span class="keyword">final</span> IndexEntry entry, <span class="keyword">final</span> Dependency dependency) {</pre></td></tr>
+<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> isValid = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//&& collectionContainsVersion(dependency.getVersionEvidence(), entry.getVersion())</span></pre></td></tr>
-<tr> <td class="numLineCover"> 418</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> isValid = <span class="keyword">true</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 418</td> <td class="nbHitsCovered"><a title="Line 418: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 54</a></td> <td class="src"><pre class="src"> <a title="Line 418: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())</a></pre></td></tr>
<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 420</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> isValid;</span></pre></td></tr>
-<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> && collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {</pre></td></tr>
+<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//&& collectionContainsVersion(dependency.getVersionEvidence(), entry.getVersion())</span></pre></td></tr>
+<tr> <td class="numLineCover"> 421</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> isValid = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 423</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">return</span> isValid;</pre></td></tr>
<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to determine if the EvidenceCollection contains a specific string.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 425</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 426</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ec an EvidenceCollection</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 427</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param text the text to search for</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to determine if the EvidenceCollection contains a specific string.</span></pre></td></tr>
<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the EvidenceCollection contains the string</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ec an EvidenceCollection</span></pre></td></tr>
<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> collectionContainsString(EvidenceCollection ec, String text) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param text the text to search for</span></pre></td></tr>
<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the EvidenceCollection contains the string</span></pre></td></tr>
<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="This code fold contains an old version of the code, delete once more testing is done"></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// String[] splitText = text.split("[\\s_-]");</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> collectionContainsString(EvidenceCollection ec, String text) {</pre></td></tr>
<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// for (String search : splitText) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="This code fold contains an old version of the code, delete once more testing is done"></span></pre></td></tr>
<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// //final String search = text.replaceAll("[\\s_-]", "").toLowerCase();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// String[] splitText = text.split("[\\s_-]");</span></pre></td></tr>
<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// if (ec.containsUsedString(search)) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//</span></pre></td></tr>
<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// return true;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// for (String search : splitText) {</span></pre></td></tr>
<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// //final String search = text.replaceAll("[\\s_-]", "").toLowerCase();</span></pre></td></tr>
<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// if (ec.containsUsedString(search)) {</span></pre></td></tr>
<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// return true;</span></pre></td></tr>
<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//TODO - likely need to change the split... not sure if this will work for CPE with special chars</span></pre></td></tr>
-<tr> <td class="numLineCover"> 443</td> <td class="nbHitsUncovered"><a title="Line 443: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 443: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 444</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 446</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] words = text.split(<span class="string">"[\\s_-]"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 447</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> list = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 448</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String tempWord = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 449</td> <td class="nbHitsUncovered"><a title="Line 449: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 449: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String word : words) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 450</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/*</span></pre></td></tr>
-<tr> <td class="numLine"> 451</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> single letter words should be concatenated with the next word.</span></pre></td></tr>
-<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> so { "m", "core", "sample" } -> { "mcore", "sample" }</span></pre></td></tr>
-<tr> <td class="numLine"> 453</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 454</td> <td class="nbHitsUncovered"><a title="Line 454: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 454: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tempWord != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 455</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> list.add(tempWord + word);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 456</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tempWord = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 457</td> <td class="nbHitsUncovered"><a title="Line 457: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 457: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (word.length() <= 2) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 458</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tempWord = word;</span></pre></td></tr>
-<tr> <td class="numLine"> 459</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 460</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> list.add(word);</span></pre></td></tr>
-<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 463</td> <td class="nbHitsUncovered"><a title="Line 463: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 463: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (tempWord != <span class="keyword">null</span> && !list.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 464</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String tmp = list.get(list.size() - 1) + tempWord;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 465</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> list.add(tmp);</span></pre></td></tr>
-<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 467</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> contains = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 468</td> <td class="nbHitsUncovered"><a title="Line 468: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 468: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String word : list) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 469</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> contains &= ec.containsUsedString(word);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 470</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 471</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> contains;</span></pre></td></tr>
-<tr> <td class="numLine"> 472</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Analyzes a dependency and attempts to determine if there are any CPE identifiers for this dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency The Dependency to analyze.</span></pre></td></tr>
-<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param engine The analysis engine</span></pre></td></tr>
-<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException is thrown if there is an issue analyzing the dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 484</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> determineCPE(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 485</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 486</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"CPE Index is corrupt."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 487</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 488</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Failure opening the CPE Index."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 489</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Unable to parse the generated Lucene query for this dependency."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 491</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 492</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 493</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 494</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 495</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieves a list of CPE values from the CveDB based on the vendor and product passed in. The list is then</span></pre></td></tr>
-<tr> <td class="numLine"> 496</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * validated to find only CPEs that are valid for the given dependency. It is possible that the CPE identified is a</span></pre></td></tr>
-<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * best effort "guess" based on the vendor, product, and version information.</span></pre></td></tr>
-<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the Dependency being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vendor the vendor for the CPE being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param product the product for the CPE being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UnsupportedEncodingException is thrown if UTF-8 is not supported</span></pre></td></tr>
-<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 504</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> determineIdentifiers(Dependency dependency, String vendor, String product) <span class="keyword">throws</span> UnsupportedEncodingException {</pre></td></tr>
-<tr> <td class="numLineCover"> 505</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<VulnerableSoftware> cpes = cve.getCPEs(vendor, product);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 506</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DependencyVersion bestGuess = <span class="keyword">new</span> DependencyVersion(<span class="string">"-"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 507</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Confidence bestGuessConf = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 508</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<IdentifierMatch> collected = <span class="keyword">new</span> ArrayList<IdentifierMatch>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 509</td> <td class="nbHitsUncovered"><a title="Line 509: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 509: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Confidence conf : Confidence.values()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 510</td> <td class="nbHitsUncovered"><a title="Line 510: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 510: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence evidence : dependency.getVersionEvidence().iterator(conf)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 511</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion evVer = DependencyVersionUtil.parseVersion(evidence.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 512</td> <td class="nbHitsUncovered"><a title="Line 512: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 512: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (evVer == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 513</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 514</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 515</td> <td class="nbHitsUncovered"><a title="Line 515: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 515: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (VulnerableSoftware vs : cpes) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 516</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> DependencyVersion dbVer;</pre></td></tr>
-<tr> <td class="numLineCover"> 517</td> <td class="nbHitsUncovered"><a title="Line 517: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 517: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (vs.getRevision() != <span class="keyword">null</span> && !vs.getRevision().isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 518</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + <span class="string">"."</span> + vs.getRevision());</span></pre></td></tr>
-<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 520</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dbVer = DependencyVersionUtil.parseVersion(vs.getVersion());</span></pre></td></tr>
-<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 522</td> <td class="nbHitsUncovered"><a title="Line 522: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 522: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (dbVer == <span class="keyword">null</span> <span class="comment">//special case, no version specified - everything is vulnerable</span></a></span></pre></td></tr>
-<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || evVer.equals(dbVer)) { <span class="comment">//yeah! exact match</span></pre></td></tr>
-<tr> <td class="numLineCover"> 524</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String url = String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(vs.getName(), <span class="string">"UTF-8"</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 525</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IdentifierMatch match = <span class="keyword">new</span> IdentifierMatch(<span class="string">"cpe"</span>, vs.getName(), url, IdentifierConfidence.EXACT_MATCH, conf);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 526</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> collected.add(match);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 527</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLine"> 528</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//TODO the following isn't quite right is it? need to think about this guessing game a bit more.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 529</td> <td class="nbHitsUncovered"><a title="Line 529: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 529: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (evVer.getVersionParts().size() <= dbVer.getVersionParts().size()</a></span></pre></td></tr>
-<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && evVer.matchesAtLeastThreeLevels(dbVer)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 531</td> <td class="nbHitsUncovered"><a title="Line 531: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 531: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (bestGuessConf == <span class="keyword">null</span> || bestGuessConf.compareTo(conf) > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 532</td> <td class="nbHitsUncovered"><a title="Line 532: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 532: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (bestGuess.getVersionParts().size() < dbVer.getVersionParts().size()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 533</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bestGuess = dbVer;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 534</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bestGuessConf = conf;</span></pre></td></tr>
-<tr> <td class="numLine"> 535</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 537</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 539</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 540</td> <td class="nbHitsUncovered"><a title="Line 540: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 540: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (bestGuessConf == <span class="keyword">null</span> || bestGuessConf.compareTo(conf) > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 541</td> <td class="nbHitsUncovered"><a title="Line 541: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 541: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (bestGuess.getVersionParts().size() < evVer.getVersionParts().size()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 542</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bestGuess = evVer;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 543</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bestGuessConf = conf;</span></pre></td></tr>
-<tr> <td class="numLine"> 544</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 545</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 546</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 548</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cpeName = String.format(<span class="string">"cpe:/a:%s:%s:%s"</span>, vendor, product, bestGuess.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 549</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String url = <span class="keyword">null</span>; <span class="comment">//String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s", URLEncoder.encode(cpeName, "UTF-8"));</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 550</td> <td class="nbHitsUncovered"><a title="Line 550: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 550: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (bestGuessConf == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 551</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bestGuessConf = Confidence.LOW;</span></pre></td></tr>
-<tr> <td class="numLine"> 552</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 553</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IdentifierMatch match = <span class="keyword">new</span> IdentifierMatch(<span class="string">"cpe"</span>, cpeName, url, IdentifierConfidence.BEST_GUESS, bestGuessConf);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> collected.add(match);</span></pre></td></tr>
-<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 556</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Collections.sort(collected);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 557</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IdentifierConfidence bestIdentifierQuality = collected.get(0).getConfidence();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 558</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Confidence bestEvidenceQuality = collected.get(0).getEvidenceConfidence();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 559</td> <td class="nbHitsUncovered"><a title="Line 559: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 559: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (IdentifierMatch m : collected) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 560</td> <td class="nbHitsUncovered"><a title="Line 560: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 560: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (bestIdentifierQuality.equals(m.getConfidence())</a></span></pre></td></tr>
-<tr> <td class="numLine"> 561</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && bestEvidenceQuality.equals(m.getEvidenceConfidence())) {</pre></td></tr>
-<tr> <td class="numLineCover"> 562</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = m.getIdentifier();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 563</td> <td class="nbHitsUncovered"><a title="Line 563: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 563: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (bestIdentifierQuality == IdentifierConfidence.BEST_GUESS) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 564</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> i.setConfidence(Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 566</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> i.setConfidence(bestEvidenceQuality);</span></pre></td></tr>
-<tr> <td class="numLine"> 567</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 568</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addIdentifier(i);</span></pre></td></tr>
-<tr> <td class="numLine"> 569</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 570</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 571</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 572</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 573</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 574</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The confidence whether the identifier is an exact match, or a best guess.</span></pre></td></tr>
-<tr> <td class="numLine"> 575</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 576</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> enum IdentifierConfidence {</span></pre></td></tr>
-<tr> <td class="numLine"> 577</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 578</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 579</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * An exact match for the CPE.</span></pre></td></tr>
-<tr> <td class="numLine"> 580</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 581</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> EXACT_MATCH,</span></pre></td></tr>
-<tr> <td class="numLine"> 582</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 583</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A best guess for the CPE.</span></pre></td></tr>
-<tr> <td class="numLine"> 584</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 585</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BEST_GUESS</span></pre></td></tr>
-<tr> <td class="numLine"> 586</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 587</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 588</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 589</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A simple object to hold an identifier and carry information about the confidence in the identifier.</span></pre></td></tr>
-<tr> <td class="numLine"> 590</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 591</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> IdentifierMatch <span class="keyword">implements</span> Comparable<IdentifierMatch> {</span></pre></td></tr>
-<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 593</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 594</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs an IdentifierMatch.</span></pre></td></tr>
-<tr> <td class="numLine"> 595</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 596</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param type the type of identifier (such as CPE)</span></pre></td></tr>
-<tr> <td class="numLine"> 597</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param value the value of the identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 598</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 599</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param identifierConfidence the confidence in the identifier: best guess or exact match</span></pre></td></tr>
-<tr> <td class="numLine"> 600</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param evidenceConfidence the confidence of the evidence used to find the identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 601</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 602</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> IdentifierMatch(String type, String value, String url, IdentifierConfidence identifierConfidence, Confidence evidenceConfidence) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 603</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.identifier = <span class="keyword">new</span> Identifier(type, value, url);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 604</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.confidence = identifierConfidence;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 605</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.evidenceConfidence = evidenceConfidence;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 606</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 607</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Property implementations: evidenceConfidence, confidence, identifier"></span></pre></td></tr>
-<tr> <td class="numLine"> 608</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 609</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The confidence in the evidence used to identify this match.</span></pre></td></tr>
-<tr> <td class="numLine"> 610</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 611</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Confidence evidenceConfidence;</pre></td></tr>
-<tr> <td class="numLine"> 612</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 613</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 614</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of evidenceConfidence</span></pre></td></tr>
-<tr> <td class="numLine"> 615</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 616</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of evidenceConfidence</span></pre></td></tr>
-<tr> <td class="numLine"> 617</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 618</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Confidence getEvidenceConfidence() {</pre></td></tr>
-<tr> <td class="numLine"> 619</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> evidenceConfidence;</pre></td></tr>
-<tr> <td class="numLine"> 620</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 621</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 622</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 623</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of evidenceConfidence</span></pre></td></tr>
-<tr> <td class="numLine"> 624</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 625</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param evidenceConfidence new value of evidenceConfidence</span></pre></td></tr>
-<tr> <td class="numLine"> 626</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 627</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setEvidenceConfidence(Confidence evidenceConfidence) {</pre></td></tr>
-<tr> <td class="numLine"> 628</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.evidenceConfidence = evidenceConfidence;</pre></td></tr>
-<tr> <td class="numLine"> 629</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 630</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 631</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The confidence whether this is an exact match, or a best guess.</span></pre></td></tr>
-<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> IdentifierConfidence confidence;</pre></td></tr>
-<tr> <td class="numLine"> 634</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 635</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 636</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of confidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 637</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 638</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of confidence</span></pre></td></tr>
-<tr> <td class="numLine"> 639</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 640</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> IdentifierConfidence getConfidence() {</pre></td></tr>
-<tr> <td class="numLine"> 641</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> confidence;</pre></td></tr>
-<tr> <td class="numLine"> 642</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 643</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 644</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 645</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of confidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 646</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 647</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param confidence new value of confidence</span></pre></td></tr>
-<tr> <td class="numLine"> 648</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 649</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setConfidence(IdentifierConfidence confidence) {</pre></td></tr>
-<tr> <td class="numLine"> 650</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.confidence = confidence;</pre></td></tr>
-<tr> <td class="numLine"> 651</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 652</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 653</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The CPE identifier.</span></pre></td></tr>
-<tr> <td class="numLine"> 654</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 655</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Identifier identifier;</pre></td></tr>
-<tr> <td class="numLine"> 656</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 657</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 658</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of identifier.</span></pre></td></tr>
-<tr> <td class="numLine"> 659</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 660</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 661</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 662</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Identifier getIdentifier() {</pre></td></tr>
-<tr> <td class="numLine"> 663</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> identifier;</pre></td></tr>
-<tr> <td class="numLine"> 664</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 665</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 666</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 667</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of identifier.</span></pre></td></tr>
-<tr> <td class="numLine"> 668</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 669</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param identifier new value of identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 670</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 671</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setIdentifier(Identifier identifier) {</pre></td></tr>
-<tr> <td class="numLine"> 672</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.identifier = identifier;</pre></td></tr>
-<tr> <td class="numLine"> 673</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 674</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
-<tr> <td class="numLine"> 675</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Standard implementations of toString, hashCode, and equals"></span></pre></td></tr>
-<tr> <td class="numLine"> 676</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 677</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 678</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard toString() implementation.</span></pre></td></tr>
-<tr> <td class="numLine"> 679</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 680</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the string representation of the object</span></pre></td></tr>
-<tr> <td class="numLine"> 681</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 682</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 683</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 684</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"IdentifierMatch{"</span> + <span class="string">"evidenceConfidence="</span> + evidenceConfidence</span></pre></td></tr>
-<tr> <td class="numLine"> 685</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">", confidence="</span> + confidence + <span class="string">", identifier="</span> + identifier + <span class="string">'}'</span>;</pre></td></tr>
-<tr> <td class="numLine"> 686</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//TODO - likely need to change the split... not sure if this will work for CPE with special chars</span></pre></td></tr>
+<tr> <td class="numLineCover"> 446</td> <td class="nbHitsUncovered"><a title="Line 446: Conditional coverage 50% (1/2)."> 59</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 446: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 447</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 687</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 688</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 689</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard hashCode() implementation.</span></pre></td></tr>
-<tr> <td class="numLine"> 690</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 691</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the hashCode</span></pre></td></tr>
-<tr> <td class="numLine"> 692</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 693</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 694</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 695</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 5;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 696</td> <td class="nbHitsUncovered"><a title="Line 696: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 696: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.evidenceConfidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.evidenceConfidence.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 697</td> <td class="nbHitsUncovered"><a title="Line 697: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 697: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.confidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.confidence.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 698</td> <td class="nbHitsUncovered"><a title="Line 698: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 698: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.identifier != <span class="keyword">null</span> ? <span class="keyword">this</span>.identifier.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 699</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
-<tr> <td class="numLine"> 700</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 701</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 702</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 703</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard equals implementation.</span></pre></td></tr>
-<tr> <td class="numLine"> 704</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 705</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 706</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the objects are equal, otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 707</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 708</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 709</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
-<tr> <td class="numLineCover"> 710</td> <td class="nbHitsUncovered"><a title="Line 710: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 710: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 711</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 712</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 449</td> <td class="nbHitsCovered"> 59</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] words = text.split(<span class="string">"[\\s_-]"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 450</td> <td class="nbHitsCovered"> 59</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> list = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 451</td> <td class="nbHitsCovered"> 59</td> <td class="src"><pre class="src"> String tempWord = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 452</td> <td class="nbHitsCovered"><a title="Line 452: Conditional coverage 100% (2/2)."> 174</a></td> <td class="src"><pre class="src"> <a title="Line 452: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String word : words) {</a></pre></td></tr>
+<tr> <td class="numLine"> 453</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/*</span></pre></td></tr>
+<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> single letter words should be concatenated with the next word.</span></pre></td></tr>
+<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> so { "m", "core", "sample" } -> { "mcore", "sample" }</span></pre></td></tr>
+<tr> <td class="numLine"> 456</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 457</td> <td class="nbHitsCovered"><a title="Line 457: Conditional coverage 100% (2/2)."> 115</a></td> <td class="src"><pre class="src"> <a title="Line 457: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (tempWord != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 458</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> list.add(tempWord + word);</pre></td></tr>
+<tr> <td class="numLineCover"> 459</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> tempWord = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 460</td> <td class="nbHitsCovered"><a title="Line 460: Conditional coverage 100% (2/2)."> 111</a></td> <td class="src"><pre class="src"> <a title="Line 460: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (word.length() <= 2) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 461</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> tempWord = word;</pre></td></tr>
+<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 463</td> <td class="nbHitsCovered"> 107</td> <td class="src"><pre class="src"> list.add(word);</pre></td></tr>
+<tr> <td class="numLine"> 464</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 713</td> <td class="nbHitsUncovered"><a title="Line 713: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 713: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 466</td> <td class="nbHitsUncovered"><a title="Line 466: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 59</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 466: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (tempWord != <span class="keyword">null</span> && !list.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 467</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String tmp = list.get(list.size() - 1) + tempWord;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 468</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> list.add(tmp);</span></pre></td></tr>
+<tr> <td class="numLine"> 469</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 470</td> <td class="nbHitsCovered"> 59</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> contains = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 471</td> <td class="nbHitsCovered"><a title="Line 471: Conditional coverage 100% (2/2)."> 59</a></td> <td class="src"><pre class="src"> <a title="Line 471: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String word : list) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 472</td> <td class="nbHitsCovered"> 111</td> <td class="src"><pre class="src"> contains &= ec.containsUsedString(word);</pre></td></tr>
+<tr> <td class="numLineCover"> 473</td> <td class="nbHitsCovered"> 111</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 474</td> <td class="nbHitsCovered"> 59</td> <td class="src"><pre class="src"> <span class="keyword">return</span> contains;</pre></td></tr>
+<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Analyzes a dependency and attempts to determine if there are any CPE identifiers for this dependency.</span></pre></td></tr>
+<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency The Dependency to analyze.</span></pre></td></tr>
+<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param engine The analysis engine</span></pre></td></tr>
+<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException is thrown if there is an issue analyzing the dependency.</span></pre></td></tr>
+<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
+<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 487</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> determineCPE(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 488</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 489</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"CPE Index is corrupt."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 491</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Failure opening the CPE Index."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 492</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 493</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Unable to parse the generated Lucene query for this dependency."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 495</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 496</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Retrieves a list of CPE values from the CveDB based on the vendor and product passed in. The list is then</span></pre></td></tr>
+<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * validated to find only CPEs that are valid for the given dependency. It is possible that the CPE identified is a</span></pre></td></tr>
+<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * best effort "guess" based on the vendor, product, and version information.</span></pre></td></tr>
+<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the Dependency being analyzed</span></pre></td></tr>
+<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vendor the vendor for the CPE being analyzed</span></pre></td></tr>
+<tr> <td class="numLine"> 504</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param product the product for the CPE being analyzed</span></pre></td></tr>
+<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UnsupportedEncodingException is thrown if UTF-8 is not supported</span></pre></td></tr>
+<tr> <td class="numLine"> 506</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 507</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> determineIdentifiers(Dependency dependency, String vendor, String product) <span class="keyword">throws</span> UnsupportedEncodingException {</pre></td></tr>
+<tr> <td class="numLineCover"> 508</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<VulnerableSoftware> cpes = cve.getCPEs(vendor, product);</pre></td></tr>
+<tr> <td class="numLineCover"> 509</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> DependencyVersion bestGuess = <span class="keyword">new</span> DependencyVersion(<span class="string">"-"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 510</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Confidence bestGuessConf = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 511</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<IdentifierMatch> collected = <span class="keyword">new</span> ArrayList<IdentifierMatch>();</pre></td></tr>
+<tr> <td class="numLineCover"> 512</td> <td class="nbHitsCovered"><a title="Line 512: Conditional coverage 100% (2/2)."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 512: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Confidence conf : Confidence.values()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 513</td> <td class="nbHitsCovered"><a title="Line 513: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 513: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Evidence evidence : dependency.getVersionEvidence().iterator(conf)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 514</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">final</span> DependencyVersion evVer = DependencyVersionUtil.parseVersion(evidence.getValue());</pre></td></tr>
+<tr> <td class="numLineCover"> 515</td> <td class="nbHitsUncovered"><a title="Line 515: Conditional coverage 50% (1/2)."> 16</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 515: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (evVer == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 516</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 518</td> <td class="nbHitsCovered"><a title="Line 518: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 518: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (VulnerableSoftware vs : cpes) {</a></pre></td></tr>
+<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> DependencyVersion dbVer;</pre></td></tr>
+<tr> <td class="numLineCover"> 520</td> <td class="nbHitsUncovered"><a title="Line 520: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 240</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 520: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (vs.getRevision() != <span class="keyword">null</span> && !vs.getRevision().isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 521</td> <td class="nbHitsCovered"> 72</td> <td class="src"><pre class="src"> dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + <span class="string">"."</span> + vs.getRevision());</pre></td></tr>
+<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 523</td> <td class="nbHitsCovered"> 168</td> <td class="src"><pre class="src"> dbVer = DependencyVersionUtil.parseVersion(vs.getVersion());</pre></td></tr>
+<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 525</td> <td class="nbHitsUncovered"><a title="Line 525: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 240</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 525: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (dbVer == <span class="keyword">null</span> <span class="comment">//special case, no version specified - everything is vulnerable</span></a></span></pre></td></tr>
+<tr> <td class="numLine"> 526</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || evVer.equals(dbVer)) { <span class="comment">//yeah! exact match</span></pre></td></tr>
+<tr> <td class="numLineCover"> 527</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String url = String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(vs.getName(), <span class="string">"UTF-8"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 528</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">final</span> IdentifierMatch match = <span class="keyword">new</span> IdentifierMatch(<span class="string">"cpe"</span>, vs.getName(), url, IdentifierConfidence.EXACT_MATCH, conf);</pre></td></tr>
+<tr> <td class="numLineCover"> 529</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> collected.add(match);</pre></td></tr>
+<tr> <td class="numLineCover"> 530</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLine"> 531</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//TODO the following isn't quite right is it? need to think about this guessing game a bit more.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 532</td> <td class="nbHitsUncovered"><a title="Line 532: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 224</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 532: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (evVer.getVersionParts().size() <= dbVer.getVersionParts().size()</a></span></pre></td></tr>
+<tr> <td class="numLine"> 533</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && evVer.matchesAtLeastThreeLevels(dbVer)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 534</td> <td class="nbHitsUncovered"><a title="Line 534: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 56</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 534: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (bestGuessConf == <span class="keyword">null</span> || bestGuessConf.compareTo(conf) > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"><a title="Line 535: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 535: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (bestGuess.getVersionParts().size() < dbVer.getVersionParts().size()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 536</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> bestGuess = dbVer;</pre></td></tr>
+<tr> <td class="numLineCover"> 537</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> bestGuessConf = conf;</pre></td></tr>
+<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 539</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 540</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 541</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 542</td> <td class="nbHitsCovered"> 240</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 543</td> <td class="nbHitsUncovered"><a title="Line 543: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 16</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 543: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (bestGuessConf == <span class="keyword">null</span> || bestGuessConf.compareTo(conf) > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 544</td> <td class="nbHitsUncovered"><a title="Line 544: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 544: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (bestGuess.getVersionParts().size() < evVer.getVersionParts().size()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 545</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> bestGuess = evVer;</pre></td></tr>
+<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> bestGuessConf = conf;</pre></td></tr>
+<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 548</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 549</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 550</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 551</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String cpeName = String.format(<span class="string">"cpe:/a:%s:%s:%s"</span>, vendor, product, bestGuess.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 552</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String url = <span class="keyword">null</span>; <span class="comment">//String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s", URLEncoder.encode(cpeName, "UTF-8"));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 553</td> <td class="nbHitsUncovered"><a title="Line 553: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 553: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (bestGuessConf == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bestGuessConf = Confidence.LOW;</span></pre></td></tr>
+<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 556</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> IdentifierMatch match = <span class="keyword">new</span> IdentifierMatch(<span class="string">"cpe"</span>, cpeName, url, IdentifierConfidence.BEST_GUESS, bestGuessConf);</pre></td></tr>
+<tr> <td class="numLineCover"> 557</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> collected.add(match);</pre></td></tr>
+<tr> <td class="numLine"> 558</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 559</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Collections.sort(collected);</pre></td></tr>
+<tr> <td class="numLineCover"> 560</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> IdentifierConfidence bestIdentifierQuality = collected.get(0).getConfidence();</pre></td></tr>
+<tr> <td class="numLineCover"> 561</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Confidence bestEvidenceQuality = collected.get(0).getEvidenceConfidence();</pre></td></tr>
+<tr> <td class="numLineCover"> 562</td> <td class="nbHitsCovered"><a title="Line 562: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 562: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (IdentifierMatch m : collected) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 563</td> <td class="nbHitsCovered"><a title="Line 563: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 563: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (bestIdentifierQuality.equals(m.getConfidence())</a></pre></td></tr>
+<tr> <td class="numLine"> 564</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && bestEvidenceQuality.equals(m.getEvidenceConfidence())) {</pre></td></tr>
+<tr> <td class="numLineCover"> 565</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier i = m.getIdentifier();</pre></td></tr>
+<tr> <td class="numLineCover"> 566</td> <td class="nbHitsUncovered"><a title="Line 566: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 566: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (bestIdentifierQuality == IdentifierConfidence.BEST_GUESS) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 567</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> i.setConfidence(Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLine"> 568</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 569</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> i.setConfidence(bestEvidenceQuality);</pre></td></tr>
+<tr> <td class="numLine"> 570</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 571</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> dependency.addIdentifier(i);</pre></td></tr>
+<tr> <td class="numLine"> 572</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 573</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 574</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 575</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 576</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 577</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The confidence whether the identifier is an exact match, or a best guess.</span></pre></td></tr>
+<tr> <td class="numLine"> 578</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 579</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> enum IdentifierConfidence {</pre></td></tr>
+<tr> <td class="numLine"> 580</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 581</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 582</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * An exact match for the CPE.</span></pre></td></tr>
+<tr> <td class="numLine"> 583</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 584</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> EXACT_MATCH,</pre></td></tr>
+<tr> <td class="numLine"> 585</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 586</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A best guess for the CPE.</span></pre></td></tr>
+<tr> <td class="numLine"> 587</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 588</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> BEST_GUESS</pre></td></tr>
+<tr> <td class="numLine"> 589</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 590</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 591</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A simple object to hold an identifier and carry information about the confidence in the identifier.</span></pre></td></tr>
+<tr> <td class="numLine"> 593</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 594</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> IdentifierMatch <span class="keyword">implements</span> Comparable<IdentifierMatch> {</pre></td></tr>
+<tr> <td class="numLine"> 595</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 596</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 597</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs an IdentifierMatch.</span></pre></td></tr>
+<tr> <td class="numLine"> 598</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 599</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param type the type of identifier (such as CPE)</span></pre></td></tr>
+<tr> <td class="numLine"> 600</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param value the value of the identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 601</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 602</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param identifierConfidence the confidence in the identifier: best guess or exact match</span></pre></td></tr>
+<tr> <td class="numLine"> 603</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param evidenceConfidence the confidence of the evidence used to find the identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 604</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 605</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> IdentifierMatch(String type, String value, String url, IdentifierConfidence identifierConfidence, Confidence evidenceConfidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 606</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.identifier = <span class="keyword">new</span> Identifier(type, value, url);</pre></td></tr>
+<tr> <td class="numLineCover"> 607</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.confidence = identifierConfidence;</pre></td></tr>
+<tr> <td class="numLineCover"> 608</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.evidenceConfidence = evidenceConfidence;</pre></td></tr>
+<tr> <td class="numLineCover"> 609</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 610</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Property implementations: evidenceConfidence, confidence, identifier"></span></pre></td></tr>
+<tr> <td class="numLine"> 611</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 612</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The confidence in the evidence used to identify this match.</span></pre></td></tr>
+<tr> <td class="numLine"> 613</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 614</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Confidence evidenceConfidence;</pre></td></tr>
+<tr> <td class="numLine"> 615</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 616</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 617</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of evidenceConfidence</span></pre></td></tr>
+<tr> <td class="numLine"> 618</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 619</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of evidenceConfidence</span></pre></td></tr>
+<tr> <td class="numLine"> 620</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 621</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Confidence getEvidenceConfidence() {</pre></td></tr>
+<tr> <td class="numLine"> 622</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> evidenceConfidence;</pre></td></tr>
+<tr> <td class="numLine"> 623</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 624</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 625</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 626</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of evidenceConfidence</span></pre></td></tr>
+<tr> <td class="numLine"> 627</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 628</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param evidenceConfidence new value of evidenceConfidence</span></pre></td></tr>
+<tr> <td class="numLine"> 629</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 630</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setEvidenceConfidence(Confidence evidenceConfidence) {</pre></td></tr>
+<tr> <td class="numLine"> 631</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.evidenceConfidence = evidenceConfidence;</pre></td></tr>
+<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 634</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The confidence whether this is an exact match, or a best guess.</span></pre></td></tr>
+<tr> <td class="numLine"> 635</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 636</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> IdentifierConfidence confidence;</pre></td></tr>
+<tr> <td class="numLine"> 637</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 638</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 639</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of confidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 640</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 641</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of confidence</span></pre></td></tr>
+<tr> <td class="numLine"> 642</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 643</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> IdentifierConfidence getConfidence() {</pre></td></tr>
+<tr> <td class="numLine"> 644</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> confidence;</pre></td></tr>
+<tr> <td class="numLine"> 645</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 646</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 647</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 648</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of confidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 649</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 650</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param confidence new value of confidence</span></pre></td></tr>
+<tr> <td class="numLine"> 651</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 652</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setConfidence(IdentifierConfidence confidence) {</pre></td></tr>
+<tr> <td class="numLine"> 653</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.confidence = confidence;</pre></td></tr>
+<tr> <td class="numLine"> 654</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 655</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 656</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The CPE identifier.</span></pre></td></tr>
+<tr> <td class="numLine"> 657</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 658</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Identifier identifier;</pre></td></tr>
+<tr> <td class="numLine"> 659</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 660</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 661</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of identifier.</span></pre></td></tr>
+<tr> <td class="numLine"> 662</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 663</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 664</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 665</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Identifier getIdentifier() {</pre></td></tr>
+<tr> <td class="numLine"> 666</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> identifier;</pre></td></tr>
+<tr> <td class="numLine"> 667</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 668</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 669</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 670</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of identifier.</span></pre></td></tr>
+<tr> <td class="numLine"> 671</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 672</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param identifier new value of identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 673</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 674</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setIdentifier(Identifier identifier) {</pre></td></tr>
+<tr> <td class="numLine"> 675</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.identifier = identifier;</pre></td></tr>
+<tr> <td class="numLine"> 676</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 677</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+<tr> <td class="numLine"> 678</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Standard implementations of toString, hashCode, and equals"></span></pre></td></tr>
+<tr> <td class="numLine"> 679</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 680</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 681</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard toString() implementation.</span></pre></td></tr>
+<tr> <td class="numLine"> 682</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 683</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the string representation of the object</span></pre></td></tr>
+<tr> <td class="numLine"> 684</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 685</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 686</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 687</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"IdentifierMatch{"</span> + <span class="string">"evidenceConfidence="</span> + evidenceConfidence</span></pre></td></tr>
+<tr> <td class="numLine"> 688</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">", confidence="</span> + confidence + <span class="string">", identifier="</span> + identifier + <span class="string">'}'</span>;</pre></td></tr>
+<tr> <td class="numLine"> 689</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 690</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 691</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 692</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard hashCode() implementation.</span></pre></td></tr>
+<tr> <td class="numLine"> 693</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 694</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the hashCode</span></pre></td></tr>
+<tr> <td class="numLine"> 695</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 696</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 697</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 698</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 5;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 699</td> <td class="nbHitsUncovered"><a title="Line 699: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 699: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.evidenceConfidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.evidenceConfidence.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 700</td> <td class="nbHitsUncovered"><a title="Line 700: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 700: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.confidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.confidence.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 701</td> <td class="nbHitsUncovered"><a title="Line 701: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 701: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.identifier != <span class="keyword">null</span> ? <span class="keyword">this</span>.identifier.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 702</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+<tr> <td class="numLine"> 703</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 704</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 705</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 706</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard equals implementation.</span></pre></td></tr>
+<tr> <td class="numLine"> 707</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 708</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 709</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the objects are equal, otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 710</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 711</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 712</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
+<tr> <td class="numLineCover"> 713</td> <td class="nbHitsUncovered"><a title="Line 713: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 713: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 714</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 715</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 716</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IdentifierMatch other = (IdentifierMatch) obj;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 717</td> <td class="nbHitsUncovered"><a title="Line 717: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 717: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.evidenceConfidence != other.evidenceConfidence) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 718</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 719</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 716</td> <td class="nbHitsUncovered"><a title="Line 716: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 716: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 717</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 718</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 720</td> <td class="nbHitsUncovered"><a title="Line 720: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 720: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.confidence != other.confidence) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 719</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IdentifierMatch other = (IdentifierMatch) obj;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 720</td> <td class="nbHitsUncovered"><a title="Line 720: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 720: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.evidenceConfidence != other.evidenceConfidence) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 721</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 722</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 723</td> <td class="nbHitsUncovered"><a title="Line 723: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 723: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.identifier != other.identifier && (<span class="keyword">this</span>.identifier == <span class="keyword">null</span> || !<span class="keyword">this</span>.identifier.equals(other.identifier))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 723</td> <td class="nbHitsUncovered"><a title="Line 723: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 723: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.confidence != other.confidence) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 724</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 725</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 726</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 727</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 726</td> <td class="nbHitsUncovered"><a title="Line 726: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 726: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.identifier != other.identifier && (<span class="keyword">this</span>.identifier == <span class="keyword">null</span> || !<span class="keyword">this</span>.identifier.equals(other.identifier))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 727</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 728</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
-<tr> <td class="numLine"> 729</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 730</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 731</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of compareTo that compares identifier confidence, evidence confidence, and then the</span></pre></td></tr>
-<tr> <td class="numLine"> 732</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * identifier.</span></pre></td></tr>
-<tr> <td class="numLine"> 733</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 734</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param o the IdentifierMatch to compare to</span></pre></td></tr>
-<tr> <td class="numLine"> 735</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the natural ordering of IdentifierMatch</span></pre></td></tr>
-<tr> <td class="numLine"> 736</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 737</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 738</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(IdentifierMatch o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 739</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> conf = <span class="keyword">this</span>.confidence.compareTo(o.confidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 740</td> <td class="nbHitsUncovered"><a title="Line 740: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 740: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (conf == 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 741</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conf = <span class="keyword">this</span>.evidenceConfidence.compareTo(o.evidenceConfidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 742</td> <td class="nbHitsUncovered"><a title="Line 742: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 742: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (conf == 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 743</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conf = identifier.compareTo(o.identifier);</span></pre></td></tr>
-<tr> <td class="numLine"> 744</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 745</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 746</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> conf;</span></pre></td></tr>
-<tr> <td class="numLine"> 747</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 729</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 730</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 731</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+<tr> <td class="numLine"> 732</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 733</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 734</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of compareTo that compares identifier confidence, evidence confidence, and then the</span></pre></td></tr>
+<tr> <td class="numLine"> 735</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * identifier.</span></pre></td></tr>
+<tr> <td class="numLine"> 736</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 737</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param o the IdentifierMatch to compare to</span></pre></td></tr>
+<tr> <td class="numLine"> 738</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the natural ordering of IdentifierMatch</span></pre></td></tr>
+<tr> <td class="numLine"> 739</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 740</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 741</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(IdentifierMatch o) {</pre></td></tr>
+<tr> <td class="numLineCover"> 742</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">int</span> conf = <span class="keyword">this</span>.confidence.compareTo(o.confidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 743</td> <td class="nbHitsCovered"><a title="Line 743: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 743: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (conf == 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 744</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> conf = <span class="keyword">this</span>.evidenceConfidence.compareTo(o.evidenceConfidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 745</td> <td class="nbHitsCovered"><a title="Line 745: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 745: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (conf == 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 746</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> conf = identifier.compareTo(o.identifier);</pre></td></tr>
+<tr> <td class="numLine"> 747</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 748</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 749</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">return</span> conf;</pre></td></tr>
+<tr> <td class="numLine"> 750</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 751</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 749</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 752</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 925a9fffa..75638cf46 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html">CpeSuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">55%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">5/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">1/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
</table>
<div class="separator"> </div>
@@ -82,7 +82,7 @@
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implmentation details of Analyzer"></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
@@ -97,7 +97,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
@@ -114,7 +114,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
@@ -133,7 +133,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
@@ -146,8 +146,8 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(<span class="keyword">final</span> Dependency dependency, <span class="keyword">final</span> Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (getRules() == <span class="keyword">null</span> || getRules().size() <= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (getRules() == <span class="keyword">null</span> || getRules().size() <= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
@@ -160,6 +160,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 621375cf9..c07299c85 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/150</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.090909090909092;</span>9.091</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html">DependencyBundlingAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">34%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:34px"><span class="text">48/141</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">43/150</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.090909090909092;</span>9.091</td></tr>
</table>
<div class="separator"> </div>
@@ -114,547 +114,556 @@
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Constants and Member Variables"></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A pattern for obtaining the first part of a filename.</span></pre></td></tr>
-<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern STARTING_TEXT_PATTERN = Pattern.compile(<span class="string">"^[a-zA-Z]*"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * a flag indicating if this analyzer has run. This analyzer only runs once.</span></pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> analyzed = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The name of the analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NAME = <span class="string">"Dependency Bundling Analyzer"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.PRE_FINDING_ANALYSIS;</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(DependencyBundlingAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="Constants and Member Variables"></span></pre></td></tr>
+<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A pattern for obtaining the first part of a filename.</span></pre></td></tr>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern STARTING_TEXT_PATTERN = Pattern.compile(<span class="string">"^[a-zA-Z]*"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * a flag indicating if this analyzer has run. This analyzer only runs once.</span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> analyzed = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The name of the analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NAME = <span class="string">"Dependency Bundling Analyzer"</span>;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the name of the analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the name of the analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.PRE_FINDING_ANALYSIS;</pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the name of the analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the name of the analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the phase that the analyzer is intended to run in.</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the phase that the analyzer is intended to run in.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the phase that the analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the phase that the analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Analyzes a set of dependencies. If they have been found to have the same base path and the same set of</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * identifiers they are likely related. The related dependencies are bundled into a single reportable item.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ignore this analyzer ignores the dependency being analyzed</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param engine the engine that is scanning the dependencies</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException is thrown if there is an error reading the JAR file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Analyzes a set of dependencies. If they have been found to have the same base path and the same set of</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * identifiers they are likely related. The related dependencies are bundled into a single reportable item.</span></pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency ignore, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"><a title="Line 98: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 98: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!analyzed) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzed = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Dependency> dependenciesToRemove = <span class="keyword">new</span> HashSet<Dependency>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ignore this analyzer ignores the dependency being analyzed</span></pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param engine the engine that is scanning the dependencies</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException is thrown if there is an error reading the JAR file.</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency ignore, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"><a title="Line 103: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 103: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!analyzed) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> analyzed = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<Dependency> dependenciesToRemove = <span class="keyword">new</span> HashSet<Dependency>();</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator();</pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//for (Dependency nextDependency : engine.getDependencies()) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (mainIterator.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Dependency dependency = mainIterator.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"><a title="Line 105: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 105: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (mainIterator.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (subIterator.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Dependency nextDependency = subIterator.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"><a title="Line 109: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 109: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (isShadedJar(dependency, nextDependency)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"><a title="Line 110: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 110: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dependency.getFileName().toLowerCase().endsWith(<span class="string">"pom.xml"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependenciesToRemove.add(dependency);</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"><a title="Line 108: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 108: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (mainIterator.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Dependency dependency = mainIterator.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"><a title="Line 110: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 110: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (mainIterator.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex());</pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"><a title="Line 112: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 112: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (subIterator.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Dependency nextDependency = subIterator.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"><a title="Line 114: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 114: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (hashesMatch(dependency, nextDependency)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (isCore(dependency, nextDependency)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(dependency, nextDependency, dependenciesToRemove);</span></pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependenciesToRemove.add(nextDependency);</span></pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(nextDependency, dependency, dependenciesToRemove);</span></pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (hashesMatch(dependency, nextDependency)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"><a title="Line 116: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 116: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (isCore(dependency, nextDependency)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(dependency, nextDependency, dependenciesToRemove);</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(nextDependency, dependency, dependenciesToRemove);</span></pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"><a title="Line 121: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 121: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (cpeIdentifiersMatch(dependency, nextDependency)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && hasSameBasePath(dependency, nextDependency)</pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"><a title="Line 120: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 120: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (isShadedJar(dependency, nextDependency)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"><a title="Line 121: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 121: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dependency.getFileName().toLowerCase().endsWith(<span class="string">"pom.xml"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependenciesToRemove.add(dependency);</span></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && fileNameMatch(dependency, nextDependency)) {</pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"><a title="Line 125: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 125: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (isCore(dependency, nextDependency)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(dependency, nextDependency, dependenciesToRemove);</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(nextDependency, dependency, dependenciesToRemove);</span></pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependenciesToRemove.add(nextDependency);</span></pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"><a title="Line 126: Conditional coverage 16% (1/6) [each condition: 50%, 0%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 126: Conditional coverage 16% (1/6) [each condition: 50%, 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (cpeIdentifiersMatch(dependency, nextDependency)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && hasSameBasePath(dependency, nextDependency)</pre></td></tr>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && fileNameMatch(dependency, nextDependency)) {</pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"><a title="Line 130: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 130: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (isCore(dependency, nextDependency)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(dependency, nextDependency, dependenciesToRemove);</span></pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeDependencies(nextDependency, dependency, dependenciesToRemove);</span></pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//removing dependencies here as ensuring correctness and avoiding ConcurrentUpdateExceptions</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// was difficult because of the inner iterator.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"><a title="Line 136: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 136: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency d : dependenciesToRemove) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.getDependencies().remove(d);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Adds the relatedDependency to the dependency's related dependencies.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//removing dependencies here as ensuring correctness and avoiding ConcurrentUpdateExceptions</span></pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// was difficult because of the inner iterator.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"><a title="Line 141: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 141: Conditional coverage 50% (1/2)."> <span class="keyword">for</span> (Dependency d : dependenciesToRemove) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.getDependencies().remove(d);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the main dependency</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param relatedDependency a collection of dependencies to be removed from the main analysis loop, this is the</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * source of dependencies to remove</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependenciesToRemove a collection of dependencies that will be removed from the main analysis loop, this</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds the relatedDependency to the dependency's related dependencies.</span></pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * function adds to this collection</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the main dependency</span></pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param relatedDependency a collection of dependencies to be removed from the main analysis loop, this is the</span></pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * source of dependencies to remove</span></pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependenciesToRemove a collection of dependencies that will be removed from the main analysis loop, this</span></pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * function adds to this collection</span></pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> mergeDependencies(<span class="keyword">final</span> Dependency dependency, <span class="keyword">final</span> Dependency relatedDependency, <span class="keyword">final</span> Set<Dependency> dependenciesToRemove) {</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addRelatedDependency(relatedDependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Dependency> i = relatedDependency.getRelatedDependencies().iterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"><a title="Line 154: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 154: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (i.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addRelatedDependency(i.next());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> i.remove();</span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependenciesToRemove.add(relatedDependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addRelatedDependency(relatedDependency);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Dependency> i = relatedDependency.getRelatedDependencies().iterator();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"><a title="Line 159: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 159: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (i.hasNext()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addRelatedDependency(i.next());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> i.remove();</span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Attempts to trim a maven repo to a common base path. This is typically</span></pre></td></tr>
-<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * [drive]\[repo_location]\repository\[path1]\[path2].</span></pre></td></tr>
-<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependenciesToRemove.add(relatedDependency);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param path the path to trim</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a string representing the base path.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Attempts to trim a maven repo to a common base path. This is typically</span></pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String getBaseRepoPath(<span class="keyword">final</span> String path) {</pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> pos = path.indexOf(<span class="string">"repository"</span> + File.separator) + 11;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"><a title="Line 170: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 170: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos < 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * [drive]\[repo_location]\repository\[path1]\[path2].</span></pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param path the path to trim</span></pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a string representing the base path.</span></pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String getBaseRepoPath(<span class="keyword">final</span> String path) {</pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> pos = path.indexOf(<span class="string">"repository"</span> + File.separator) + 11;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"><a title="Line 175: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 175: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos < 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path;</span></pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> tmp = path.indexOf(File.separator, pos);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"><a title="Line 174: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 174: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp <= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path;</span></pre></td></tr>
-<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> tmp = path.indexOf(File.separator, pos);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp <= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path;</span></pre></td></tr>
+<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"><a title="Line 177: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 177: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = tmp + 1;</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"><a title="Line 182: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 182: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = tmp + 1;</span></pre></td></tr>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = path.indexOf(File.separator, pos);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = tmp + 1;</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path.substring(0, pos);</span></pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = path.indexOf(File.separator, pos);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"><a title="Line 186: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 186: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = tmp + 1;</span></pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns true if the file names (and version if it exists) of the two dependencies are sufficiently similar.</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path.substring(0, pos);</span></pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency1 a dependency2 to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency2 a dependency2 to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the identifiers in the two supplied dependencies are equal</span></pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> fileNameMatch(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"><a title="Line 195: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 195: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency1.getFileName() == <span class="keyword">null</span></a></span></pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || dependency2 == <span class="keyword">null</span> || dependency2.getFileName() == <span class="keyword">null</span>) {</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String fileName1 = dependency1.getFileName();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String fileName2 = dependency2.getFileName();</span></pre></td></tr>
-<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//update to deal with archive analyzer, the starting name maybe the same</span></pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// as this is incorrectly looking at the starting path</span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File one = <span class="keyword">new</span> File(fileName1);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File two = <span class="keyword">new</span> File(fileName2);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String oneParent = one.getParent();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String twoParent = two.getParent();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"><a title="Line 208: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 208: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (oneParent != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (oneParent.equals(twoParent)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileName1 = one.getName();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileName2 = two.getName();</span></pre></td></tr>
-<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"><a title="Line 215: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 215: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (twoParent != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//version check</span></pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion version1 = DependencyVersionUtil.parseVersion(fileName1);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion version2 = DependencyVersionUtil.parseVersion(fileName2);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"><a title="Line 222: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 222: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version1 != <span class="keyword">null</span> && version2 != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!version1.equals(version2)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//filename check</span></pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Matcher match1 = STARTING_TEXT_PATTERN.matcher(fileName1);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Matcher match2 = STARTING_TEXT_PATTERN.matcher(fileName2);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (match1.find() && match2.find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> match1.group().equals(match2.group());</span></pre></td></tr>
-<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns true if the CPE identifiers in the two supplied dependencies are equal.</span></pre></td></tr>
-<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns true if the file names (and version if it exists) of the two dependencies are sufficiently similar.</span></pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency1 a dependency2 to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency2 a dependency2 to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return true if the identifiers in the two supplied dependencies are equal</span></pre></td></tr>
-<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> cpeIdentifiersMatch(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"><a title="Line 246: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 246: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency1.getIdentifiers() == <span class="keyword">null</span></a></span></pre></td></tr>
-<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || dependency2 == <span class="keyword">null</span> || dependency2.getIdentifiers() == <span class="keyword">null</span>) {</pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> fileNameMatch(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"><a title="Line 200: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 200: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency1.getFileName() == <span class="keyword">null</span></a></span></pre></td></tr>
+<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || dependency2 == <span class="keyword">null</span> || dependency2.getFileName() == <span class="keyword">null</span>) {</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> matches = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> cpeCount1 = 0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> cpeCount2 = 0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"><a title="Line 253: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 253: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Identifier i : dependency1.getIdentifiers()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"><a title="Line 254: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 254: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpeCount1 += 1;</span></pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String fileName1 = dependency1.getFileName();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String fileName2 = dependency2.getFileName();</span></pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//update to deal with archive analyzer, the starting name maybe the same</span></pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// as this is incorrectly looking at the starting path</span></pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File one = <span class="keyword">new</span> File(fileName1);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File two = <span class="keyword">new</span> File(fileName2);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String oneParent = one.getParent();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String twoParent = two.getParent();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"><a title="Line 213: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 213: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (oneParent != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"><a title="Line 214: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 214: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (oneParent.equals(twoParent)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileName1 = one.getName();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileName2 = two.getName();</span></pre></td></tr>
+<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"><a title="Line 258: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 258: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Identifier i : dependency2.getIdentifiers()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"><a title="Line 220: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 220: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (twoParent != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//version check</span></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion version1 = DependencyVersionUtil.parseVersion(fileName1);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion version2 = DependencyVersionUtil.parseVersion(fileName2);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"><a title="Line 227: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 227: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version1 != <span class="keyword">null</span> && version2 != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"><a title="Line 228: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 228: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!version1.equals(version2)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//filename check</span></pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Matcher match1 = STARTING_TEXT_PATTERN.matcher(fileName1);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Matcher match2 = STARTING_TEXT_PATTERN.matcher(fileName2);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"><a title="Line 236: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 236: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (match1.find() && match2.find()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> match1.group().equals(match2.group());</span></pre></td></tr>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns true if the CPE identifiers in the two supplied dependencies are equal.</span></pre></td></tr>
+<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency1 a dependency2 to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency2 a dependency2 to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the identifiers in the two supplied dependencies are equal</span></pre></td></tr>
+<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> cpeIdentifiersMatch(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"><a title="Line 251: Conditional coverage 50% (4/8) [each condition: 50%, 50%, 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 251: Conditional coverage 50% (4/8) [each condition: 50%, 50%, 50%, 50%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency1.getIdentifiers() == <span class="keyword">null</span></a></span></pre></td></tr>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || dependency2 == <span class="keyword">null</span> || dependency2.getIdentifiers() == <span class="keyword">null</span>) {</pre></td></tr>
+<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 255</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> matches = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">int</span> cpeCount1 = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">int</span> cpeCount2 = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"><a title="Line 258: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 258: Conditional coverage 50% (1/2)."> <span class="keyword">for</span> (Identifier i : dependency1.getIdentifiers()) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"><a title="Line 259: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 259: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpeCount2 += 1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpeCount1 += 1;</span></pre></td></tr>
<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"><a title="Line 263: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 263: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cpeCount1 > 0 && cpeCount1 == cpeCount2) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"><a title="Line 264: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 264: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Identifier i : dependency1.getIdentifiers()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> matches |= dependency2.getIdentifiers().contains(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"><a title="Line 266: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 266: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!matches) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"><a title="Line 271: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 271: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (LogUtils.isVerboseLoggingEnabled()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IdentifiersMatch=%s (%s, %s)"</span>, matches, dependency1.getFileName(), dependency2.getFileName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyBundlingAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> matches;</span></pre></td></tr>
-<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines if the two dependencies have the same base path.</span></pre></td></tr>
-<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency1 a Dependency object</span></pre></td></tr>
-<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency2 a Dependency object</span></pre></td></tr>
-<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the base paths of the dependencies are identical</span></pre></td></tr>
-<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> hasSameBasePath(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"><a title="Line 286: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 286: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency2 == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File lFile = <span class="keyword">new</span> File(dependency1.getFilePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String left = lFile.getParent();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File rFile = <span class="keyword">new</span> File(dependency2.getFilePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String right = rFile.getParent();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"><a title="Line 293: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 293: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"><a title="Line 294: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 294: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> right == <span class="keyword">null</span>;</a></span></pre></td></tr>
-<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"><a title="Line 296: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 296: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left.equalsIgnoreCase(right)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"><a title="Line 299: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 299: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (left.matches(<span class="string">".*[/\\\\]repository[/\\\\].*"</span>) && right.matches(<span class="string">".*[/\\\\]repository[/\\\\].*"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> left = getBaseRepoPath(left);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> right = getBaseRepoPath(right);</span></pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"><a title="Line 303: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 303: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left.equalsIgnoreCase(right)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//new code</span></pre></td></tr>
-<tr> <td class="numLineCover"> 307</td> <td class="nbHitsUncovered"><a title="Line 307: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 307: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency child : dependency2.getRelatedDependencies()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"><a title="Line 308: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 308: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (hasSameBasePath(dependency1, child)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 263</td> <td class="nbHitsCovered"><a title="Line 263: Conditional coverage 100% (2/2)."> 1</a></td> <td class="src"><pre class="src"> <a title="Line 263: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Identifier i : dependency2.getIdentifiers()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"><a title="Line 264: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 264: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> cpeCount2 += 1;</pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 311</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 312</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 267</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"><a title="Line 268: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 268: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (cpeCount1 > 0 && cpeCount1 == cpeCount2) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"><a title="Line 269: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 269: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Identifier i : dependency1.getIdentifiers()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> matches |= dependency2.getIdentifiers().contains(i);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"><a title="Line 271: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 271: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!matches) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"><a title="Line 276: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 276: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (LogUtils.isVerboseLoggingEnabled()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IdentifiersMatch=%s (%s, %s)"</span>, matches, dependency1.getFileName(), dependency2.getFileName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 280</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> matches;</pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines if the two dependencies have the same base path.</span></pre></td></tr>
+<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency1 a Dependency object</span></pre></td></tr>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency2 a Dependency object</span></pre></td></tr>
+<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the base paths of the dependencies are identical</span></pre></td></tr>
+<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> hasSameBasePath(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"><a title="Line 291: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 291: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency2 == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File lFile = <span class="keyword">new</span> File(dependency1.getFilePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String left = lFile.getParent();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File rFile = <span class="keyword">new</span> File(dependency2.getFilePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String right = rFile.getParent();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"><a title="Line 298: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 298: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"><a title="Line 299: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 299: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> right == <span class="keyword">null</span>;</a></span></pre></td></tr>
+<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"><a title="Line 301: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 301: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left.equalsIgnoreCase(right)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"><a title="Line 304: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 304: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (left.matches(<span class="string">".*[/\\\\]repository[/\\\\].*"</span>) && right.matches(<span class="string">".*[/\\\\]repository[/\\\\].*"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> left = getBaseRepoPath(left);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> right = getBaseRepoPath(right);</span></pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"><a title="Line 308: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 308: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left.equalsIgnoreCase(right)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//new code</span></pre></td></tr>
+<tr> <td class="numLineCover"> 312</td> <td class="nbHitsUncovered"><a title="Line 312: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 312: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Dependency child : dependency2.getRelatedDependencies()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 313</td> <td class="nbHitsUncovered"><a title="Line 313: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 313: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (hasSameBasePath(dependency1, child)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This is likely a very broken attempt at determining if the 'left' dependency is the 'core' library in comparison</span></pre></td></tr>
-<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * to the 'right' library.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 316</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param left the dependency to test</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param right the dependency to test against</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a boolean indicating whether or not the left dependency should be considered the "core" version.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * This is likely a very broken attempt at determining if the 'left' dependency is the 'core' library in comparison</span></pre></td></tr>
<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * to the 'right' library.</span></pre></td></tr>
<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> isCore(Dependency left, Dependency right) {</pre></td></tr>
-<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String leftName = left.getFileName().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String rightName = right.getFileName().toLowerCase();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param left the dependency to test</span></pre></td></tr>
+<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param right the dependency to test against</span></pre></td></tr>
<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a boolean indicating whether or not the left dependency should be considered the "core" version.</span></pre></td></tr>
<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> isCore(Dependency left, Dependency right) {</pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String leftName = left.getFileName().toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 330</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String rightName = right.getFileName().toLowerCase();</pre></td></tr>
+<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">boolean</span> returnVal;</pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"><a title="Line 328: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 328: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (!rightName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>) && leftName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || rightName.contains(<span class="string">"core"</span>) && !leftName.contains(<span class="string">"core"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || rightName.contains(<span class="string">"kernel"</span>) && !leftName.contains(<span class="string">"kernel"</span>)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> returnVal = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"><a title="Line 332: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 332: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (rightName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>) && !leftName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || !rightName.contains(<span class="string">"core"</span>) && leftName.contains(<span class="string">"core"</span>)</pre></td></tr>
+<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"><a title="Line 333: Conditional coverage 41% (5/12) [each condition: 100%, 50%, 50%, 0%, 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 333: Conditional coverage 41% (5/12) [each condition: 100%, 50%, 50%, 0%, 50%, 0%]."> <span class="keyword">if</span> (!rightName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>) && leftName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>)</a></span></pre></td></tr>
<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || !rightName.contains(<span class="string">"kernel"</span>) && leftName.contains(<span class="string">"kernel"</span>)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> returnVal = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/*</span></pre></td></tr>
+ <td class="src"><pre class="src"> || rightName.contains(<span class="string">"core"</span>) && !leftName.contains(<span class="string">"core"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || rightName.contains(<span class="string">"kernel"</span>) && !leftName.contains(<span class="string">"kernel"</span>)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> returnVal = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 337</td> <td class="nbHitsUncovered"><a title="Line 337: Conditional coverage 58% (7/12) [each condition: 100%, 50%, 50%, 50%, 50%, 50%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 337: Conditional coverage 58% (7/12) [each condition: 100%, 50%, 50%, 50%, 50%, 50%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (rightName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>) && !leftName.matches(<span class="string">".*\\.(tar|tgz|gz|zip|ear|war).+"</span>)</a></span></pre></td></tr>
<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * considered splitting the names up and comparing the components,</span></pre></td></tr>
+ <td class="src"><pre class="src"> || !rightName.contains(<span class="string">"core"</span>) && leftName.contains(<span class="string">"core"</span>)</pre></td></tr>
<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * but decided that the file name length should be sufficient as the</span></pre></td></tr>
-<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * "core" component, if this follows a normal naming protocol should</span></pre></td></tr>
+ <td class="src"><pre class="src"> || !rightName.contains(<span class="string">"kernel"</span>) && leftName.contains(<span class="string">"kernel"</span>)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 340</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> returnVal = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * be shorter:</span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * axis2-saaj-1.4.1.jar</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/*</span></pre></td></tr>
<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * axis2-1.4.1.jar <-----</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * considered splitting the names up and comparing the components,</span></pre></td></tr>
<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * axis2-kernal-1.4.1.jar</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * but decided that the file name length should be sufficient as the</span></pre></td></tr>
<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 346</td> <td class="nbHitsUncovered"><a title="Line 346: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 346: Conditional coverage 0% (0/2)."> returnVal = leftName.length() <= rightName.length();</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * "core" component, if this follows a normal naming protocol should</span></pre></td></tr>
+<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * be shorter:</span></pre></td></tr>
<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * axis2-saaj-1.4.1.jar</span></pre></td></tr>
+<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * axis2-1.4.1.jar <-----</span></pre></td></tr>
+<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * axis2-kernel-1.4.1.jar</span></pre></td></tr>
+<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"><a title="Line 351: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 351: Conditional coverage 0% (0/2)."> returnVal = leftName.length() <= rightName.length();</a></span></pre></td></tr>
+<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 348</td> <td class="nbHitsUncovered"><a title="Line 348: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 348: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (LogUtils.isVerboseLoggingEnabled()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 349</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IsCore=%s (%s, %s)"</span>, returnVal, left.getFileName(), right.getFileName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 350</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DependencyBundlingAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINE, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> returnVal;</span></pre></td></tr>
-<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover"> 353</td> <td class="nbHitsUncovered"><a title="Line 353: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 353: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (LogUtils.isVerboseLoggingEnabled()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IsCore=%s (%s, %s)"</span>, returnVal, left.getFileName(), right.getFileName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 355</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg);</span></pre></td></tr>
<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Compares the SHA1 hashes of two dependencies to determine if they are equal.</span></pre></td></tr>
-<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 357</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> returnVal;</pre></td></tr>
<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency1 a dependency object to compare</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency2 a dependency object to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the sha1 hashes of the two dependencies match; otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> hashesMatch(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
-<tr> <td class="numLineCover"> 363</td> <td class="nbHitsUncovered"><a title="Line 363: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 363: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency2 == <span class="keyword">null</span> || dependency1.getSha1sum() == <span class="keyword">null</span> || dependency2.getSha1sum() == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 364</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> dependency1.getSha1sum().equals(dependency2.getSha1sum());</span></pre></td></tr>
-<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines if the jar is shaded and the created pom.xml identified the same CPE as the jar - if so, the pom.xml</span></pre></td></tr>
-<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * dependency should be removed.</span></pre></td></tr>
-<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Compares the SHA1 hashes of two dependencies to determine if they are equal.</span></pre></td></tr>
+<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency a dependency to check</span></pre></td></tr>
-<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param nextDependency another dependency to check</span></pre></td></tr>
-<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if on of the dependencies is a pom.xml and the identifiers between the two collections match;</span></pre></td></tr>
-<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency1 a dependency object to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency2 a dependency object to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the sha1 hashes of the two dependencies match; otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> isShadedJar(Dependency dependency, Dependency nextDependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String mainName = dependency.getFileName().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 380</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String nextName = nextDependency.getFileName().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 381</td> <td class="nbHitsUncovered"><a title="Line 381: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 381: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (mainName.endsWith(<span class="string">".jar"</span>) && nextName.endsWith(<span class="string">"pom.xml"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 382</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> dependency.getIdentifiers().containsAll(nextDependency.getIdentifiers());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 383</td> <td class="nbHitsUncovered"><a title="Line 383: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 383: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (nextName.endsWith(<span class="string">".jar"</span>) && mainName.endsWith(<span class="string">"pom.xml"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 384</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> nextDependency.getIdentifiers().containsAll(dependency.getIdentifiers());</span></pre></td></tr>
-<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> hashesMatch(Dependency dependency1, Dependency dependency2) {</pre></td></tr>
+<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"><a title="Line 368: Conditional coverage 50% (4/8) [each condition: 50%, 50%, 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 368: Conditional coverage 50% (4/8) [each condition: 50%, 50%, 50%, 50%]."> <span class="keyword">if</span> (dependency1 == <span class="keyword">null</span> || dependency2 == <span class="keyword">null</span> || dependency1.getSha1sum() == <span class="keyword">null</span> || dependency2.getSha1sum() == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 386</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 371</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dependency1.getSha1sum().equals(dependency2.getSha1sum());</pre></td></tr>
+<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines if the jar is shaded and the created pom.xml identified the same CPE as the jar - if so, the pom.xml</span></pre></td></tr>
+<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * dependency should be removed.</span></pre></td></tr>
+<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency a dependency to check</span></pre></td></tr>
+<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param nextDependency another dependency to check</span></pre></td></tr>
+<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if on of the dependencies is a pom.xml and the identifiers between the two collections match;</span></pre></td></tr>
+<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> isShadedJar(Dependency dependency, Dependency nextDependency) {</pre></td></tr>
+<tr> <td class="numLineCover"> 384</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String mainName = dependency.getFileName().toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 385</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String nextName = nextDependency.getFileName().toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 386</td> <td class="nbHitsUncovered"><a title="Line 386: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 386: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (mainName.endsWith(<span class="string">".jar"</span>) && nextName.endsWith(<span class="string">"pom.xml"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 387</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> dependency.getIdentifiers().containsAll(nextDependency.getIdentifiers());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 388</td> <td class="nbHitsUncovered"><a title="Line 388: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 388: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (nextName.endsWith(<span class="string">".jar"</span>) && mainName.endsWith(<span class="string">"pom.xml"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 389</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> nextDependency.getIdentifiers().containsAll(dependency.getIdentifiers());</span></pre></td></tr>
+<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 391</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7c78e7965..10f3d3e4f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/115</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/122</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.222222222222221;</span>8.222</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html">FalsePositiveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:57px"><span class="text">67/116</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">33%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:33px"><span class="text">41/122</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.222222222222221;</span>8.222</td></tr>
</table>
<div class="separator"> </div>
@@ -106,496 +106,499 @@
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implmentation details of Analyzer"></span></pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The name of the analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(FalsePositiveAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NAME = <span class="string">"False Positive Analyzer"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The name of the analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;</span></pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NAME = <span class="string">"False Positive Analyzer"</span>;</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the name of the analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the name of the analyzer.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the name of the analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the name of the analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the phase that the analyzer is intended to run in.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the phase that the analyzer is intended to run in.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the phase that the analyzer is intended to run in.</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the phase that the analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Analyzes the dependencies and removes bad/incorrect CPE associations based on various heuristics.</span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to analyze.</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param engine the engine that is scanning the dependencies</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException is thrown if there is an error reading the JAR file.</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> removeJreEntries(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> removeBadMatches(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> removeWrongVersionMatches(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> removeSpuriousCPE(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addFalseNegativeCPEs(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Intended to remove spurious CPE entries. By spurious we mean duplicate, less specific CPE entries.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Example:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <code></span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product:1.5</span></pre></td></tr>
-<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product:1.5.2</span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * </code></span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Should be trimmed to:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <code></span></pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product:1.5.2</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * </code></span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @SuppressWarnings(<span class="string">"null"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeSpuriousCPE(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Identifier> ids = <span class="keyword">new</span> ArrayList<Identifier>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ids.addAll(dependency.getIdentifiers());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Collections.sort(ids);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ListIterator<Identifier> mainItr = ids.listIterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"><a title="Line 114: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 114: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (mainItr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier currentId = mainItr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VulnerableSoftware currentCpe = parseCpe(currentId.getType(), currentId.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"><a title="Line 117: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 117: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (currentCpe == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ListIterator<Identifier> subItr = ids.listIterator(mainItr.nextIndex());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"><a title="Line 121: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 121: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (subItr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier nextId = subItr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VulnerableSoftware nextCpe = parseCpe(nextId.getType(), nextId.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"><a title="Line 124: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 124: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (nextCpe == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//TODO fix the version problem below</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"><a title="Line 128: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 128: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (currentCpe.getVendor().equals(nextCpe.getVendor())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"><a title="Line 129: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 129: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (currentCpe.getProduct().equals(nextCpe.getProduct())) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// see if one is contained in the other.. remove the contained one from dependency.getIdentifier</span></pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String currentVersion = currentCpe.getVersion();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String nextVersion = nextCpe.getVersion();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"><a title="Line 133: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 133: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (currentVersion == <span class="keyword">null</span> && nextVersion == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//how did we get here?</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FalsePositiveAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINE, <span class="string">"currentVersion and nextVersion are both null?"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"><a title="Line 137: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 137: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (currentVersion == <span class="keyword">null</span> && nextVersion != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(currentId);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"><a title="Line 139: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 139: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (nextVersion == <span class="keyword">null</span> && currentVersion != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(nextId);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"><a title="Line 141: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 141: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (currentVersion.length() < nextVersion.length()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"><a title="Line 142: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 142: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (nextVersion.startsWith(currentVersion) || <span class="string">"-"</span>.equals(currentVersion)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(currentId);</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"><a title="Line 146: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 146: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (currentVersion.startsWith(nextVersion) || <span class="string">"-"</span>.equals(nextVersion)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(nextId);</span></pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Regex to identify core java libraries and a few other commonly misidentified ones.</span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern CORE_JAVA = Pattern.compile(<span class="string">"^cpe:/a:(sun|oracle|ibm):(j2[ems]e|"</span></span></pre></td></tr>
-<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"java(_platfrom_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|"</span></pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"jdk|jre|jsf|jsse)($|:.*)"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Regex to identify core java library files. This is currently incomplete.</span></pre></td></tr>
-<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern CORE_FILES = Pattern.compile(<span class="string">"^((alt[-])?rt|jsf[-].*|jsse|jfxrt|jfr|jce|javaws|deploy|charsets)\\.jar$"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Removes any CPE entries for the JDK/JRE unless the filename ends with rt.jar</span></pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to remove JRE CPEs from</span></pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeJreEntries(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Identifier> identifiers = dependency.getIdentifiers();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Identifier> itr = identifiers.iterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"><a title="Line 174: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 174: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Matcher coreCPE = CORE_JAVA.matcher(i.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Matcher coreFiles = CORE_FILES.matcher(dependency.getFileName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"><a title="Line 178: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 178: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (coreCPE.matches() && !coreFiles.matches()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//replacecd with the regex above.</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// if (("cpe:/a:sun:java".equals(i.getValue())</span></pre></td></tr>
-<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:oracle:java".equals(i.getValue())</span></pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:ibm:java".equals(i.getValue())</span></pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:sun:j2se".equals(i.getValue())</span></pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:oracle:j2se".equals(i.getValue())</span></pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java:")</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:j2se:")</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java:jre")</span></pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java:jdk")</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java_se")</span></pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:java_se")</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:java:")</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:j2se:")</span></pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:jre")</span></pre></td></tr>
-<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:jdk")</span></pre></td></tr>
-<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:ibm:java:"))</span></pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// && !dependency.getFileName().toLowerCase().endsWith("rt.jar")) {</span></pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// itr.remove();</span></pre></td></tr>
-<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Parses a CPE string into an IndexEntry.</span></pre></td></tr>
-<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param type the type of identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param value the cpe identifier to parse</span></pre></td></tr>
-<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an VulnerableSoftware object constructed from the identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> VulnerableSoftware parseCpe(String type, String value) {</pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"><a title="Line 213: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 213: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!<span class="string">"cpe"</span>.equals(type)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VulnerableSoftware cpe = <span class="keyword">new</span> VulnerableSoftware();</span></pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe.parseName(value);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FalsePositiveAnalyzer.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> cpe;</span></pre></td></tr>
-<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Removes bad CPE matches for a dependency. Unfortunately, right now these are hard-coded patches for specific</span></pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * problems identified when testing this on a LARGE volume of jar files.</span></pre></td></tr>
-<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Analyzes the dependencies and removes bad/incorrect CPE associations based on various heuristics.</span></pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to analyze</span></pre></td></tr>
-<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to analyze.</span></pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param engine the engine that is scanning the dependencies</span></pre></td></tr>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException is thrown if there is an error reading the JAR file.</span></pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeBadMatches(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Identifier> identifiers = dependency.getIdentifiers();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Identifier> itr = identifiers.iterator();</span></pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> removeJreEntries(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> removeBadMatches(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> removeWrongVersionMatches(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> removeSpuriousCPE(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> addFalseNegativeCPEs(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/* TODO - can we utilize the pom's groupid and artifactId to filter??? most of</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * these are due to low quality data. Other idea would be to say any CPE</span></pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * found based on LOW confidence evidence should have a different CPE type? (this</span></pre></td></tr>
-<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * might be a better solution then just removing the URL for "best-guess" matches).</span></pre></td></tr>
-<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//Set<Evidence> groupId = dependency.getVendorEvidence().getEvidence("pom", "groupid");</span></pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//Set<Evidence> artifactId = dependency.getVendorEvidence().getEvidence("pom", "artifactid");</span></pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"><a title="Line 243: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 243: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//TODO move this startswith expression to a configuration file?</span></pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"><a title="Line 246: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 246: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"><a title="Line 247: Conditional coverage 0% (0/22) [each condition: 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 247: Conditional coverage 0% (0/22) [each condition: 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> ((i.getValue().matches(<span class="string">".*c\\+\\+.*"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:jquery:jquery"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:prototypejs:prototype"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:yahoo:yui"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:file:file"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:mozilla:mozilla"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:cvs:cvs"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:ftp:ftp"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:ssh:ssh"</span>))</pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && (dependency.getFileName().toLowerCase().endsWith(<span class="string">".jar"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || dependency.getFileName().toLowerCase().endsWith(<span class="string">"pom.xml"</span>))) {</pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"><a title="Line 259: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 259: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (i.getValue().startsWith(<span class="string">"cpe:/a:apache:maven"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && !dependency.getFileName().toLowerCase().matches(<span class="string">"maven-core-[\\d\\.]+\\.jar"</span>)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"><a title="Line 262: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 262: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (i.getValue().startsWith(<span class="string">"cpe:/a:m-core:m-core"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && !dependency.getEvidenceUsed().containsUsedString(<span class="string">"m-core"</span>)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"><a title="Line 265: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 265: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (i.getValue().startsWith(<span class="string">"cpe:/a:jboss:jboss"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && !dependency.getFileName().toLowerCase().matches(<span class="string">"jboss-[\\d\\.]+(GA)?\\.jar"</span>)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Removes CPE matches for the wrong version of a dependency. Currently, this only covers Axis 1 & 2.</span></pre></td></tr>
-<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Intended to remove spurious CPE entries. By spurious we mean duplicate, less specific CPE entries.</p></span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Example:</p></span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <code></span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product</span></pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product:1.5</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product:1.5.2</span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * </code></span></pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Should be trimmed to:</p></span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <code></span></pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * cpe:/a:some-vendor:some-product:1.5.2</span></pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * </code></span></pre></td></tr>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to analyze</span></pre></td></tr>
-<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeWrongVersionMatches(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Identifier> identifiers = dependency.getIdentifiers();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Identifier> itr = identifiers.iterator();</span></pre></td></tr>
-<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String fileName = dependency.getFileName();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"><a title="Line 283: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 283: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (fileName != <span class="keyword">null</span> && fileName.contains(<span class="string">"axis2"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"><a title="Line 284: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 284: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"><a title="Line 286: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 286: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cpe = i.getValue();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"><a title="Line 288: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 288: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (cpe != <span class="keyword">null</span> && (cpe.startsWith(<span class="string">"cpe:/a:apache:axis:"</span>) || <span class="string">"cpe:/a:apache:axis"</span>.equals(cpe))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"><a title="Line 293: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 293: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (fileName != <span class="keyword">null</span> && fileName.contains(<span class="string">"axis"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"><a title="Line 294: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 294: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"><a title="Line 296: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 296: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cpe = i.getValue();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"><a title="Line 298: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 298: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (cpe != <span class="keyword">null</span> && (cpe.startsWith(<span class="string">"cpe:/a:apache:axis2:"</span>) || <span class="string">"cpe:/a:apache:axis2"</span>.equals(cpe))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * There are some known CPE entries, specifically regarding sun and oracle products due to the acquisition and</span></pre></td></tr>
-<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * changes in product names, that based on given evidence we can add the related CPE entries to ensure a complete</span></pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * list of CVE entries.</span></pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @SuppressWarnings(<span class="string">"null"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeSpuriousCPE(Dependency dependency) {</pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<Identifier> ids = <span class="keyword">new</span> ArrayList<Identifier>();</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> ids.addAll(dependency.getIdentifiers());</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> Collections.sort(ids);</pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ListIterator<Identifier> mainItr = ids.listIterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"><a title="Line 118: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 118: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (mainItr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier currentId = mainItr.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> VulnerableSoftware currentCpe = parseCpe(currentId.getType(), currentId.getValue());</pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"><a title="Line 121: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 121: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (currentCpe == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ListIterator<Identifier> subItr = ids.listIterator(mainItr.nextIndex());</pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"><a title="Line 125: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 125: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (subItr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier nextId = subItr.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> VulnerableSoftware nextCpe = parseCpe(nextId.getType(), nextId.getValue());</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"><a title="Line 128: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 128: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (nextCpe == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//TODO fix the version problem below</span></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"><a title="Line 132: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 132: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (currentCpe.getVendor().equals(nextCpe.getVendor())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"><a title="Line 133: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 133: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (currentCpe.getProduct().equals(nextCpe.getProduct())) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// see if one is contained in the other.. remove the contained one from dependency.getIdentifier</span></pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String currentVersion = currentCpe.getVersion();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String nextVersion = nextCpe.getVersion();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"><a title="Line 137: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 137: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (currentVersion == <span class="keyword">null</span> && nextVersion == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//how did we get here?</span></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"currentVersion and nextVersion are both null?"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"><a title="Line 140: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 140: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (currentVersion == <span class="keyword">null</span> && nextVersion != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(currentId);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"><a title="Line 142: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 142: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (nextVersion == <span class="keyword">null</span> && currentVersion != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(nextId);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"><a title="Line 144: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 144: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (currentVersion.length() < nextVersion.length()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 145: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (nextVersion.startsWith(currentVersion) || <span class="string">"-"</span>.equals(currentVersion)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(currentId);</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"><a title="Line 149: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 149: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (currentVersion.startsWith(nextVersion) || <span class="string">"-"</span>.equals(nextVersion)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getIdentifiers().remove(nextId);</span></pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Regex to identify core java libraries and a few other commonly misidentified ones.</span></pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern CORE_JAVA = Pattern.compile(<span class="string">"^cpe:/a:(sun|oracle|ibm):(j2[ems]e|"</span></pre></td></tr>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"java(_platform_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|"</span></pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"jdk|jre|jsf|jsse)($|:.*)"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Regex to identify core java library files. This is currently incomplete.</span></pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern CORE_FILES = Pattern.compile(<span class="string">"^((alt[-])?rt|jsf[-].*|jsse|jfxrt|jfr|jce|javaws|deploy|charsets)\\.jar$"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Removes any CPE entries for the JDK/JRE unless the filename ends with rt.jar</span></pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to remove JRE CPEs from</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeJreEntries(Dependency dependency) {</pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<Identifier> identifiers = dependency.getIdentifiers();</pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Identifier> itr = identifiers.iterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsCovered"><a title="Line 177: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 177: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier i = itr.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Matcher coreCPE = CORE_JAVA.matcher(i.getValue());</pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Matcher coreFiles = CORE_FILES.matcher(dependency.getFileName());</pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (coreCPE.matches() && !coreFiles.matches()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//replaced with the regex above.</span></pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// if (("cpe:/a:sun:java".equals(i.getValue())</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:oracle:java".equals(i.getValue())</span></pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:ibm:java".equals(i.getValue())</span></pre></td></tr>
+<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:sun:j2se".equals(i.getValue())</span></pre></td></tr>
+<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || "cpe:/a:oracle:j2se".equals(i.getValue())</span></pre></td></tr>
+<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java:")</span></pre></td></tr>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:j2se:")</span></pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java:jre")</span></pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java:jdk")</span></pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:sun:java_se")</span></pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:java_se")</span></pre></td></tr>
+<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:java:")</span></pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:j2se:")</span></pre></td></tr>
+<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:jre")</span></pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:oracle:jdk")</span></pre></td></tr>
+<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// || i.getValue().startsWith("cpe:/a:ibm:java:"))</span></pre></td></tr>
+<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// && !dependency.getFileName().toLowerCase().endsWith("rt.jar")) {</span></pre></td></tr>
+<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// itr.remove();</span></pre></td></tr>
+<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Parses a CPE string into an IndexEntry.</span></pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param type the type of identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param value the cpe identifier to parse</span></pre></td></tr>
+<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an VulnerableSoftware object constructed from the identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> VulnerableSoftware parseCpe(String type, String value) {</pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"><a title="Line 216: Conditional coverage 50% (1/2)."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 216: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!<span class="string">"cpe"</span>.equals(type)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> VulnerableSoftware cpe = <span class="keyword">new</span> VulnerableSoftware();</pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> cpe.parseName(value);</pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> cpe;</pre></td></tr>
+<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Removes bad CPE matches for a dependency. Unfortunately, right now these are hard-coded patches for specific</span></pre></td></tr>
+<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * problems identified when testing this on a LARGE volume of jar files.</span></pre></td></tr>
+<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to analyze</span></pre></td></tr>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeBadMatches(Dependency dependency) {</pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<Identifier> identifiers = dependency.getIdentifiers();</pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Identifier> itr = identifiers.iterator();</pre></td></tr>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/* TODO - can we utilize the pom's groupid and artifactId to filter??? most of</span></pre></td></tr>
+<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * these are due to low quality data. Other idea would be to say any CPE</span></pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * found based on LOW confidence evidence should have a different CPE type? (this</span></pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * might be a better solution then just removing the URL for "best-guess" matches).</span></pre></td></tr>
+<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//Set<Evidence> groupId = dependency.getVendorEvidence().getEvidence("pom", "groupid");</span></pre></td></tr>
+<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//Set<Evidence> artifactId = dependency.getVendorEvidence().getEvidence("pom", "artifactid");</span></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"><a title="Line 246: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 246: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier i = itr.next();</pre></td></tr>
+<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//TODO move this startsWith expression to a configuration file?</span></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"><a title="Line 249: Conditional coverage 50% (1/2)."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 249: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"><a title="Line 250: Conditional coverage 54% (12/22) [each condition: 50%, 50%, 50%, 50%, 100%, 50%, 50%, 50%, 50%, 50%, 50%]."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 250: Conditional coverage 54% (12/22) [each condition: 50%, 50%, 50%, 50%, 100%, 50%, 50%, 50%, 50%, 50%, 50%]."> <span class="keyword">if</span> ((i.getValue().matches(<span class="string">".*c\\+\\+.*"</span>)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:jquery:jquery"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:prototypejs:prototype"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:yahoo:yui"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:file:file"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:mozilla:mozilla"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:cvs:cvs"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:ftp:ftp"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:ssh:ssh"</span>))</pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && (dependency.getFileName().toLowerCase().endsWith(<span class="string">".jar"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || dependency.getFileName().toLowerCase().endsWith(<span class="string">"pom.xml"</span>))) {</pre></td></tr>
+<tr> <td class="numLineCover"> 261</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> itr.remove();</pre></td></tr>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"><a title="Line 262: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 262: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (i.getValue().startsWith(<span class="string">"cpe:/a:apache:maven"</span>)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && !dependency.getFileName().toLowerCase().matches(<span class="string">"maven-core-[\\d\\.]+\\.jar"</span>)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"><a title="Line 265: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 265: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (i.getValue().startsWith(<span class="string">"cpe:/a:m-core:m-core"</span>)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && !dependency.getEvidenceUsed().containsUsedString(<span class="string">"m-core"</span>)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"><a title="Line 268: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 268: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (i.getValue().startsWith(<span class="string">"cpe:/a:jboss:jboss"</span>)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && !dependency.getFileName().toLowerCase().matches(<span class="string">"jboss-[\\d\\.]+(GA)?\\.jar"</span>)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Removes CPE matches for the wrong version of a dependency. Currently, this only covers Axis 1 & 2.</span></pre></td></tr>
+<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to analyze</span></pre></td></tr>
+<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> removeWrongVersionMatches(Dependency dependency) {</pre></td></tr>
+<tr> <td class="numLineCover"> 282</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<Identifier> identifiers = dependency.getIdentifiers();</pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Identifier> itr = identifiers.iterator();</pre></td></tr>
+<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String fileName = dependency.getFileName();</pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"><a title="Line 286: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 286: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (fileName != <span class="keyword">null</span> && fileName.contains(<span class="string">"axis2"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"><a title="Line 287: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 287: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"><a title="Line 289: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 289: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cpe = i.getValue();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"><a title="Line 291: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 291: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (cpe != <span class="keyword">null</span> && (cpe.startsWith(<span class="string">"cpe:/a:apache:axis:"</span>) || <span class="string">"cpe:/a:apache:axis"</span>.equals(cpe))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
+<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"><a title="Line 296: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 296: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (fileName != <span class="keyword">null</span> && fileName.contains(<span class="string">"axis"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"><a title="Line 297: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 297: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"><a title="Line 299: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 299: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cpe = i.getValue();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"><a title="Line 301: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 301: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (cpe != <span class="keyword">null</span> && (cpe.startsWith(<span class="string">"cpe:/a:apache:axis2:"</span>) || <span class="string">"cpe:/a:apache:axis2"</span>.equals(cpe))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 307</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * There are some known CPE entries, specifically regarding sun and oracle products due to the acquisition and</span></pre></td></tr>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * changes in product names, that based on given evidence we can add the related CPE entries to ensure a complete</span></pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * list of CVE entries.</span></pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency being analyzed</span></pre></td></tr>
+<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> addFalseNegativeCPEs(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Identifier> itr = dependency.getIdentifiers().iterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 315</td> <td class="nbHitsUncovered"><a title="Line 315: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 315: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 316</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"><a title="Line 317: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 317: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType()) && i.getValue() != <span class="keyword">null</span></a></span></pre></td></tr>
-<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && (i.getValue().startsWith(<span class="string">"cpe:/a:oracle:opensso:"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:oracle:opensso_enterprise:"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:sun:opensso_enterprise:"</span>)</pre></td></tr>
+<tr> <td class="numLineCover"> 317</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Identifier> itr = dependency.getIdentifiers().iterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"><a title="Line 318: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 318: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 319</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier i = itr.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"><a title="Line 320: Conditional coverage 50% (6/12) [each condition: 50%, 50%, 50%, 50%, 50%, 50%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 320: Conditional coverage 50% (6/12) [each condition: 50%, 50%, 50%, 50%, 50%, 50%]."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(i.getType()) && i.getValue() != <span class="keyword">null</span></a></span></pre></td></tr>
<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && (i.getValue().startsWith(<span class="string">"cpe:/a:oracle:opensso:"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:oracle:opensso_enterprise:"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:sun:opensso_enterprise:"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> || i.getValue().startsWith(<span class="string">"cpe:/a:sun:opensso:"</span>))) {</pre></td></tr>
-<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe = String.format(<span class="string">"cpe:/a:sun:opensso_enterprise:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 323</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe2 = String.format(<span class="string">"cpe:/a:oracle:opensso_enterprise:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe3 = String.format(<span class="string">"cpe:/a:sun:opensso:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe4 = String.format(<span class="string">"cpe:/a:oracle:opensso:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addIdentifier(<span class="string">"cpe"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> newCpe,</pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe = String.format(<span class="string">"cpe:/a:sun:opensso_enterprise:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe2 = String.format(<span class="string">"cpe:/a:oracle:opensso_enterprise:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe3 = String.format(<span class="string">"cpe:/a:sun:opensso:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String newCpe4 = String.format(<span class="string">"cpe:/a:oracle:opensso:%s"</span>, i.getValue().substring(22));</span></pre></td></tr>
<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe, <span class="string">"UTF-8"</span>)));</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
<tr> <td class="numLineCover"> 330</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addIdentifier(<span class="string">"cpe"</span>,</span></pre></td></tr>
<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> newCpe2,</pre></td></tr>
+ <td class="src"><pre class="src"> newCpe,</pre></td></tr>
<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe2, <span class="string">"UTF-8"</span>)));</pre></td></tr>
+ <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe, <span class="string">"UTF-8"</span>)));</pre></td></tr>
<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addIdentifier(<span class="string">"cpe"</span>,</span></pre></td></tr>
<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> newCpe3,</pre></td></tr>
+ <td class="src"><pre class="src"> newCpe2,</pre></td></tr>
<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe3, <span class="string">"UTF-8"</span>)));</pre></td></tr>
+ <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe2, <span class="string">"UTF-8"</span>)));</pre></td></tr>
<tr> <td class="numLineCover"> 336</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addIdentifier(<span class="string">"cpe"</span>,</span></pre></td></tr>
<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> newCpe4,</pre></td></tr>
+ <td class="src"><pre class="src"> newCpe3,</pre></td></tr>
<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe4, <span class="string">"UTF-8"</span>)));</pre></td></tr>
-<tr> <td class="numLineCover"> 339</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 340</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FalsePositiveAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
+ <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe3, <span class="string">"UTF-8"</span>)));</pre></td></tr>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.addIdentifier(<span class="string">"cpe"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> newCpe4,</pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> String.format(<span class="string">"http://web.nvd.nist.gov/view/vuln/search?cpe=%s"</span>, URLEncoder.encode(newCpe4, <span class="string">"UTF-8"</span>)));</pre></td></tr>
+<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 344</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 345</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 346</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 347</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 1e15aba88..e793b9c56 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html">FileNameAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">85%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:85px"><span class="text">17/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">5/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
</table>
<div class="separator"> </div>
@@ -88,7 +88,7 @@
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implmentation details of Analyzer"></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
@@ -103,7 +103,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
@@ -118,7 +118,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
@@ -135,7 +135,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
@@ -164,41 +164,41 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//strip any path information that may get added by ArchiveAnalyzer, etc.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File f = <span class="keyword">new</span> File(dependency.getFileName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String fileName = f.getName();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File f = <span class="keyword">new</span> File(dependency.getFileName());</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> String fileName = f.getName();</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//remove file extension</span></pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> pos = fileName.lastIndexOf(<span class="string">"."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"><a title="Line 81: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 81: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileName = fileName.substring(0, pos);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> pos = fileName.lastIndexOf(<span class="string">"."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"><a title="Line 81: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 81: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (pos > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> fileName = fileName.substring(0, pos);</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//add version evidence</span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion version = DependencyVersionUtil.parseVersion(fileName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> DependencyVersion version = DependencyVersionUtil.parseVersion(fileName);</pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (version != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// If the version number is just a number like 2 or 23, reduce the confidence</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// a shade. This should hopefully correct for cases like log4j.jar or</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// struts2-core.jar</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"><a title="Line 91: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 91: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version.getVersionParts() == <span class="keyword">null</span> || version.getVersionParts().size() < 2) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"><a title="Line 91: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 91: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (version.getVersionParts() == <span class="keyword">null</span> || version.getVersionParts().size() < 2) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</span></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> version.toString(), Confidence.MEDIUM);</pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> dependency.getVersionEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> version.toString(), Confidence.HIGHEST);</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> dependency.getVersionEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> fileName, Confidence.MEDIUM);</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
@@ -207,11 +207,11 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//add as vendor and product evidence</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (fileName.contains(<span class="string">"-"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (fileName.contains(<span class="string">"-"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> fileName, Confidence.HIGHEST);</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="string">"file"</span>, <span class="string">"name"</span>,</pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> fileName, Confidence.HIGHEST);</pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
@@ -224,11 +224,11 @@
<td class="src"><pre class="src"> fileName, Confidence.HIGH);</pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 e20f51fb7..0f19986a5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html
@@ -87,6 +87,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 01a322b07..c52a38243 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.HintAnalyzer.html">HintAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">76%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">23/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">71%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:71px"><span class="text">10/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
</table>
<div class="separator"> </div>
@@ -86,7 +86,7 @@
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implmentation details of Analyzer"></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
@@ -101,7 +101,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.PRE_IDENTIFIER_ANALYSIS;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.PRE_IDENTIFIER_ANALYSIS;</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
@@ -118,7 +118,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
@@ -137,7 +137,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
@@ -164,7 +164,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Evidence springTest1 = <span class="keyword">new</span> Evidence(<span class="string">"Manifest"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Evidence springTest1 = <span class="keyword">new</span> Evidence(<span class="string">"Manifest"</span>,</pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Implementation-Title"</span>,</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
@@ -173,7 +173,7 @@
<td class="src"><pre class="src"> Confidence.HIGH);</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Evidence springTest2 = <span class="keyword">new</span> Evidence(<span class="string">"Manifest"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Evidence springTest2 = <span class="keyword">new</span> Evidence(<span class="string">"Manifest"</span>,</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Implementation-Title"</span>,</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
@@ -182,7 +182,7 @@
<td class="src"><pre class="src"> Confidence.HIGH);</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Evidence springTest3 = <span class="keyword">new</span> Evidence(<span class="string">"Manifest"</span>,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Evidence springTest3 = <span class="keyword">new</span> Evidence(<span class="string">"Manifest"</span>,</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Bundle-Vendor"</span>,</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
@@ -191,44 +191,44 @@
<td class="src"><pre class="src"> Confidence.HIGH);</pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Set<Evidence> evidence = dependency.getProductEvidence().getEvidence();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"><a title="Line 92: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 92: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (evidence.contains(springTest1) || evidence.contains(springTest2)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"product"</span>, <span class="string">"springsource_spring_framework"</span>, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"vendor"</span>, <span class="string">"SpringSource"</span>, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"vendor"</span>, <span class="string">"vmware"</span>, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Set<Evidence> evidence = dependency.getProductEvidence().getEvidence();</pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"><a title="Line 92: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 92: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (evidence.contains(springTest1) || evidence.contains(springTest2)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"product"</span>, <span class="string">"springsource_spring_framework"</span>, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"vendor"</span>, <span class="string">"SpringSource"</span>, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"vendor"</span>, <span class="string">"vmware"</span>, Confidence.HIGH);</pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> evidence = dependency.getVendorEvidence().getEvidence();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"><a title="Line 99: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 99: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (evidence.contains(springTest3)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"product"</span>, <span class="string">"springsource_spring_framework"</span>, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"vendor"</span>, <span class="string">"vmware"</span>, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> evidence = dependency.getVendorEvidence().getEvidence();</pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"><a title="Line 99: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 99: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (evidence.contains(springTest3)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"product"</span>, <span class="string">"springsource_spring_framework"</span>, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="string">"hint analyzer"</span>, <span class="string">"vendor"</span>, <span class="string">"vmware"</span>, Confidence.HIGH);</pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Evidence> itr = dependency.getVendorEvidence().iterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<Evidence> newEntries = <span class="keyword">new</span> ArrayList<Evidence>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"><a title="Line 105: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 105: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Evidence e = itr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"sun"</span>.equalsIgnoreCase(e.getValue(<span class="keyword">false</span>))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Evidence> itr = dependency.getVendorEvidence().iterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<Evidence> newEntries = <span class="keyword">new</span> ArrayList<Evidence>();</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"><a title="Line 105: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 105: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 25</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Evidence e = itr.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 50% (1/2)."> 25</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"sun"</span>.equalsIgnoreCase(e.getValue(<span class="keyword">false</span>))) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Evidence newEvidence = <span class="keyword">new</span> Evidence(e.getSource() + <span class="string">" (hint)"</span>, e.getName(), <span class="string">"oracle"</span>, e.getConfidence());</span></pre></td></tr>
<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> newEntries.add(newEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"><a title="Line 110: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 110: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"oracle"</span>.equalsIgnoreCase(e.getValue(<span class="keyword">false</span>))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"><a title="Line 110: Conditional coverage 50% (1/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 110: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"oracle"</span>.equalsIgnoreCase(e.getValue(<span class="keyword">false</span>))) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Evidence newEvidence = <span class="keyword">new</span> Evidence(e.getSource() + <span class="string">" (hint)"</span>, e.getName(), <span class="string">"sun"</span>, e.getConfidence());</span></pre></td></tr>
<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> newEntries.add(newEvidence);</span></pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : newEntries) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 25</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 50% (1/2)."> <span class="keyword">for</span> (Evidence e : newEntries) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(e);</span></pre></td></tr>
<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 b465acffe..00d4eef9e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
@@ -12,8 +12,8 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/580</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/352</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.485714285714286;</span>7.486</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer$ClassNameInformation</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.485714285714286;</span>7.486</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">52%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:52px"><span class="text">300/576</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">41%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:41px"><span class="text">145/348</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.4;</span>7.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.JarAnalyzer.html">JarAnalyzer$ClassNameInformation</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">94%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:94px"><span class="text">16/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">8/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.4;</span>7.4</td></tr>
</table>
<div class="separator"> </div>
@@ -192,7 +192,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(JarAnalyzer.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(JarAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
@@ -207,21 +207,21 @@
<td class="src"><pre class="src"> <span class="comment"> * The count of directories created during analysis. This is used for creating temporary directories.</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">int</span> dirCount = 0;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">int</span> dirCount = 0;</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The system independent newline character.</span></pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String NEWLINE = System.getProperty(<span class="string">"line.separator"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String NEWLINE = System.getProperty(<span class="string">"line.separator"</span>);</pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * A list of values in the manifest to ignore as they only result in false positives.</span></pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> IGNORE_VALUES = newHashSet(</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> IGNORE_VALUES = newHashSet(</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Sun Java System Application Server"</span>);</pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
@@ -230,7 +230,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A list of elements in the manifest to ignore.</span></pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> IGNORE_KEYS = newHashSet(</span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> IGNORE_KEYS = newHashSet(</pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"built-by"</span>,</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
@@ -333,7 +333,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A pattern to detect HTML within text.</span></pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern HTML_DETECTION_PATTERN = Pattern.compile(<span class="string">"\\<[a-z]+.*/?\\>"</span>, Pattern.CASE_INSENSITIVE);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern HTML_DETECTION_PATTERN = Pattern.compile(<span class="string">"\\<[a-z]+.*/?\\>"</span>, Pattern.CASE_INSENSITIVE);</pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
@@ -352,16 +352,16 @@
<td class="src"><pre class="src"> <span class="comment"> * Constructs a new JarAnalyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> JarAnalyzer() {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">public</span> JarAnalyzer() {</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> JAXBContext jaxbContext = JAXBContext.newInstance(<span class="string">"org.owasp.dependencycheck.jaxb.pom.generated"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pomUnmarshaller = jaxbContext.createUnmarshaller();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> JAXBContext jaxbContext = JAXBContext.newInstance(<span class="string">"org.owasp.dependencycheck.jaxb.pom.generated"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> pomUnmarshaller = jaxbContext.createUnmarshaller();</pre></td></tr>
<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (JAXBException ex) { <span class="comment">//guess we will just have a null pointer exception later...</span></span></pre></td></tr>
<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, <span class="string">"Unable to load parser. See the log for more details."</span>);</span></pre></td></tr>
<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
@@ -380,14 +380,14 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The set of file extensions supported by this analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> EXTENSIONS = newHashSet(<span class="string">"jar"</span>, <span class="string">"war"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> EXTENSIONS = newHashSet(<span class="string">"jar"</span>, <span class="string">"war"</span>);</pre></td></tr>
<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
@@ -404,7 +404,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EXTENSIONS;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 852</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EXTENSIONS;</pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
@@ -423,7 +423,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
@@ -440,7 +440,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
@@ -461,7 +461,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> String getAnalyzerEnabledSettingKey() {</pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_JAR_ENABLED;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_JAR_ENABLED;</pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
@@ -488,9 +488,9 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyzeFileType(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<ClassNameInformation> classNames = collectClassNames(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String fileName = dependency.getFileName().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"><a title="Line 248: Conditional coverage 0% (0/10) [each condition: 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 248: Conditional coverage 0% (0/10) [each condition: 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (classNames.isEmpty()</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<ClassNameInformation> classNames = collectClassNames(dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String fileName = dependency.getFileName().toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"><a title="Line 248: Conditional coverage 10% (1/10) [each condition: 50%, 0%, 0%, 0%, 0%]."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 248: Conditional coverage 10% (1/10) [each condition: 50%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (classNames.isEmpty()</a></span></pre></td></tr>
<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && (fileName.endsWith(<span class="string">"-sources.jar"</span>)</pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
@@ -502,14 +502,14 @@
<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.getDependencies().remove(dependency);</span></pre></td></tr>
<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> hasManifest = parseManifest(dependency, classNames);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> hasPOM = analyzePOM(dependency, classNames, engine);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"><a title="Line 257: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 257: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">final</span> <span class="keyword">boolean</span> addPackagesAsEvidence = !(hasManifest && hasPOM);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzePackageNames(classNames, dependency, addPackagesAsEvidence);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 255</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">boolean</span> hasManifest = parseManifest(dependency, classNames);</pre></td></tr>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">boolean</span> hasPOM = analyzePOM(dependency, classNames, engine);</pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"><a title="Line 257: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 257: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">final</span> <span class="keyword">boolean</span> addPackagesAsEvidence = !(hasManifest && hasPOM);</a></pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> analyzePackageNames(classNames, dependency, addPackagesAsEvidence);</pre></td></tr>
<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(<span class="string">"Exception occurred reading the JAR file."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 261</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
@@ -534,12 +534,12 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">boolean</span> analyzePOM(Dependency dependency, ArrayList<ClassNameInformation> classes, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> foundSomething = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> foundSomething = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">final</span> JarFile jar;</pre></td></tr>
<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> jar = <span class="keyword">new</span> JarFile(dependency.getActualFilePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> jar = <span class="keyword">new</span> JarFile(dependency.getActualFilePath());</pre></td></tr>
<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to read JarFile '%s'."</span>, dependency.getActualFilePath());</span></pre></td></tr>
<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
@@ -547,12 +547,12 @@
<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> List<String> pomEntries;</pre></td></tr>
<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pomEntries = retrievePomListing(jar);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> pomEntries = retrievePomListing(jar);</pre></td></tr>
<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to read Jar file entries in '%s'."</span>, dependency.getActualFilePath());</span></pre></td></tr>
<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
@@ -560,23 +560,23 @@
<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"><a title="Line 296: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 296: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pomEntries.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"><a title="Line 296: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 296: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (pomEntries.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"><a title="Line 299: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 299: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String path : pomEntries) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Properties pomProperties = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"><a title="Line 299: Conditional coverage 100% (2/2)."> 1</a></td> <td class="src"><pre class="src"> <a title="Line 299: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String path : pomEntries) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Properties pomProperties = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pomProperties = retrievePomProperties(path, jar);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> pomProperties = retrievePomProperties(path, jar);</pre></td></tr>
<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="string">"ignore this, failed reading a non-existent pom.properties"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 306</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Model pom = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 305</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Model pom = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"><a title="Line 308: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 308: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pomEntries.size() > 1) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"><a title="Line 308: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 308: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (pomEntries.size() > 1) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//extract POM to its own directory and add it as its own dependency</span></pre></td></tr>
<tr> <td class="numLineCover"> 310</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Dependency newDependency = <span class="keyword">new</span> Dependency();</span></pre></td></tr>
@@ -605,17 +605,17 @@
<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.getDependencies().add(newDependency);</span></pre></td></tr>
<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Collections.sort(engine.getDependencies());</span></pre></td></tr>
<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pom = retrievePom(path, jar);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething |= setPomEvidence(dependency, pom, pomProperties, classes);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> pom = retrievePom(path, jar);</pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> foundSomething |= setPomEvidence(dependency, pom, pomProperties, classes);</pre></td></tr>
<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (AnalysisException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"An error occured while analyzing '%s'."</span>, dependency.getActualFilePath());</span></pre></td></tr>
<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
<tr> <td class="numLineCover"> 334</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 336</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 337</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> foundSomething;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 337</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> foundSomething;</pre></td></tr>
<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
@@ -642,16 +642,16 @@
<td class="src"><pre class="src"> justification = <span class="string">"The reader is closed by closing the zipEntry"</span>)</pre></td></tr>
<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> Properties retrievePomProperties(String path, <span class="keyword">final</span> JarFile jar) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Properties pomProperties = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String propPath = path.substring(0, path.length() - 7) + <span class="string">"pom.properies"</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 353</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ZipEntry propEntry = jar.getEntry(propPath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"><a title="Line 354: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 354: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (propEntry != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 351</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Properties pomProperties = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 352</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String propPath = path.substring(0, path.length() - 7) + <span class="string">"pom.properies"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ZipEntry propEntry = jar.getEntry(propPath);</pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"><a title="Line 354: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 354: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (propEntry != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 355</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Reader reader = <span class="keyword">new</span> InputStreamReader(jar.getInputStream(propEntry), <span class="string">"UTF-8"</span>);</span></pre></td></tr>
<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pomProperties = <span class="keyword">new</span> Properties();</span></pre></td></tr>
<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pomProperties.load(reader);</span></pre></td></tr>
<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 359</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> pomProperties;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> pomProperties;</pre></td></tr>
<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
@@ -667,22 +667,22 @@
<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return a list of pom.xml entries</span></pre></td></tr>
<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an exception reading a JarEntryf</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an exception reading a JarEntry</span></pre></td></tr>
<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> List<String> retrievePomListing(<span class="keyword">final</span> JarFile jar) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> pomEntries = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 371</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Enumeration<JarEntry> entries = jar.entries();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 372</td> <td class="nbHitsUncovered"><a title="Line 372: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 372: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (entries.hasMoreElements()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 373</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> JarEntry entry = entries.nextElement();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 374</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String entryName = (<span class="keyword">new</span> File(entry.getName())).getName().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 375</td> <td class="nbHitsUncovered"><a title="Line 375: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 375: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (!entry.isDirectory() && <span class="string">"pom.xml"</span>.equals(entryName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 376</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pomEntries.add(entry.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> pomEntries = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 371</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Enumeration<JarEntry> entries = jar.entries();</pre></td></tr>
+<tr> <td class="numLineCover"> 372</td> <td class="nbHitsCovered"><a title="Line 372: Conditional coverage 100% (2/2)."> 1848</a></td> <td class="src"><pre class="src"> <a title="Line 372: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (entries.hasMoreElements()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 373</td> <td class="nbHitsCovered"> 1843</td> <td class="src"><pre class="src"> <span class="keyword">final</span> JarEntry entry = entries.nextElement();</pre></td></tr>
+<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 1843</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String entryName = (<span class="keyword">new</span> File(entry.getName())).getName().toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 375</td> <td class="nbHitsCovered"><a title="Line 375: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 1843</a></td> <td class="src"><pre class="src"> <a title="Line 375: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (!entry.isDirectory() && <span class="string">"pom.xml"</span>.equals(entryName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 376</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> pomEntries.add(entry.getName());</pre></td></tr>
<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 378</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> pomEntries;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 378</td> <td class="nbHitsCovered"> 1843</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 379</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> pomEntries;</pre></td></tr>
<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
@@ -730,7 +730,7 @@
<tr> <td class="numLineCover"> 408</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.flush();</span></pre></td></tr>
<tr> <td class="numLineCover"> 409</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.setActualFilePath(file.getAbsolutePath());</span></pre></td></tr>
<tr> <td class="numLineCover"> 410</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 411</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"An error occured reading '%s' from '%s'."</span>, path, dependency.getFilePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 411</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"An error occurred reading '%s' from '%s'."</span>, path, dependency.getFilePath());</span></pre></td></tr>
<tr> <td class="numLineCover"> 412</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.warning(msg);</span></pre></td></tr>
<tr> <td class="numLineCover"> 413</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, <span class="string">""</span>, ex);</span></pre></td></tr>
<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
@@ -840,1355 +840,1333 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 487</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> Model retrievePom(String path, JarFile jar) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 488</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ZipEntry entry = jar.getEntry(path);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 489</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Model model = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"><a title="Line 490: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 490: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (entry != <span class="keyword">null</span>) { <span class="comment">//should never be null</span></a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 488</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ZipEntry entry = jar.getEntry(path);</pre></td></tr>
+<tr> <td class="numLineCover"> 489</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Model model = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"><a title="Line 490: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 490: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (entry != <span class="keyword">null</span>) { <span class="comment">//should never be null</span></a></span></pre></td></tr>
<tr> <td class="numLine"> 491</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 492</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> NonClosingStream stream = <span class="keyword">new</span> NonClosingStream(jar.getInputStream(entry));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 493</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputStreamReader reader = <span class="keyword">new</span> InputStreamReader(stream, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 494</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputSource xml = <span class="keyword">new</span> InputSource(reader);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 495</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXSource source = <span class="keyword">new</span> SAXSource(xml);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 496</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> model = readPom(source);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 492</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> NonClosingStream stream = <span class="keyword">new</span> NonClosingStream(jar.getInputStream(entry));</pre></td></tr>
+<tr> <td class="numLineCover"> 493</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> InputStreamReader reader = <span class="keyword">new</span> InputStreamReader(stream, <span class="string">"UTF-8"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> InputSource xml = <span class="keyword">new</span> InputSource(reader);</pre></td></tr>
+<tr> <td class="numLineCover"> 495</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> SAXSource source = <span class="keyword">new</span> SAXSource(xml);</pre></td></tr>
+<tr> <td class="numLineCover"> 496</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> model = readPom(source);</pre></td></tr>
<tr> <td class="numLineCover"> 497</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SecurityException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 498</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to parse pom '%s' in jar '%s'; invalid signature"</span>, path, jar.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 499</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger</span></pre></td></tr>
-<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getLogger(JarAnalyzer.<span class="keyword">class</span></pre></td></tr>
-<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.WARNING, msg);</pre></td></tr>
-<tr> <td class="numLineCover"> 502</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(JarAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 504</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 505</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 506</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to parse pom '%s' in jar '%s' (IO Exception)"</span>, path, jar.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 507</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 508</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 509</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 510</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 511</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unexpected error during parsing of the pom '%s' in jar '%s'"</span>, path, jar.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 512</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 513</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 514</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 515</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 499</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 500</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 501</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 502</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 503</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to parse pom '%s' in jar '%s' (IO Exception)"</span>, path, jar.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 504</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 505</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 506</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 507</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 508</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unexpected error during parsing of the pom '%s' in jar '%s'"</span>, path, jar.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 509</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 510</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 511</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 512</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 513</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 514</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> model;</pre></td></tr>
+<tr> <td class="numLine"> 515</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 516</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 517</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> model;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Retrieves the specified POM from a jar file and converts it to a Model.</span></pre></td></tr>
-<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param source the SAXSource input stream to read the POM from</span></pre></td></tr>
-<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return returns the POM object</span></pre></td></tr>
-<tr> <td class="numLine"> 525</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException is thrown if there is an exception extracting or parsing the POM</span></pre></td></tr>
-<tr> <td class="numLine"> 526</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * {@link org.owasp.dependencycheck.jaxb.pom.generated.Model} object</span></pre></td></tr>
-<tr> <td class="numLine"> 527</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 528</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 525</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> Model readPom(SAXSource source) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 529</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Model model = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 526</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Model model = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 527</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 531</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> XMLFilter filter = <span class="keyword">new</span> MavenNamespaceFilter();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 532</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParserFactory spf = SAXParserFactory.newInstance();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 533</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParser sp = spf.newSAXParser();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 534</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> XMLReader xr = sp.getXMLReader();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> filter.setParent(xr);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 536</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> JAXBElement<Model> el = pomUnmarshaller.unmarshal(source, Model.<span class="keyword">class</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 537</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> model = el.getValue();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 538</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SecurityException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 539</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 540</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 541</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 542</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SAXException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 543</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 544</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (JAXBException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 545</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 546</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 547</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 548</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 549</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> model;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 528</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> XMLFilter filter = <span class="keyword">new</span> MavenNamespaceFilter();</pre></td></tr>
+<tr> <td class="numLineCover"> 529</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> SAXParserFactory spf = SAXParserFactory.newInstance();</pre></td></tr>
+<tr> <td class="numLineCover"> 530</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> SAXParser sp = spf.newSAXParser();</pre></td></tr>
+<tr> <td class="numLineCover"> 531</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> XMLReader xr = sp.getXMLReader();</pre></td></tr>
+<tr> <td class="numLineCover"> 532</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> filter.setParent(xr);</pre></td></tr>
+<tr> <td class="numLineCover"> 533</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> JAXBElement<Model> el = pomUnmarshaller.unmarshal(source, Model.<span class="keyword">class</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 534</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> model = el.getValue();</pre></td></tr>
+<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SecurityException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 536</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 537</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 538</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 539</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SAXException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 540</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 541</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (JAXBException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 542</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 543</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 544</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 545</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> model;</pre></td></tr>
+<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 548</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 549</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 550</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 552</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 553</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Sets evidence from the pom on the supplied dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 554</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 552</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to set data on</span></pre></td></tr>
-<tr> <td class="numLine"> 556</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 553</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param pom the information from the pom</span></pre></td></tr>
-<tr> <td class="numLine"> 557</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 554</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param pomProperties the pom properties file (null if none exists)</span></pre></td></tr>
-<tr> <td class="numLine"> 558</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param classes a collection of ClassNameInformation - containing data about the fully qualified class names</span></pre></td></tr>
-<tr> <td class="numLine"> 559</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 556</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * within the JAR file being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 560</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 557</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return true if there was evidence within the pom that we could use; otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 561</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 558</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 562</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 559</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> setPomEvidence(Dependency dependency, Model pom, Properties pomProperties, ArrayList<ClassNameInformation> classes) {</pre></td></tr>
-<tr> <td class="numLineCover"> 563</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> foundSomething = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 564</td> <td class="nbHitsUncovered"><a title="Line 564: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 564: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pom == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 565</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> foundSomething;</span></pre></td></tr>
-<tr> <td class="numLine"> 566</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 560</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> foundSomething = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 561</td> <td class="nbHitsUncovered"><a title="Line 561: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 561: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (pom == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 562</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> foundSomething;</span></pre></td></tr>
+<tr> <td class="numLine"> 563</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 567</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String groupid = interpolateString(pom.getGroupId(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 568</td> <td class="nbHitsUncovered"><a title="Line 568: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 568: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid != <span class="keyword">null</span> && !groupid.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 569</td> <td class="nbHitsUncovered"><a title="Line 569: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 569: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid.startsWith(<span class="string">"org."</span>) || groupid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 570</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> groupid = groupid.substring(4);</span></pre></td></tr>
-<tr> <td class="numLine"> 571</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 564</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> String groupid = interpolateString(pom.getGroupId(), pomProperties);</pre></td></tr>
+<tr> <td class="numLineCover"> 565</td> <td class="nbHitsUncovered"><a title="Line 565: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 565: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (groupid != <span class="keyword">null</span> && !groupid.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 566</td> <td class="nbHitsUncovered"><a title="Line 566: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 566: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (groupid.startsWith(<span class="string">"org."</span>) || groupid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 567</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> groupid = groupid.substring(4);</pre></td></tr>
+<tr> <td class="numLine"> 568</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 572</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 573</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 574</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 575</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, groupid, dependency.getVendorEvidence());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 576</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, groupid, dependency.getProductEvidence());</span></pre></td></tr>
-<tr> <td class="numLine"> 577</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 569</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 570</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 571</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLineCover"> 572</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classes, groupid, dependency.getVendorEvidence());</pre></td></tr>
+<tr> <td class="numLineCover"> 573</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classes, groupid, dependency.getProductEvidence());</pre></td></tr>
+<tr> <td class="numLine"> 574</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 578</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String artifactid = interpolateString(pom.getArtifactId(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 579</td> <td class="nbHitsUncovered"><a title="Line 579: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 579: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid != <span class="keyword">null</span> && !artifactid.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 580</td> <td class="nbHitsUncovered"><a title="Line 580: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 580: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid.startsWith(<span class="string">"org."</span>) || artifactid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 581</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> artifactid = artifactid.substring(4);</span></pre></td></tr>
-<tr> <td class="numLine"> 582</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 575</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> String artifactid = interpolateString(pom.getArtifactId(), pomProperties);</pre></td></tr>
+<tr> <td class="numLineCover"> 576</td> <td class="nbHitsUncovered"><a title="Line 576: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 576: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (artifactid != <span class="keyword">null</span> && !artifactid.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 577</td> <td class="nbHitsUncovered"><a title="Line 577: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 577: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (artifactid.startsWith(<span class="string">"org."</span>) || artifactid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 578</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> artifactid = artifactid.substring(4);</span></pre></td></tr>
+<tr> <td class="numLine"> 579</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 583</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 584</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 585</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 586</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, artifactid, dependency.getVendorEvidence());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 587</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, artifactid, dependency.getProductEvidence());</span></pre></td></tr>
-<tr> <td class="numLine"> 588</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 580</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 581</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 582</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLineCover"> 583</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classes, artifactid, dependency.getVendorEvidence());</pre></td></tr>
+<tr> <td class="numLineCover"> 584</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classes, artifactid, dependency.getProductEvidence());</pre></td></tr>
+<tr> <td class="numLine"> 585</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 589</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 586</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//version</span></pre></td></tr>
-<tr> <td class="numLineCover"> 590</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String version = interpolateString(pom.getVersion(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 591</td> <td class="nbHitsUncovered"><a title="Line 591: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 591: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version != <span class="keyword">null</span> && !version.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 592</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 593</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"version"</span>, version, Confidence.HIGHEST);</span></pre></td></tr>
-<tr> <td class="numLine"> 594</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 587</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String version = interpolateString(pom.getVersion(), pomProperties);</pre></td></tr>
+<tr> <td class="numLineCover"> 588</td> <td class="nbHitsUncovered"><a title="Line 588: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 588: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (version != <span class="keyword">null</span> && !version.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 589</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 590</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"version"</span>, version, Confidence.HIGHEST);</span></pre></td></tr>
+<tr> <td class="numLine"> 591</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 595</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// org name</span></pre></td></tr>
-<tr> <td class="numLineCover"> 596</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Organization org = pom.getOrganization();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 597</td> <td class="nbHitsUncovered"><a title="Line 597: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 597: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (org != <span class="keyword">null</span> && org.getName() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 598</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 599</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String orgName = interpolateString(org.getName(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 600</td> <td class="nbHitsUncovered"><a title="Line 600: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 600: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (orgName != <span class="keyword">null</span> && !orgName.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 601</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"organization name"</span>, orgName, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 602</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, orgName, dependency.getVendorEvidence());</span></pre></td></tr>
-<tr> <td class="numLine"> 603</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 593</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Organization org = pom.getOrganization();</pre></td></tr>
+<tr> <td class="numLineCover"> 594</td> <td class="nbHitsUncovered"><a title="Line 594: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 594: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (org != <span class="keyword">null</span> && org.getName() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 595</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 596</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String orgName = interpolateString(org.getName(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 597</td> <td class="nbHitsUncovered"><a title="Line 597: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 597: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (orgName != <span class="keyword">null</span> && !orgName.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 598</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"organization name"</span>, orgName, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 599</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, orgName, dependency.getVendorEvidence());</span></pre></td></tr>
+<tr> <td class="numLine"> 600</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 604</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 601</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 605</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 602</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//pom name</span></pre></td></tr>
-<tr> <td class="numLineCover"> 606</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String pomName = interpolateString(pom.getName(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 607</td> <td class="nbHitsUncovered"><a title="Line 607: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 607: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pomName != <span class="keyword">null</span> && !pomName.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 608</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 609</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 610</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 611</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, pomName, dependency.getVendorEvidence());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 612</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, pomName, dependency.getProductEvidence());</span></pre></td></tr>
-<tr> <td class="numLine"> 613</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 603</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String pomName = interpolateString(pom.getName(), pomProperties);</pre></td></tr>
+<tr> <td class="numLineCover"> 604</td> <td class="nbHitsUncovered"><a title="Line 604: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 604: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (pomName != <span class="keyword">null</span> && !pomName.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 605</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 606</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 607</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 608</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classes, pomName, dependency.getVendorEvidence());</pre></td></tr>
+<tr> <td class="numLineCover"> 609</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classes, pomName, dependency.getProductEvidence());</pre></td></tr>
+<tr> <td class="numLine"> 610</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 614</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 611</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 615</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 612</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//Description</span></pre></td></tr>
-<tr> <td class="numLineCover"> 616</td> <td class="nbHitsUncovered"><a title="Line 616: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 616: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pom.getDescription() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 617</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 618</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String description = interpolateString(pom.getDescription(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 619</td> <td class="nbHitsUncovered"><a title="Line 619: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 619: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (description != <span class="keyword">null</span> && !description.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 620</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String trimmedDescription = addDescription(dependency, description, <span class="string">"pom"</span>, <span class="string">"description"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 621</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, trimmedDescription, dependency.getVendorEvidence());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 622</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, trimmedDescription, dependency.getProductEvidence());</span></pre></td></tr>
-<tr> <td class="numLine"> 623</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 613</td> <td class="nbHitsUncovered"><a title="Line 613: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 613: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (pom.getDescription() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 614</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 615</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String description = interpolateString(pom.getDescription(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 616</td> <td class="nbHitsUncovered"><a title="Line 616: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 616: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (description != <span class="keyword">null</span> && !description.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 617</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String trimmedDescription = addDescription(dependency, description, <span class="string">"pom"</span>, <span class="string">"description"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 618</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, trimmedDescription, dependency.getVendorEvidence());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 619</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classes, trimmedDescription, dependency.getProductEvidence());</span></pre></td></tr>
+<tr> <td class="numLine"> 620</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 624</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 621</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 625</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractLicense(pom, pomProperties, dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 626</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> foundSomething;</span></pre></td></tr>
-<tr> <td class="numLine"> 627</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 622</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> extractLicense(pom, pomProperties, dependency);</pre></td></tr>
+<tr> <td class="numLineCover"> 623</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> foundSomething;</pre></td></tr>
+<tr> <td class="numLine"> 624</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 628</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 625</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 629</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 626</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 630</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 627</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Analyzes the path information of the classes contained within the JarAnalyzer to try and determine possible</span></pre></td></tr>
-<tr> <td class="numLine"> 631</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 628</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * vendor or product names. If any are found they are stored in the packageVendor and packageProduct hashSets.</span></pre></td></tr>
-<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 629</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 630</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param classNames a list of class names</span></pre></td></tr>
-<tr> <td class="numLine"> 634</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 631</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency a dependency to analyze</span></pre></td></tr>
-<tr> <td class="numLine"> 635</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param addPackagesAsEvidence a flag indicating whether or not package names should be added as evidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 636</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 637</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 634</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> analyzePackageNames(ArrayList<ClassNameInformation> classNames,</pre></td></tr>
-<tr> <td class="numLine"> 638</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 635</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Dependency dependency, <span class="keyword">boolean</span> addPackagesAsEvidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 639</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> HashMap<String, Integer> vendorIdentifiers = <span class="keyword">new</span> HashMap<String, Integer>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 640</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> HashMap<String, Integer> productIdentifiers = <span class="keyword">new</span> HashMap<String, Integer>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 641</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);</span></pre></td></tr>
-<tr> <td class="numLine"> 642</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 636</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> HashMap<String, Integer> vendorIdentifiers = <span class="keyword">new</span> HashMap<String, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 637</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> HashMap<String, Integer> productIdentifiers = <span class="keyword">new</span> HashMap<String, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 638</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);</pre></td></tr>
+<tr> <td class="numLine"> 639</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 643</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> classCount = classNames.size();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 644</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EvidenceCollection vendor = dependency.getVendorEvidence();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 645</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EvidenceCollection product = dependency.getProductEvidence();</span></pre></td></tr>
-<tr> <td class="numLine"> 646</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 640</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> classCount = classNames.size();</pre></td></tr>
+<tr> <td class="numLineCover"> 641</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> EvidenceCollection vendor = dependency.getVendorEvidence();</pre></td></tr>
+<tr> <td class="numLineCover"> 642</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> EvidenceCollection product = dependency.getProductEvidence();</pre></td></tr>
+<tr> <td class="numLine"> 643</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 647</td> <td class="nbHitsUncovered"><a title="Line 647: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 647: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 648</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">float</span> ratio = entry.getValue() / (<span class="keyword">float</span>) classCount;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 649</td> <td class="nbHitsUncovered"><a title="Line 649: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 649: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ratio > 0.5) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 650</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 644</td> <td class="nbHitsCovered"><a title="Line 644: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 644: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 645</td> <td class="nbHitsCovered"> 48</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">float</span> ratio = entry.getValue() / (<span class="keyword">float</span>) classCount;</pre></td></tr>
+<tr> <td class="numLineCover"> 646</td> <td class="nbHitsCovered"><a title="Line 646: Conditional coverage 100% (2/2)."> 48</a></td> <td class="src"><pre class="src"> <a title="Line 646: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (ratio > 0.5) {</a></pre></td></tr>
+<tr> <td class="numLine"> 647</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//TODO remove weighting</span></pre></td></tr>
-<tr> <td class="numLineCover"> 651</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendor.addWeighting(entry.getKey());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 652</td> <td class="nbHitsUncovered"><a title="Line 652: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 652: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (addPackagesAsEvidence && entry.getKey().length() > 1) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 653</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendor.addEvidence(<span class="string">"jar"</span>, <span class="string">"package"</span>, entry.getKey(), Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 654</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 648</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> vendor.addWeighting(entry.getKey());</pre></td></tr>
+<tr> <td class="numLineCover"> 649</td> <td class="nbHitsUncovered"><a title="Line 649: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 649: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (addPackagesAsEvidence && entry.getKey().length() > 1) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 650</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> vendor.addEvidence(<span class="string">"jar"</span>, <span class="string">"package"</span>, entry.getKey(), Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLine"> 651</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 655</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 652</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 656</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 657</td> <td class="nbHitsUncovered"><a title="Line 657: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 657: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 658</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">float</span> ratio = entry.getValue() / (<span class="keyword">float</span>) classCount;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 659</td> <td class="nbHitsUncovered"><a title="Line 659: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 659: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ratio > 0.5) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 660</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> product.addWeighting(entry.getKey());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 661</td> <td class="nbHitsUncovered"><a title="Line 661: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 661: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (addPackagesAsEvidence && entry.getKey().length() > 1) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 662</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> product.addEvidence(<span class="string">"jar"</span>, <span class="string">"package"</span>, entry.getKey(), Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 663</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 653</td> <td class="nbHitsCovered"> 48</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 654</td> <td class="nbHitsCovered"><a title="Line 654: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 654: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 655</td> <td class="nbHitsCovered"> 985</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">float</span> ratio = entry.getValue() / (<span class="keyword">float</span>) classCount;</pre></td></tr>
+<tr> <td class="numLineCover"> 656</td> <td class="nbHitsCovered"><a title="Line 656: Conditional coverage 100% (2/2)."> 985</a></td> <td class="src"><pre class="src"> <a title="Line 656: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (ratio > 0.5) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 657</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> product.addWeighting(entry.getKey());</pre></td></tr>
+<tr> <td class="numLineCover"> 658</td> <td class="nbHitsUncovered"><a title="Line 658: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 658: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (addPackagesAsEvidence && entry.getKey().length() > 1) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 659</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> product.addEvidence(<span class="string">"jar"</span>, <span class="string">"package"</span>, entry.getKey(), Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLine"> 660</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 661</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 662</td> <td class="nbHitsCovered"> 985</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 663</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 664</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 665</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 666</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 667</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 668</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 665</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 669</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 666</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 670</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 667</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Reads the manifest from the JAR file and collects the entries. Some vendorKey entries are:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 671</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 668</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <ul><li>Implementation Title</li></span></pre></td></tr>
-<tr> <td class="numLine"> 672</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 669</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <li>Implementation Version</li> <li>Implementation Vendor</li></span></pre></td></tr>
-<tr> <td class="numLine"> 673</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 670</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <li>Implementation VendorId</li> <li>Bundle Name</li> <li>Bundle Version</li> <li>Bundle Vendor</li> <li>Bundle</span></pre></td></tr>
-<tr> <td class="numLine"> 674</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 671</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Description</li> <li>Main Class</li> </ul></span></pre></td></tr>
-<tr> <td class="numLine"> 675</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 672</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * However, all but a handful of specific entries are read in.</span></pre></td></tr>
-<tr> <td class="numLine"> 676</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 673</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 677</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 674</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency A reference to the dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 678</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 675</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param classInformation a collection of class information</span></pre></td></tr>
-<tr> <td class="numLine"> 679</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 676</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return whether evidence was identified parsing the manifest</span></pre></td></tr>
-<tr> <td class="numLine"> 680</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 677</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws IOException if there is an issue reading the JAR file</span></pre></td></tr>
-<tr> <td class="numLine"> 681</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 678</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 682</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 679</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">boolean</span> parseManifest(Dependency dependency, ArrayList<ClassNameInformation> classInformation) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 683</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> foundSomething = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 684</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> JarFile jar = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 685</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 680</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> foundSomething = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 681</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> JarFile jar = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 682</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 686</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> jar = <span class="keyword">new</span> JarFile(dependency.getActualFilePath());</span></pre></td></tr>
-<tr> <td class="numLine"> 687</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 683</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> jar = <span class="keyword">new</span> JarFile(dependency.getActualFilePath());</pre></td></tr>
+<tr> <td class="numLine"> 684</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 688</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Manifest manifest = jar.getManifest();</span></pre></td></tr>
-<tr> <td class="numLine"> 689</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 685</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Manifest manifest = jar.getManifest();</pre></td></tr>
+<tr> <td class="numLine"> 686</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 690</td> <td class="nbHitsUncovered"><a title="Line 690: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 690: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (manifest == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 691</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 687</td> <td class="nbHitsUncovered"><a title="Line 687: Conditional coverage 50% (1/2)."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 687: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (manifest == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 688</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//don't log this for javadoc or sources jar files</span></pre></td></tr>
-<tr> <td class="numLineCover"> 692</td> <td class="nbHitsUncovered"><a title="Line 692: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 692: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (!dependency.getFileName().toLowerCase().endsWith(<span class="string">"-sources.jar"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 693</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 689</td> <td class="nbHitsUncovered"><a title="Line 689: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 689: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (!dependency.getFileName().toLowerCase().endsWith(<span class="string">"-sources.jar"</span>)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 690</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !dependency.getFileName().toLowerCase().endsWith(<span class="string">"-javadoc.jar"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 694</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 691</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !dependency.getFileName().toLowerCase().endsWith(<span class="string">"-src.jar"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 695</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 692</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !dependency.getFileName().toLowerCase().endsWith(<span class="string">"-doc.jar"</span>)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 696</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(JarAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 697</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.INFO,</pre></td></tr>
-<tr> <td class="numLine"> 698</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String.format(<span class="string">"Jar file '%s' does not contain a manifest."</span>,</pre></td></tr>
-<tr> <td class="numLine"> 699</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> dependency.getFileName()));</pre></td></tr>
-<tr> <td class="numLine"> 700</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 693</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.INFO,</span></pre></td></tr>
+<tr> <td class="numLine"> 694</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> String.format(<span class="string">"Jar file '%s' does not contain a manifest."</span>,</pre></td></tr>
+<tr> <td class="numLine"> 695</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> dependency.getFileName()));</pre></td></tr>
+<tr> <td class="numLine"> 696</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 701</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 702</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 697</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 698</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 703</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Attributes atts = manifest.getMainAttributes();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 699</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Attributes atts = manifest.getMainAttributes();</pre></td></tr>
+<tr> <td class="numLine"> 700</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 701</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> EvidenceCollection vendorEvidence = dependency.getVendorEvidence();</pre></td></tr>
+<tr> <td class="numLineCover"> 702</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> EvidenceCollection productEvidence = dependency.getProductEvidence();</pre></td></tr>
+<tr> <td class="numLineCover"> 703</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> EvidenceCollection versionEvidence = dependency.getVersionEvidence();</pre></td></tr>
<tr> <td class="numLine"> 704</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 705</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EvidenceCollection vendorEvidence = dependency.getVendorEvidence();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 706</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EvidenceCollection productEvidence = dependency.getProductEvidence();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 707</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EvidenceCollection versionEvidence = dependency.getVersionEvidence();</span></pre></td></tr>
-<tr> <td class="numLine"> 708</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 705</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String source = <span class="string">"Manifest"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 706</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 709</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String source = <span class="string">"Manifest"</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 710</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 711</td> <td class="nbHitsUncovered"><a title="Line 711: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 711: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Entry<Object, Object> entry : atts.entrySet()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 712</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String key = entry.getKey().toString();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 713</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String value = atts.getValue(key);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 714</td> <td class="nbHitsUncovered"><a title="Line 714: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 714: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (HTML_DETECTION_PATTERN.matcher(value).find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 715</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = Jsoup.parse(value).text();</span></pre></td></tr>
-<tr> <td class="numLine"> 716</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 707</td> <td class="nbHitsCovered"><a title="Line 707: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 707: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Entry<Object, Object> entry : atts.entrySet()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 708</td> <td class="nbHitsCovered"> 65</td> <td class="src"><pre class="src"> String key = entry.getKey().toString();</pre></td></tr>
+<tr> <td class="numLineCover"> 709</td> <td class="nbHitsCovered"> 65</td> <td class="src"><pre class="src"> String value = atts.getValue(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 710</td> <td class="nbHitsUncovered"><a title="Line 710: Conditional coverage 50% (1/2)."> 65</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 710: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (HTML_DETECTION_PATTERN.matcher(value).find()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 711</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = Jsoup.parse(value).text();</span></pre></td></tr>
+<tr> <td class="numLine"> 712</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 717</td> <td class="nbHitsUncovered"><a title="Line 717: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 717: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (IGNORE_VALUES.contains(value)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 718</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 719</td> <td class="nbHitsUncovered"><a title="Line 719: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 719: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 720</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 721</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productEvidence.addEvidence(source, key, value, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 722</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, productEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 723</td> <td class="nbHitsUncovered"><a title="Line 723: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 723: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 724</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 725</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, value, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 726</td> <td class="nbHitsUncovered"><a title="Line 726: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 726: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 713</td> <td class="nbHitsUncovered"><a title="Line 713: Conditional coverage 50% (1/2)."> 65</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 713: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (IGNORE_VALUES.contains(value)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 714</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 715</td> <td class="nbHitsCovered"><a title="Line 715: Conditional coverage 100% (2/2)."> 65</a></td> <td class="src"><pre class="src"> <a title="Line 715: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 716</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 717</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> productEvidence.addEvidence(source, key, value, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 718</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, productEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 719</td> <td class="nbHitsCovered"><a title="Line 719: Conditional coverage 100% (2/2)."> 64</a></td> <td class="src"><pre class="src"> <a title="Line 719: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 720</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 721</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> versionEvidence.addEvidence(source, key, value, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 722</td> <td class="nbHitsCovered"><a title="Line 722: Conditional coverage 100% (2/2)."> 62</a></td> <td class="src"><pre class="src"> <a title="Line 722: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 723</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 724</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 725</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, vendorEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 726</td> <td class="nbHitsUncovered"><a title="Line 726: Conditional coverage 50% (1/2)."> 61</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 726: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 727</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 728</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 728</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
<tr> <td class="numLineCover"> 729</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 730</td> <td class="nbHitsUncovered"><a title="Line 730: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 730: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 731</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 732</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 733</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 734</td> <td class="nbHitsUncovered"><a title="Line 734: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 734: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_DESCRIPTION)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 735</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 736</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addDescription(dependency, value, <span class="string">"manifest"</span>, key);</span></pre></td></tr>
-<tr> <td class="numLine"> 737</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 730</td> <td class="nbHitsCovered"><a title="Line 730: Conditional coverage 100% (2/2)."> 61</a></td> <td class="src"><pre class="src"> <a title="Line 730: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_DESCRIPTION)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 731</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 732</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> addDescription(dependency, value, <span class="string">"manifest"</span>, key);</pre></td></tr>
+<tr> <td class="numLine"> 733</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 738</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, productEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 739</td> <td class="nbHitsUncovered"><a title="Line 739: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 739: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_NAME)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 740</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 741</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 742</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, productEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 743</td> <td class="nbHitsUncovered"><a title="Line 743: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 743: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_VENDOR)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 744</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 745</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 746</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 747</td> <td class="nbHitsUncovered"><a title="Line 747: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 747: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_VERSION)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 748</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 749</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, value, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 750</td> <td class="nbHitsUncovered"><a title="Line 750: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 750: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.MAIN_CLASS.toString())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 751</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 752</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 734</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, productEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 735</td> <td class="nbHitsCovered"><a title="Line 735: Conditional coverage 100% (2/2)."> 59</a></td> <td class="src"><pre class="src"> <a title="Line 735: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_NAME)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 736</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 737</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</pre></td></tr>
+<tr> <td class="numLineCover"> 738</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, productEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 739</td> <td class="nbHitsCovered"><a title="Line 739: Conditional coverage 100% (2/2)."> 56</a></td> <td class="src"><pre class="src"> <a title="Line 739: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_VENDOR)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 740</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 741</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 742</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, vendorEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 743</td> <td class="nbHitsCovered"><a title="Line 743: Conditional coverage 100% (2/2)."> 53</a></td> <td class="src"><pre class="src"> <a title="Line 743: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(BUNDLE_VERSION)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 744</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 745</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> versionEvidence.addEvidence(source, key, value, Confidence.HIGH);</pre></td></tr>
+<tr> <td class="numLineCover"> 746</td> <td class="nbHitsCovered"><a title="Line 746: Conditional coverage 100% (2/2)."> 50</a></td> <td class="src"><pre class="src"> <a title="Line 746: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equalsIgnoreCase(Attributes.Name.MAIN_CLASS.toString())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 747</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
+<tr> <td class="numLine"> 748</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//skipping main class as if this has important information to add</span></pre></td></tr>
-<tr> <td class="numLine"> 753</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 749</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// it will be added during class name analysis... if other fields</span></pre></td></tr>
-<tr> <td class="numLine"> 754</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 750</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// have the information from the class name then they will get added...</span></pre></td></tr>
-<tr> <td class="numLine"> 755</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 751</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// foundSomething = true;</span></pre></td></tr>
-<tr> <td class="numLine"> 756</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 752</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLine"> 757</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 753</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLine"> 758</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 754</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
-<tr> <td class="numLine"> 759</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 755</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// addMatchingValues(classInformation, value, productEvidence);</span></pre></td></tr>
-<tr> <td class="numLine"> 760</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 756</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 761</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> key = key.toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLine"> 762</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 757</td> <td class="nbHitsCovered"> 48</td> <td class="src"><pre class="src"> key = key.toLowerCase();</pre></td></tr>
+<tr> <td class="numLine"> 758</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 763</td> <td class="nbHitsUncovered"><a title="Line 763: Conditional coverage 0% (0/20) [each condition: 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 763: Conditional coverage 0% (0/20) [each condition: 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (!IGNORE_KEYS.contains(key)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 764</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 759</td> <td class="nbHitsUncovered"><a title="Line 759: Conditional coverage 65% (13/20) [each condition: 100%, 50%, 100%, 50%, 50%, 50%, 50%, 50%, 50%, 100%]."> 48</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 759: Conditional coverage 65% (13/20) [each condition: 100%, 50%, 100%, 50%, 50%, 50%, 50%, 50%, 50%, 100%]."> <span class="keyword">if</span> (!IGNORE_KEYS.contains(key)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 760</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !key.endsWith(<span class="string">"jdk"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 765</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 761</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !key.contains(<span class="string">"lastmodified"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 766</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 762</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !key.endsWith(<span class="string">"package"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 767</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 763</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !key.endsWith(<span class="string">"classpath"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 768</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 764</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !key.endsWith(<span class="string">"class-path"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 769</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 765</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !key.endsWith(<span class="string">"-scm"</span>) <span class="comment">//todo change this to a regex?</span></pre></td></tr>
-<tr> <td class="numLine"> 770</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 766</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !key.startsWith(<span class="string">"scm-"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 771</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 767</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !isImportPackage(key, value)</pre></td></tr>
-<tr> <td class="numLine"> 772</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 768</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && !isPackage(key, value)) {</pre></td></tr>
-<tr> <td class="numLine"> 773</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 769</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 774</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> foundSomething = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 775</td> <td class="nbHitsUncovered"><a title="Line 775: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 775: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"version"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 776</td> <td class="nbHitsUncovered"><a title="Line 776: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 776: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"specification"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 777</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, value, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 778</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 770</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> foundSomething = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 771</td> <td class="nbHitsCovered"><a title="Line 771: Conditional coverage 100% (2/2)."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 771: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"version"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 772</td> <td class="nbHitsUncovered"><a title="Line 772: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 772: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"specification"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 773</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> versionEvidence.addEvidence(source, key, value, Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLine"> 774</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 779</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLine"> 780</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 775</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
+<tr> <td class="numLine"> 776</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 781</td> <td class="nbHitsUncovered"><a title="Line 781: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 781: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"build-id"</span>.equals(key)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 782</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> pos = value.indexOf(<span class="string">'('</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 777</td> <td class="nbHitsUncovered"><a title="Line 777: Conditional coverage 50% (1/2)."> 13</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 777: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"build-id"</span>.equals(key)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 778</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> pos = value.indexOf(<span class="string">'('</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 779</td> <td class="nbHitsUncovered"><a title="Line 779: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 779: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos >= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 780</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = value.substring(0, pos - 1);</span></pre></td></tr>
+<tr> <td class="numLine"> 781</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 782</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = value.indexOf(<span class="string">'['</span>);</span></pre></td></tr>
<tr> <td class="numLineCover"> 783</td> <td class="nbHitsUncovered"><a title="Line 783: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 783: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos >= 0) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 784</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = value.substring(0, pos - 1);</span></pre></td></tr>
<tr> <td class="numLine"> 785</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 786</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = value.indexOf(<span class="string">'['</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 787</td> <td class="nbHitsUncovered"><a title="Line 787: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 787: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos >= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 788</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = value.substring(0, pos - 1);</span></pre></td></tr>
-<tr> <td class="numLine"> 789</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 790</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 791</td> <td class="nbHitsUncovered"><a title="Line 791: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 791: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"title"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 792</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 793</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, productEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 794</td> <td class="nbHitsUncovered"><a title="Line 794: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 794: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"vendor"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 795</td> <td class="nbHitsUncovered"><a title="Line 795: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 795: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"specification"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 796</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 797</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 786</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 787</td> <td class="nbHitsUncovered"><a title="Line 787: Conditional coverage 100% (2/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 787: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"title"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 788</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</pre></td></tr>
+<tr> <td class="numLineCover"> 789</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, productEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 790</td> <td class="nbHitsUncovered"><a title="Line 790: Conditional coverage 50% (1/2)."> 12</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 790: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"vendor"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 791</td> <td class="nbHitsUncovered"><a title="Line 791: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 791: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"specification"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 792</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLine"> 793</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 798</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 799</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
-<tr> <td class="numLine"> 800</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 794</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 795</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
+<tr> <td class="numLine"> 796</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 801</td> <td class="nbHitsUncovered"><a title="Line 801: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 801: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"name"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 802</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 803</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 804</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 805</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, productEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 806</td> <td class="nbHitsUncovered"><a title="Line 806: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 806: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"license"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 807</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addLicense(dependency, value);</span></pre></td></tr>
-<tr> <td class="numLine"> 808</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 797</td> <td class="nbHitsCovered"><a title="Line 797: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 797: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"name"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 798</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</pre></td></tr>
+<tr> <td class="numLineCover"> 799</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);</pre></td></tr>
+<tr> <td class="numLineCover"> 800</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, vendorEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 801</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, productEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 802</td> <td class="nbHitsCovered"><a title="Line 802: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 802: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.contains(<span class="string">"license"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 803</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> addLicense(dependency, value);</pre></td></tr>
+<tr> <td class="numLine"> 804</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 809</td> <td class="nbHitsUncovered"><a title="Line 809: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 809: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"description"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 810</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addDescription(dependency, value, <span class="string">"manifest"</span>, key);</span></pre></td></tr>
-<tr> <td class="numLine"> 811</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 805</td> <td class="nbHitsUncovered"><a title="Line 805: Conditional coverage 50% (1/2)."> 7</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 805: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"description"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 806</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addDescription(dependency, value, <span class="string">"manifest"</span>, key);</span></pre></td></tr>
+<tr> <td class="numLine"> 807</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 812</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productEvidence.addEvidence(source, key, value, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 813</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence.addEvidence(source, key, value, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 814</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, vendorEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 815</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addMatchingValues(classInformation, value, productEvidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 816</td> <td class="nbHitsUncovered"><a title="Line 816: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 816: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value.matches(<span class="string">".*\\d.*"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 817</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringTokenizer tokenizer = <span class="keyword">new</span> StringTokenizer(value, <span class="string">" "</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 818</td> <td class="nbHitsUncovered"><a title="Line 818: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 818: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (tokenizer.hasMoreElements()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 819</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String s = tokenizer.nextToken();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 820</td> <td class="nbHitsUncovered"><a title="Line 820: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 820: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (s.matches(<span class="string">"^[0-9.]+$"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 821</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence.addEvidence(source, key, s, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 822</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 808</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> productEvidence.addEvidence(source, key, value, Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLineCover"> 809</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> vendorEvidence.addEvidence(source, key, value, Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLineCover"> 810</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, vendorEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 811</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> addMatchingValues(classInformation, value, productEvidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 812</td> <td class="nbHitsCovered"><a title="Line 812: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 812: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (value.matches(<span class="string">".*\\d.*"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 813</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringTokenizer tokenizer = <span class="keyword">new</span> StringTokenizer(value, <span class="string">" "</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 814</td> <td class="nbHitsCovered"><a title="Line 814: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 814: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (tokenizer.hasMoreElements()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 815</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String s = tokenizer.nextToken();</pre></td></tr>
+<tr> <td class="numLineCover"> 816</td> <td class="nbHitsCovered"><a title="Line 816: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 816: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (s.matches(<span class="string">"^[0-9.]+$"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 817</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> versionEvidence.addEvidence(source, key, s, Confidence.LOW);</pre></td></tr>
+<tr> <td class="numLine"> 818</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 823</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 824</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 819</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 820</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 825</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 821</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 826</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 822</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 827</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 823</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 828</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 824</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 829</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 830</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 825</td> <td class="nbHitsCovered"> 63</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 826</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 831</td> <td class="nbHitsUncovered"><a title="Line 831: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 831: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (jar != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 832</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> jar.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 827</td> <td class="nbHitsUncovered"><a title="Line 827: Conditional coverage 50% (1/2)."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 827: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (jar != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 828</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> jar.close();</pre></td></tr>
+<tr> <td class="numLine"> 829</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 830</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 831</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> foundSomething;</pre></td></tr>
+<tr> <td class="numLine"> 832</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 833</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 834</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 835</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> foundSomething;</span></pre></td></tr>
-<tr> <td class="numLine"> 836</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 837</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 838</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 839</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 835</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Adds a description to the given dependency. If the description contains one of the following strings beyond 100</span></pre></td></tr>
-<tr> <td class="numLine"> 840</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 836</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * characters, then the description used will be trimmed to that position:</span></pre></td></tr>
-<tr> <td class="numLine"> 841</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 837</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <ul><li>"such as"</li><li>"like "</li><li>"will use "</li><li>"* uses "</li></ul></span></pre></td></tr>
-<tr> <td class="numLine"> 842</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 838</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 843</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 839</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency a dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 844</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 840</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param description the description</span></pre></td></tr>
-<tr> <td class="numLine"> 845</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 841</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param source the source of the evidence</span></pre></td></tr>
-<tr> <td class="numLine"> 846</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 842</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param key the "name" of the evidence</span></pre></td></tr>
-<tr> <td class="numLine"> 847</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 843</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return if the description is trimmed, the trimmed version is returned; otherwise the original description is</span></pre></td></tr>
-<tr> <td class="numLine"> 848</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 844</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * returned</span></pre></td></tr>
-<tr> <td class="numLine"> 849</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 845</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 850</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 846</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> String addDescription(Dependency dependency, String description, String source, String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 851</td> <td class="nbHitsUncovered"><a title="Line 851: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 851: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (dependency.getDescription() == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 852</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.setDescription(description);</span></pre></td></tr>
-<tr> <td class="numLine"> 853</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 847</td> <td class="nbHitsUncovered"><a title="Line 847: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 847: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (dependency.getDescription() == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 848</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.setDescription(description);</pre></td></tr>
+<tr> <td class="numLine"> 849</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 854</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 850</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> String desc;</pre></td></tr>
-<tr> <td class="numLineCover"> 855</td> <td class="nbHitsUncovered"><a title="Line 855: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 855: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (HTML_DETECTION_PATTERN.matcher(description).find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 856</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> desc = Jsoup.parse(description).text();</span></pre></td></tr>
-<tr> <td class="numLine"> 857</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 851</td> <td class="nbHitsUncovered"><a title="Line 851: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 851: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (HTML_DETECTION_PATTERN.matcher(description).find()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 852</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> desc = Jsoup.parse(description).text();</span></pre></td></tr>
+<tr> <td class="numLine"> 853</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 858</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> desc = description;</span></pre></td></tr>
-<tr> <td class="numLine"> 859</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 854</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> desc = description;</pre></td></tr>
+<tr> <td class="numLine"> 855</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 860</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.setDescription(desc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 861</td> <td class="nbHitsUncovered"><a title="Line 861: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 861: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (desc.length() > 100) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 862</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> desc = desc.replaceAll(<span class="string">"\\s\\s+"</span>, <span class="string">" "</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 863</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posSuchAs = desc.toLowerCase().indexOf(<span class="string">"such as "</span>, 100);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 864</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posLike = desc.toLowerCase().indexOf(<span class="string">"like "</span>, 100);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 865</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posWillUse = desc.toLowerCase().indexOf(<span class="string">"will use "</span>, 100);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 866</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posUses = desc.toLowerCase().indexOf(<span class="string">" uses "</span>, 100);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 867</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> pos = -1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 868</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posSuchAs);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 869</td> <td class="nbHitsUncovered"><a title="Line 869: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 869: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pos >= 0 && posLike >= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 870</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.min(pos, posLike);</span></pre></td></tr>
-<tr> <td class="numLine"> 871</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 856</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.setDescription(desc);</pre></td></tr>
+<tr> <td class="numLineCover"> 857</td> <td class="nbHitsUncovered"><a title="Line 857: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 857: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (desc.length() > 100) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 858</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> desc = desc.replaceAll(<span class="string">"\\s\\s+"</span>, <span class="string">" "</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 859</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posSuchAs = desc.toLowerCase().indexOf(<span class="string">"such as "</span>, 100);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 860</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posLike = desc.toLowerCase().indexOf(<span class="string">"like "</span>, 100);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 861</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posWillUse = desc.toLowerCase().indexOf(<span class="string">"will use "</span>, 100);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 862</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> posUses = desc.toLowerCase().indexOf(<span class="string">" uses "</span>, 100);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 863</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> pos = -1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 864</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posSuchAs);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 865</td> <td class="nbHitsUncovered"><a title="Line 865: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 865: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pos >= 0 && posLike >= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 866</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.min(pos, posLike);</span></pre></td></tr>
+<tr> <td class="numLine"> 867</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 872</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posLike);</span></pre></td></tr>
-<tr> <td class="numLine"> 873</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 868</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posLike);</span></pre></td></tr>
+<tr> <td class="numLine"> 869</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 874</td> <td class="nbHitsUncovered"><a title="Line 874: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 874: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pos >= 0 && posWillUse >= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 875</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.min(pos, posWillUse);</span></pre></td></tr>
-<tr> <td class="numLine"> 876</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 870</td> <td class="nbHitsUncovered"><a title="Line 870: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 870: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pos >= 0 && posWillUse >= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 871</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.min(pos, posWillUse);</span></pre></td></tr>
+<tr> <td class="numLine"> 872</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 877</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posWillUse);</span></pre></td></tr>
-<tr> <td class="numLine"> 878</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 873</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posWillUse);</span></pre></td></tr>
+<tr> <td class="numLine"> 874</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 879</td> <td class="nbHitsUncovered"><a title="Line 879: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 879: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pos >= 0 && posUses >= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 880</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.min(pos, posUses);</span></pre></td></tr>
-<tr> <td class="numLine"> 881</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 875</td> <td class="nbHitsUncovered"><a title="Line 875: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 875: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pos >= 0 && posUses >= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 876</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.min(pos, posUses);</span></pre></td></tr>
+<tr> <td class="numLine"> 877</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 882</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posUses);</span></pre></td></tr>
-<tr> <td class="numLine"> 883</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 878</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = Math.max(pos, posUses);</span></pre></td></tr>
+<tr> <td class="numLine"> 879</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 884</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 880</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 885</td> <td class="nbHitsUncovered"><a title="Line 885: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 885: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 886</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(pos + 3);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 887</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(desc.substring(0, pos));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 888</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"..."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 889</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> desc = sb.toString();</span></pre></td></tr>
-<tr> <td class="numLine"> 890</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 881</td> <td class="nbHitsUncovered"><a title="Line 881: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 881: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 882</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(pos + 3);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 883</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(desc.substring(0, pos));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 884</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"..."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 885</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> desc = sb.toString();</span></pre></td></tr>
+<tr> <td class="numLine"> 886</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 891</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 892</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 893</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 894</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 895</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLine"> 896</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 887</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 888</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 889</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 890</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);</pre></td></tr>
+<tr> <td class="numLineCover"> 891</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);</pre></td></tr>
+<tr> <td class="numLine"> 892</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 897</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> desc;</span></pre></td></tr>
-<tr> <td class="numLine"> 898</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 893</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> desc;</pre></td></tr>
+<tr> <td class="numLine"> 894</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 899</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 895</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 900</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 896</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 901</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 897</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Adds a license to the given dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 902</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 898</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 903</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 899</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param d a dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 904</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 900</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param license the license</span></pre></td></tr>
-<tr> <td class="numLine"> 905</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 901</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 906</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 902</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> addLicense(Dependency d, String license) {</pre></td></tr>
-<tr> <td class="numLineCover"> 907</td> <td class="nbHitsUncovered"><a title="Line 907: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 907: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (d.getLicense() == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 908</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> d.setLicense(license);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 909</td> <td class="nbHitsUncovered"><a title="Line 909: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 909: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (!d.getLicense().contains(license)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 910</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> d.setLicense(d.getLicense() + NEWLINE + license);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 903</td> <td class="nbHitsUncovered"><a title="Line 903: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 903: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (d.getLicense() == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 904</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> d.setLicense(license);</pre></td></tr>
+<tr> <td class="numLineCover"> 905</td> <td class="nbHitsUncovered"><a title="Line 905: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 905: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (!d.getLicense().contains(license)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 906</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> d.setLicense(d.getLicense() + NEWLINE + license);</span></pre></td></tr>
+<tr> <td class="numLine"> 907</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 908</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 909</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 910</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 911</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 912</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 913</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 914</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 915</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The parent directory for the individual directories per archive.</span></pre></td></tr>
+<tr> <td class="numLine"> 912</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 913</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">private</span> File tempFileLocation = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 914</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 915</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 916</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 917</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> File tempFileLocation = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 918</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 919</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 920</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Initializes the JarAnalyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 921</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 917</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 922</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 918</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an exception creating a temporary directory</span></pre></td></tr>
-<tr> <td class="numLine"> 923</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 919</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 924</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 920</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 925</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 921</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initializeFileTypeAnalyzer() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 926</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File baseDir = Settings.getTempDirectory();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 927</td> <td class="nbHitsUncovered"><a title="Line 927: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 927: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!baseDir.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 928</td> <td class="nbHitsUncovered"><a title="Line 928: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 928: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!baseDir.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 929</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to make a temporary folder '%s'"</span>, baseDir.getPath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 930</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 922</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File baseDir = Settings.getTempDirectory();</pre></td></tr>
+<tr> <td class="numLineCover"> 923</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> tempFileLocation = File.createTempFile(<span class="string">"check"</span>, <span class="string">"tmp"</span>, baseDir);</pre></td></tr>
+<tr> <td class="numLineCover"> 924</td> <td class="nbHitsUncovered"><a title="Line 924: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 924: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!tempFileLocation.delete()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 925</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to delete temporary file '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 926</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 927</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 928</td> <td class="nbHitsUncovered"><a title="Line 928: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 928: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!tempFileLocation.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 929</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create directory '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 930</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
<tr> <td class="numLine"> 931</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 932</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 933</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tempFileLocation = File.createTempFile(<span class="string">"check"</span>, <span class="string">"tmp"</span>, baseDir);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 934</td> <td class="nbHitsUncovered"><a title="Line 934: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 934: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!tempFileLocation.delete()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 935</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to delete temporary file '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 936</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 937</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 938</td> <td class="nbHitsUncovered"><a title="Line 938: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 938: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!tempFileLocation.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 939</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create directory '%s'."</span>, tempFileLocation.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 940</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 941</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 942</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 943</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 932</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 933</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 944</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 934</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 945</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 935</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Deletes any files extracted from the JAR during analysis.</span></pre></td></tr>
-<tr> <td class="numLine"> 946</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 936</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 947</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 937</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 948</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 938</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() {</pre></td></tr>
-<tr> <td class="numLineCover"> 949</td> <td class="nbHitsUncovered"><a title="Line 949: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 949: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (tempFileLocation != <span class="keyword">null</span> && tempFileLocation.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 950</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Attempting to delete temporary files"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 951</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> success = FileUtils.delete(tempFileLocation);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 952</td> <td class="nbHitsUncovered"><a title="Line 952: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 952: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!success) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 953</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING,</span></pre></td></tr>
-<tr> <td class="numLine"> 954</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 939</td> <td class="nbHitsUncovered"><a title="Line 939: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 939: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (tempFileLocation != <span class="keyword">null</span> && tempFileLocation.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 940</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Attempting to delete temporary files"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 941</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">boolean</span> success = FileUtils.delete(tempFileLocation);</pre></td></tr>
+<tr> <td class="numLineCover"> 942</td> <td class="nbHitsUncovered"><a title="Line 942: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 942: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!success) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 943</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING,</span></pre></td></tr>
+<tr> <td class="numLine"> 944</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Failed to delete some temporary files, see the log for more details"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 955</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 945</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 956</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 946</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 957</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 958</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 947</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 948</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 959</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 949</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 960</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 950</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 961</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 951</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * A utility function that will interpolate strings based on values given in the properties file. It will also</span></pre></td></tr>
-<tr> <td class="numLine"> 962</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 952</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * interpolate the strings contained within the properties file so that properties can reference other</span></pre></td></tr>
-<tr> <td class="numLine"> 963</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 953</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * properties.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 964</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 954</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 965</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 955</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <b>Note:</b> if there is no property found the reference will be removed. In other words, if the interpolated</span></pre></td></tr>
-<tr> <td class="numLine"> 966</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 956</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * string will be replaced with an empty string.</span></pre></td></tr>
-<tr> <td class="numLine"> 967</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 957</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * </p></span></pre></td></tr>
-<tr> <td class="numLine"> 968</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 958</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 969</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 959</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Example:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 970</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 960</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <code></span></pre></td></tr>
-<tr> <td class="numLine"> 971</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 961</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Properties p = new Properties();</span></pre></td></tr>
-<tr> <td class="numLine"> 972</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 962</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * p.setProperty("key", "value");</span></pre></td></tr>
-<tr> <td class="numLine"> 973</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 963</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * String s = interpolateString("'${key}' and '${nothing}'", p);</span></pre></td></tr>
-<tr> <td class="numLine"> 974</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 964</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * System.out.println(s);</span></pre></td></tr>
-<tr> <td class="numLine"> 975</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 965</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * </code></span></pre></td></tr>
-<tr> <td class="numLine"> 976</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 966</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 977</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 967</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Will result in:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 978</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 968</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <code></span></pre></td></tr>
-<tr> <td class="numLine"> 979</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 969</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * 'value' and ''</span></pre></td></tr>
-<tr> <td class="numLine"> 980</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 970</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * </code></span></pre></td></tr>
-<tr> <td class="numLine"> 981</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 971</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 982</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 972</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param text the string that contains references to properties.</span></pre></td></tr>
-<tr> <td class="numLine"> 983</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 973</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param properties a collection of properties that may be referenced within the text.</span></pre></td></tr>
-<tr> <td class="numLine"> 984</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 974</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the interpolated text.</span></pre></td></tr>
-<tr> <td class="numLine"> 985</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 975</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 986</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 976</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> String interpolateString(String text, Properties properties) {</pre></td></tr>
-<tr> <td class="numLineCover"> 987</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Properties props = properties;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 988</td> <td class="nbHitsUncovered"><a title="Line 988: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 988: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 989</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> text;</span></pre></td></tr>
-<tr> <td class="numLine"> 990</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 977</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Properties props = properties;</pre></td></tr>
+<tr> <td class="numLineCover"> 978</td> <td class="nbHitsCovered"><a title="Line 978: Conditional coverage 100% (2/2)."> 11</a></td> <td class="src"><pre class="src"> <a title="Line 978: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 979</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> text;</pre></td></tr>
+<tr> <td class="numLine"> 980</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 991</td> <td class="nbHitsUncovered"><a title="Line 991: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 991: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (props == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 992</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> props = <span class="keyword">new</span> Properties();</span></pre></td></tr>
-<tr> <td class="numLine"> 993</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 981</td> <td class="nbHitsCovered"><a title="Line 981: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 981: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (props == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 982</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> props = <span class="keyword">new</span> Properties();</pre></td></tr>
+<tr> <td class="numLine"> 983</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 994</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 984</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 995</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> pos = text.indexOf(<span class="string">"${"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 996</td> <td class="nbHitsUncovered"><a title="Line 996: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 996: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos < 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 997</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> text;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 985</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> pos = text.indexOf(<span class="string">"${"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 986</td> <td class="nbHitsCovered"><a title="Line 986: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 986: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (pos < 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 987</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> text;</pre></td></tr>
+<tr> <td class="numLine"> 988</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 989</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> end = text.indexOf(<span class="string">"}"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 990</td> <td class="nbHitsUncovered"><a title="Line 990: Conditional coverage 50% (1/2)."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 990: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (end < pos) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 991</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> text;</span></pre></td></tr>
+<tr> <td class="numLine"> 992</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 993</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 994</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String propName = text.substring(pos + 2, end);</pre></td></tr>
+<tr> <td class="numLineCover"> 995</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> String propValue = interpolateString(props.getProperty(propName), props);</pre></td></tr>
+<tr> <td class="numLineCover"> 996</td> <td class="nbHitsUncovered"><a title="Line 996: Conditional coverage 50% (1/2)."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 996: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (propValue == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 997</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> propValue = <span class="string">""</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 998</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 999</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> end = text.indexOf(<span class="string">"}"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1000</td> <td class="nbHitsUncovered"><a title="Line 1000: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1000: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (end < pos) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1001</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> text;</span></pre></td></tr>
-<tr> <td class="numLine"> 1002</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1003</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 1004</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String propName = text.substring(pos + 2, end);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1005</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String propValue = interpolateString(props.getProperty(propName), props);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1006</td> <td class="nbHitsUncovered"><a title="Line 1006: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1006: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (propValue == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1007</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> propValue = <span class="string">""</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 1008</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1009</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(propValue.length() + text.length());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1010</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(text.subSequence(0, pos));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1011</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(propValue);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1012</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(text.substring(end + 1));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1013</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> interpolateString(sb.toString(), props); <span class="comment">//yes yes, this should be a loop...</span></span></pre></td></tr>
-<tr> <td class="numLine"> 1014</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 999</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(propValue.length() + text.length());</pre></td></tr>
+<tr> <td class="numLineCover"> 1000</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> sb.append(text.subSequence(0, pos));</pre></td></tr>
+<tr> <td class="numLineCover"> 1001</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> sb.append(propValue);</pre></td></tr>
+<tr> <td class="numLineCover"> 1002</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> sb.append(text.substring(end + 1));</pre></td></tr>
+<tr> <td class="numLineCover"> 1003</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> interpolateString(sb.toString(), props); <span class="comment">//yes yes, this should be a loop...</span></pre></td></tr>
+<tr> <td class="numLine"> 1004</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1015</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1005</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1016</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1006</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1017</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1007</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Determines if the key value pair from the manifest is for an "import" type entry for package names.</span></pre></td></tr>
-<tr> <td class="numLine"> 1018</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1008</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1019</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1009</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param key the key from the manifest</span></pre></td></tr>
-<tr> <td class="numLine"> 1020</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1010</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param value the value from the manifest</span></pre></td></tr>
-<tr> <td class="numLine"> 1021</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1011</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return true or false depending on if it is believed the entry is an "import" entry</span></pre></td></tr>
-<tr> <td class="numLine"> 1022</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1012</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1023</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1013</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> isImportPackage(String key, String value) {</pre></td></tr>
-<tr> <td class="numLineCover"> 1024</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Pattern packageRx = Pattern.compile(<span class="string">"^([a-zA-Z0-9_#\\$\\*\\.]+\\s*[,;]\\s*)+([a-zA-Z0-9_#\\$\\*\\.]+\\s*)?$"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1025</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> matches = packageRx.matcher(value).matches();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1026</td> <td class="nbHitsUncovered"><a title="Line 1026: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1026: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">return</span> matches && (key.contains(<span class="string">"import"</span>) || key.contains(<span class="string">"include"</span>) || value.length() > 10);</a></span></pre></td></tr>
-<tr> <td class="numLine"> 1027</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1014</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Pattern packageRx = Pattern.compile(<span class="string">"^([a-zA-Z0-9_#\\$\\*\\.]+\\s*[,;]\\s*)+([a-zA-Z0-9_#\\$\\*\\.]+\\s*)?$"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 1015</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">boolean</span> matches = packageRx.matcher(value).matches();</pre></td></tr>
+<tr> <td class="numLineCover"> 1016</td> <td class="nbHitsUncovered"><a title="Line 1016: Conditional coverage 12% (1/8) [each condition: 50%, 0%, 0%, 0%]."> 15</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1016: Conditional coverage 12% (1/8) [each condition: 50%, 0%, 0%, 0%]."> <span class="keyword">return</span> matches && (key.contains(<span class="string">"import"</span>) || key.contains(<span class="string">"include"</span>) || value.length() > 10);</a></span></pre></td></tr>
+<tr> <td class="numLine"> 1017</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1028</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1018</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1029</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1019</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1030</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1020</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Cycles through an enumeration of JarEntries, contained within the dependency, and returns a list of the class</span></pre></td></tr>
-<tr> <td class="numLine"> 1031</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1021</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * names. This does not include core Java package names (i.e. java.* or javax.*).</span></pre></td></tr>
-<tr> <td class="numLine"> 1032</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1022</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1033</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1023</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 1034</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1024</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return an list of fully qualified class names</span></pre></td></tr>
-<tr> <td class="numLine"> 1035</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1025</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1036</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1026</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> ArrayList<ClassNameInformation> collectClassNames(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 1037</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<ClassNameInformation> classNames = <span class="keyword">new</span> ArrayList<ClassNameInformation>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1038</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> JarFile jar = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 1039</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1027</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<ClassNameInformation> classNames = <span class="keyword">new</span> ArrayList<ClassNameInformation>();</pre></td></tr>
+<tr> <td class="numLineCover"> 1028</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> JarFile jar = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 1029</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1040</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> jar = <span class="keyword">new</span> JarFile(dependency.getActualFilePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1041</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Enumeration entries = jar.entries();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1042</td> <td class="nbHitsUncovered"><a title="Line 1042: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1042: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (entries.hasMoreElements()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1043</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> JarEntry entry = (JarEntry) entries.nextElement();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1044</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String name = entry.getName().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLine"> 1045</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1030</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> jar = <span class="keyword">new</span> JarFile(dependency.getActualFilePath());</pre></td></tr>
+<tr> <td class="numLineCover"> 1031</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Enumeration entries = jar.entries();</pre></td></tr>
+<tr> <td class="numLineCover"> 1032</td> <td class="nbHitsCovered"><a title="Line 1032: Conditional coverage 100% (2/2)."> 1848</a></td> <td class="src"><pre class="src"> <a title="Line 1032: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (entries.hasMoreElements()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1033</td> <td class="nbHitsCovered"> 1843</td> <td class="src"><pre class="src"> <span class="keyword">final</span> JarEntry entry = (JarEntry) entries.nextElement();</pre></td></tr>
+<tr> <td class="numLineCover"> 1034</td> <td class="nbHitsCovered"> 1843</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String name = entry.getName().toLowerCase();</pre></td></tr>
+<tr> <td class="numLine"> 1035</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//no longer stripping "|com\\.sun" - there are some com.sun jar files with CVEs.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1046</td> <td class="nbHitsUncovered"><a title="Line 1046: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1046: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (name.endsWith(<span class="string">".class"</span>) && !name.matches(<span class="string">"^javax?\\..*$"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1047</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ClassNameInformation className = <span class="keyword">new</span> ClassNameInformation(name.substring(0, name.length() - 6));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1048</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> classNames.add(className);</span></pre></td></tr>
-<tr> <td class="numLine"> 1049</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1036</td> <td class="nbHitsUncovered"><a title="Line 1036: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 1843</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1036: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (name.endsWith(<span class="string">".class"</span>) && !name.matches(<span class="string">"^javax?\\..*$"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1037</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ClassNameInformation className = <span class="keyword">new</span> ClassNameInformation(name.substring(0, name.length() - 6));</pre></td></tr>
+<tr> <td class="numLineCover"> 1038</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> classNames.add(className);</pre></td></tr>
+<tr> <td class="numLine"> 1039</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1050</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1051</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1052</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to open jar file '%s'."</span>, dependency.getFileName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1053</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger</span></pre></td></tr>
-<tr> <td class="numLine"> 1054</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getLogger(JarAnalyzer.<span class="keyword">class</span></pre></td></tr>
-<tr> <td class="numLine"> 1055</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.WARNING, msg);</pre></td></tr>
-<tr> <td class="numLineCover"> 1056</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(JarAnalyzer.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 1057</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</pre></td></tr>
-<tr> <td class="numLine"> 1058</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1040</td> <td class="nbHitsCovered"> 1843</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1041</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1042</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to open jar file '%s'."</span>, dependency.getFileName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1043</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1044</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 1045</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1059</td> <td class="nbHitsUncovered"><a title="Line 1059: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1059: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (jar != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 1060</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1046</td> <td class="nbHitsUncovered"><a title="Line 1046: Conditional coverage 50% (1/2)."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1046: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (jar != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 1047</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1061</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> jar.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1062</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1063</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1064</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 1065</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1048</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> jar.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 1049</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1050</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1051</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1052</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1066</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1053</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1067</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> classNames;</span></pre></td></tr>
-<tr> <td class="numLine"> 1068</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1054</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> classNames;</pre></td></tr>
+<tr> <td class="numLine"> 1055</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1069</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1056</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1070</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1057</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1071</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1058</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Cycles through the list of class names and places the package levels 0-3 into the provided maps for vendor and</span></pre></td></tr>
-<tr> <td class="numLine"> 1072</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1059</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * product. This is helpful when analyzing vendor/product as many times this is included in the package name.</span></pre></td></tr>
-<tr> <td class="numLine"> 1073</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1060</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1074</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1061</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param classNames a list of class names</span></pre></td></tr>
-<tr> <td class="numLine"> 1075</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1062</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param vendor HashMap of possible vendor names from package names (e.g. owasp)</span></pre></td></tr>
-<tr> <td class="numLine"> 1076</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1063</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param product HashMap of possible product names from package names (e.g. dependencycheck)</span></pre></td></tr>
-<tr> <td class="numLine"> 1077</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1064</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1078</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1065</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> analyzeFullyQualifiedClassNames(ArrayList<ClassNameInformation> classNames,</pre></td></tr>
-<tr> <td class="numLine"> 1079</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1066</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> HashMap<String, Integer> vendor, HashMap<String, Integer> product) {</pre></td></tr>
-<tr> <td class="numLineCover"> 1080</td> <td class="nbHitsUncovered"><a title="Line 1080: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1080: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (ClassNameInformation entry : classNames) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1081</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<String> list = entry.getPackageStructure();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1082</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(vendor, list.get(0));</span></pre></td></tr>
-<tr> <td class="numLine"> 1083</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1067</td> <td class="nbHitsCovered"><a title="Line 1067: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 1067: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (ClassNameInformation entry : classNames) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1068</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<String> list = entry.getPackageStructure();</pre></td></tr>
+<tr> <td class="numLineCover"> 1069</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> addEntry(vendor, list.get(0));</pre></td></tr>
+<tr> <td class="numLine"> 1070</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 1084</td> <td class="nbHitsUncovered"><a title="Line 1084: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1084: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (list.size() == 2) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1085</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(product, list.get(1));</span></pre></td></tr>
-<tr> <td class="numLine"> 1086</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1071</td> <td class="nbHitsUncovered"><a title="Line 1071: Conditional coverage 50% (1/2)."> 1535</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1071: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (list.size() == 2) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1072</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(product, list.get(1));</span></pre></td></tr>
+<tr> <td class="numLine"> 1073</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1087</td> <td class="nbHitsUncovered"><a title="Line 1087: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1087: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (list.size() == 3) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1088</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(vendor, list.get(1));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1089</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(product, list.get(1));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1090</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(product, list.get(2));</span></pre></td></tr>
-<tr> <td class="numLine"> 1091</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1074</td> <td class="nbHitsCovered"><a title="Line 1074: Conditional coverage 100% (2/2)."> 1535</a></td> <td class="src"><pre class="src"> <a title="Line 1074: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (list.size() == 3) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1075</td> <td class="nbHitsCovered"> 345</td> <td class="src"><pre class="src"> addEntry(vendor, list.get(1));</pre></td></tr>
+<tr> <td class="numLineCover"> 1076</td> <td class="nbHitsCovered"> 345</td> <td class="src"><pre class="src"> addEntry(product, list.get(1));</pre></td></tr>
+<tr> <td class="numLineCover"> 1077</td> <td class="nbHitsCovered"> 345</td> <td class="src"><pre class="src"> addEntry(product, list.get(2));</pre></td></tr>
+<tr> <td class="numLine"> 1078</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1092</td> <td class="nbHitsUncovered"><a title="Line 1092: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1092: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (list.size() >= 4) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1093</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(vendor, list.get(1));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1094</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(vendor, list.get(2));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1095</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(product, list.get(1));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1096</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(product, list.get(2));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1097</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEntry(product, list.get(3));</span></pre></td></tr>
-<tr> <td class="numLine"> 1098</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1079</td> <td class="nbHitsCovered"><a title="Line 1079: Conditional coverage 100% (2/2)."> 1535</a></td> <td class="src"><pre class="src"> <a title="Line 1079: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (list.size() >= 4) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1080</td> <td class="nbHitsCovered"> 1190</td> <td class="src"><pre class="src"> addEntry(vendor, list.get(1));</pre></td></tr>
+<tr> <td class="numLineCover"> 1081</td> <td class="nbHitsCovered"> 1190</td> <td class="src"><pre class="src"> addEntry(vendor, list.get(2));</pre></td></tr>
+<tr> <td class="numLineCover"> 1082</td> <td class="nbHitsCovered"> 1190</td> <td class="src"><pre class="src"> addEntry(product, list.get(1));</pre></td></tr>
+<tr> <td class="numLineCover"> 1083</td> <td class="nbHitsCovered"> 1190</td> <td class="src"><pre class="src"> addEntry(product, list.get(2));</pre></td></tr>
+<tr> <td class="numLineCover"> 1084</td> <td class="nbHitsCovered"> 1190</td> <td class="src"><pre class="src"> addEntry(product, list.get(3));</pre></td></tr>
+<tr> <td class="numLine"> 1085</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1099</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 1101</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1086</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1087</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1088</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1102</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1089</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1103</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1090</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Adds an entry to the specified collection and sets the Integer (e.g. the count) to 1. If the entry already exists</span></pre></td></tr>
-<tr> <td class="numLine"> 1104</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1091</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * in the collection then the Integer is incremented by 1.</span></pre></td></tr>
-<tr> <td class="numLine"> 1105</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1092</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1106</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1093</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param collection a collection of strings and their occurrence count</span></pre></td></tr>
-<tr> <td class="numLine"> 1107</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1094</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param key the key to add to the collection</span></pre></td></tr>
-<tr> <td class="numLine"> 1108</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1095</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1109</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1096</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> addEntry(HashMap<String, Integer> collection, String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 1110</td> <td class="nbHitsUncovered"><a title="Line 1110: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1110: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (collection.containsKey(key)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> collection.put(key, collection.get(key) + 1);</span></pre></td></tr>
-<tr> <td class="numLine"> 1112</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1097</td> <td class="nbHitsCovered"><a title="Line 1097: Conditional coverage 100% (2/2)."> 8520</a></td> <td class="src"><pre class="src"> <a title="Line 1097: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (collection.containsKey(key)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1098</td> <td class="nbHitsCovered"> 7487</td> <td class="src"><pre class="src"> collection.put(key, collection.get(key) + 1);</pre></td></tr>
+<tr> <td class="numLine"> 1099</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> collection.put(key, 1);</span></pre></td></tr>
-<tr> <td class="numLine"> 1114</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1100</td> <td class="nbHitsCovered"> 1033</td> <td class="src"><pre class="src"> collection.put(key, 1);</pre></td></tr>
+<tr> <td class="numLine"> 1101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 1116</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1102</td> <td class="nbHitsCovered"> 8520</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1117</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1118</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Cycles through the collection of class name information to see if parts of the package names are contained in the</span></pre></td></tr>
-<tr> <td class="numLine"> 1119</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1106</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * provided value. If found, it will be added as the HIGHEST confidence evidence because we have more then one</span></pre></td></tr>
-<tr> <td class="numLine"> 1120</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * source corroborating the value.</span></pre></td></tr>
-<tr> <td class="numLine"> 1121</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1122</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param classes a collection of class name information</span></pre></td></tr>
-<tr> <td class="numLine"> 1123</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param value the value to check to see if it contains a package name</span></pre></td></tr>
-<tr> <td class="numLine"> 1124</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param evidence the evidence collection to add new entries too</span></pre></td></tr>
-<tr> <td class="numLine"> 1125</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1126</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> addMatchingValues(ArrayList<ClassNameInformation> classes, String value, EvidenceCollection evidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 1127</td> <td class="nbHitsUncovered"><a title="Line 1127: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1127: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (value == <span class="keyword">null</span> || value.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 1129</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1114</td> <td class="nbHitsUncovered"><a title="Line 1114: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 37</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1114: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (value == <span class="keyword">null</span> || value.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 1116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String text = value.toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1131</td> <td class="nbHitsUncovered"><a title="Line 1131: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1131: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (ClassNameInformation cni : classes) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1132</td> <td class="nbHitsUncovered"><a title="Line 1132: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1132: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String key : cni.getPackageStructure()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1133</td> <td class="nbHitsUncovered"><a title="Line 1133: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1133: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (text.contains(key)) { <span class="comment">//note, package structure elements are already lowercase.</span></a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> evidence.addEvidence(<span class="string">"jar"</span>, <span class="string">"package name"</span>, key, Confidence.HIGHEST);</span></pre></td></tr>
-<tr> <td class="numLine"> 1135</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1117</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String text = value.toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 1118</td> <td class="nbHitsCovered"><a title="Line 1118: Conditional coverage 100% (2/2)."> 37</a></td> <td class="src"><pre class="src"> <a title="Line 1118: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (ClassNameInformation cni : classes) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1119</td> <td class="nbHitsCovered"><a title="Line 1119: Conditional coverage 100% (2/2)."> 14916</a></td> <td class="src"><pre class="src"> <a title="Line 1119: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String key : cni.getPackageStructure()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1120</td> <td class="nbHitsCovered"><a title="Line 1120: Conditional coverage 100% (2/2)."> 57504</a></td> <td class="src"><pre class="src"> <a title="Line 1120: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (text.contains(key)) { <span class="comment">//note, package structure elements are already lowercase.</span></a></pre></td></tr>
+<tr> <td class="numLineCover"> 1121</td> <td class="nbHitsCovered"> 13816</td> <td class="src"><pre class="src"> evidence.addEvidence(<span class="string">"jar"</span>, <span class="string">"package name"</span>, key, Confidence.HIGHEST);</pre></td></tr>
+<tr> <td class="numLine"> 1122</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 1139</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1123</td> <td class="nbHitsCovered"> 57504</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1124</td> <td class="nbHitsCovered"> 14916</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1125</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1126</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1140</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1141</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1128</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Simple check to see if the attribute from a manifest is just a package name.</span></pre></td></tr>
-<tr> <td class="numLine"> 1142</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1129</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1143</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param key the key of the value to check</span></pre></td></tr>
-<tr> <td class="numLine"> 1144</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1131</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param value the value to check</span></pre></td></tr>
-<tr> <td class="numLine"> 1145</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1132</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return true if the value looks like a java package name, otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 1146</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1133</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1147</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1134</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> isPackage(String key, String value) {</pre></td></tr>
-<tr> <td class="numLine"> 1148</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1135</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 1149</td> <td class="nbHitsUncovered"><a title="Line 1149: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1149: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">return</span> !key.matches(<span class="string">".*(version|title|vendor|name|license|description).*"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 1150</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1136</td> <td class="nbHitsCovered"><a title="Line 1136: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 1136: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">return</span> !key.matches(<span class="string">".*(version|title|vendor|name|license|description).*"</span>)</a></pre></td></tr>
+<tr> <td class="numLine"> 1137</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && value.matches(<span class="string">"^([a-zA-Z_][a-zA-Z0-9_\\$]*(\\.[a-zA-Z_][a-zA-Z0-9_\\$]*)*)?$"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 1151</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1138</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1152</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1139</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1153</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1140</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1154</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1141</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1155</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1142</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Adds evidence from the POM to the dependency. This includes the GAV and in some situations the parent GAV if</span></pre></td></tr>
-<tr> <td class="numLine"> 1156</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1143</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * specified.</span></pre></td></tr>
-<tr> <td class="numLine"> 1157</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1158</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1145</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency being analyzed</span></pre></td></tr>
-<tr> <td class="numLine"> 1159</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param pom the POM data</span></pre></td></tr>
-<tr> <td class="numLine"> 1160</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1147</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param pomProperties the properties file associated with the pom</span></pre></td></tr>
-<tr> <td class="numLine"> 1161</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1162</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> addPomEvidence(Dependency dependency, Model pom, Properties pomProperties) {</pre></td></tr>
-<tr> <td class="numLineCover"> 1163</td> <td class="nbHitsUncovered"><a title="Line 1163: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1163: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pom == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1150</td> <td class="nbHitsUncovered"><a title="Line 1150: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1150: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pom == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 1152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String groupid = interpolateString(pom.getGroupId(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1154</td> <td class="nbHitsUncovered"><a title="Line 1154: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1154: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid != <span class="keyword">null</span> && !groupid.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1155</td> <td class="nbHitsUncovered"><a title="Line 1155: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1155: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid.startsWith(<span class="string">"org."</span>) || groupid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> groupid = groupid.substring(4);</span></pre></td></tr>
+<tr> <td class="numLine"> 1157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLine"> 1160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String artifactid = interpolateString(pom.getArtifactId(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1162</td> <td class="nbHitsUncovered"><a title="Line 1162: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1162: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid != <span class="keyword">null</span> && !artifactid.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1163</td> <td class="nbHitsUncovered"><a title="Line 1163: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1163: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid.startsWith(<span class="string">"org."</span>) || artifactid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> artifactid = artifactid.substring(4);</span></pre></td></tr>
<tr> <td class="numLine"> 1165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String groupid = interpolateString(pom.getGroupId(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1167</td> <td class="nbHitsUncovered"><a title="Line 1167: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1167: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid != <span class="keyword">null</span> && !groupid.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1168</td> <td class="nbHitsUncovered"><a title="Line 1168: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1168: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid.startsWith(<span class="string">"org."</span>) || groupid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> groupid = groupid.substring(4);</span></pre></td></tr>
-<tr> <td class="numLine"> 1170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"groupid"</span>, groupid, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLine"> 1168</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String version = interpolateString(pom.getVersion(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1170</td> <td class="nbHitsUncovered"><a title="Line 1170: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1170: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version != <span class="keyword">null</span> && !version.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"version"</span>, version, Confidence.HIGHEST);</span></pre></td></tr>
+<tr> <td class="numLine"> 1172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 1173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String artifactid = interpolateString(pom.getArtifactId(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1175</td> <td class="nbHitsUncovered"><a title="Line 1175: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1175: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid != <span class="keyword">null</span> && !artifactid.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1176</td> <td class="nbHitsUncovered"><a title="Line 1176: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1176: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid.startsWith(<span class="string">"org."</span>) || artifactid.startsWith(<span class="string">"com."</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> artifactid = artifactid.substring(4);</span></pre></td></tr>
-<tr> <td class="numLine"> 1178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"artifactid"</span>, artifactid, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 1181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String version = interpolateString(pom.getVersion(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1183</td> <td class="nbHitsUncovered"><a title="Line 1183: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1183: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version != <span class="keyword">null</span> && !version.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"version"</span>, version, Confidence.HIGHEST);</span></pre></td></tr>
-<tr> <td class="numLine"> 1185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1186</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 1187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Parent parent = pom.getParent(); <span class="comment">//grab parent GAV</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1188</td> <td class="nbHitsUncovered"><a title="Line 1188: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1188: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (parent != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String parentGroupId = interpolateString(parent.getGroupId(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1190</td> <td class="nbHitsUncovered"><a title="Line 1190: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1190: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (parentGroupId != <span class="keyword">null</span> && !parentGroupId.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1191</td> <td class="nbHitsUncovered"><a title="Line 1191: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1191: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid == <span class="keyword">null</span> || groupid.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.groupid"</span>, parentGroupId, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Parent parent = pom.getParent(); <span class="comment">//grab parent GAV</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1175</td> <td class="nbHitsUncovered"><a title="Line 1175: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1175: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (parent != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String parentGroupId = interpolateString(parent.getGroupId(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1177</td> <td class="nbHitsUncovered"><a title="Line 1177: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1177: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (parentGroupId != <span class="keyword">null</span> && !parentGroupId.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1178</td> <td class="nbHitsUncovered"><a title="Line 1178: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1178: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (groupid == <span class="keyword">null</span> || groupid.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.groupid"</span>, parentGroupId, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLine"> 1180</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 1181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.groupid"</span>, parentGroupId, Confidence.MEDIUM);</span></pre></td></tr>
+<tr> <td class="numLine"> 1182</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.groupid"</span>, parentGroupId, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLine"> 1184</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String parentArtifactId = interpolateString(parent.getArtifactId(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1186</td> <td class="nbHitsUncovered"><a title="Line 1186: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1186: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (parentArtifactId != <span class="keyword">null</span> && !parentArtifactId.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1187</td> <td class="nbHitsUncovered"><a title="Line 1187: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1187: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid == <span class="keyword">null</span> || artifactid.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.artifactid"</span>, parentArtifactId, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLine"> 1189</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 1190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.artifactid"</span>, parentArtifactId, Confidence.MEDIUM);</span></pre></td></tr>
+<tr> <td class="numLine"> 1191</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.artifactid"</span>, parentArtifactId, Confidence.LOW);</span></pre></td></tr>
<tr> <td class="numLine"> 1193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.groupid"</span>, parentGroupId, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLine"> 1195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.groupid"</span>, parentGroupId, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 1197</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String parentArtifactId = interpolateString(parent.getArtifactId(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1199</td> <td class="nbHitsUncovered"><a title="Line 1199: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1199: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (parentArtifactId != <span class="keyword">null</span> && !parentArtifactId.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1200</td> <td class="nbHitsUncovered"><a title="Line 1200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (artifactid == <span class="keyword">null</span> || artifactid.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.artifactid"</span>, parentArtifactId, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String parentVersion = interpolateString(parent.getVersion(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1195</td> <td class="nbHitsUncovered"><a title="Line 1195: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1195: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (parentVersion != <span class="keyword">null</span> && !parentVersion.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1196</td> <td class="nbHitsUncovered"><a title="Line 1196: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1196: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version == <span class="keyword">null</span> || version.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.version"</span>, parentVersion, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLine"> 1198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 1199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.version"</span>, parentVersion, Confidence.LOW);</span></pre></td></tr>
+<tr> <td class="numLine"> 1200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 1202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.artifactid"</span>, parentArtifactId, Confidence.MEDIUM);</span></pre></td></tr>
-<tr> <td class="numLine"> 1204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.artifactid"</span>, parentArtifactId, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 1206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String parentVersion = interpolateString(parent.getVersion(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1208</td> <td class="nbHitsUncovered"><a title="Line 1208: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1208: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (parentVersion != <span class="keyword">null</span> && !parentVersion.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1209</td> <td class="nbHitsUncovered"><a title="Line 1209: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1209: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (version == <span class="keyword">null</span> || version.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.version"</span>, parentVersion, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLine"> 1211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVersionEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"parent.version"</span>, parentVersion, Confidence.LOW);</span></pre></td></tr>
-<tr> <td class="numLine"> 1213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1216</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1203</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// org name</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Organization org = pom.getOrganization();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1218</td> <td class="nbHitsUncovered"><a title="Line 1218: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1218: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (org != <span class="keyword">null</span> && org.getName() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String orgName = interpolateString(org.getName(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1220</td> <td class="nbHitsUncovered"><a title="Line 1220: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1220: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (orgName != <span class="keyword">null</span> && !orgName.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"organization name"</span>, orgName, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLine"> 1222</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Organization org = pom.getOrganization();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1205</td> <td class="nbHitsUncovered"><a title="Line 1205: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1205: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (org != <span class="keyword">null</span> && org.getName() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String orgName = interpolateString(org.getName(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1207</td> <td class="nbHitsUncovered"><a title="Line 1207: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1207: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (orgName != <span class="keyword">null</span> && !orgName.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"organization name"</span>, orgName, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLine"> 1209</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1223</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1210</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1224</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1211</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//pom name</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String pomName = interpolateString(pom.getName(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1226</td> <td class="nbHitsUncovered"><a title="Line 1226: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1226: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pomName != <span class="keyword">null</span> && !pomName.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1228</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</span></pre></td></tr>
-<tr> <td class="numLine"> 1229</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String pomName = interpolateString(pom.getName(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1213</td> <td class="nbHitsUncovered"><a title="Line 1213: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1213: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pomName != <span class="keyword">null</span> && !pomName.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getProductEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVendorEvidence().addEvidence(<span class="string">"pom"</span>, <span class="string">"name"</span>, pomName, Confidence.HIGH);</span></pre></td></tr>
+<tr> <td class="numLine"> 1216</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1230</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1217</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1231</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1218</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//Description</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1232</td> <td class="nbHitsUncovered"><a title="Line 1232: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1232: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pom.getDescription() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String description = interpolateString(pom.getDescription(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1234</td> <td class="nbHitsUncovered"><a title="Line 1234: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1234: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (description != <span class="keyword">null</span> && !description.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addDescription(dependency, description, <span class="string">"pom"</span>, <span class="string">"description"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 1236</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1219</td> <td class="nbHitsUncovered"><a title="Line 1219: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1219: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pom.getDescription() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String description = interpolateString(pom.getDescription(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1221</td> <td class="nbHitsUncovered"><a title="Line 1221: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1221: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (description != <span class="keyword">null</span> && !description.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addDescription(dependency, description, <span class="string">"pom"</span>, <span class="string">"description"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 1223</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1237</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1224</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractLicense(pom, pomProperties, dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 1240</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractLicense(pom, pomProperties, dependency);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 1227</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1241</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1242</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1229</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Extracts the license information from the pom and adds it to the dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 1243</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1230</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1244</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1231</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param pom the pom object</span></pre></td></tr>
-<tr> <td class="numLine"> 1245</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1232</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param pomProperties the properties, used for string interpolation</span></pre></td></tr>
-<tr> <td class="numLine"> 1246</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1233</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param dependency the dependency to add license information too</span></pre></td></tr>
-<tr> <td class="numLine"> 1247</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1248</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1235</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> extractLicense(Model pom, Properties pomProperties, Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLine"> 1249</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//license</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1250</td> <td class="nbHitsUncovered"><a title="Line 1250: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1250: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pom.getLicenses() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String license = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1252</td> <td class="nbHitsUncovered"><a title="Line 1252: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1252: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (License lic : pom.getLicenses().getLicense()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1253</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String tmp = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1254</td> <td class="nbHitsUncovered"><a title="Line 1254: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1254: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (lic.getName() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = interpolateString(lic.getName(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1237</td> <td class="nbHitsUncovered"><a title="Line 1237: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1237: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (pom.getLicenses() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String license = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1239</td> <td class="nbHitsUncovered"><a title="Line 1239: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1239: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (License lic : pom.getLicenses().getLicense()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String tmp = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1241</td> <td class="nbHitsUncovered"><a title="Line 1241: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1241: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (lic.getName() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1242</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = interpolateString(lic.getName(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLine"> 1243</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1244</td> <td class="nbHitsUncovered"><a title="Line 1244: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1244: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (lic.getUrl() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1245</td> <td class="nbHitsUncovered"><a title="Line 1245: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1245: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = interpolateString(lic.getUrl(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLine"> 1247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 1248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp += <span class="string">": "</span> + interpolateString(lic.getUrl(), pomProperties);</span></pre></td></tr>
+<tr> <td class="numLine"> 1249</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1251</td> <td class="nbHitsUncovered"><a title="Line 1251: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1251: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 1253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1254</td> <td class="nbHitsUncovered"><a title="Line 1254: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1254: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (HTML_DETECTION_PATTERN.matcher(tmp).find()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = Jsoup.parse(tmp).text();</span></pre></td></tr>
<tr> <td class="numLine"> 1256</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1257</td> <td class="nbHitsUncovered"><a title="Line 1257: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1257: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (lic.getUrl() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1258</td> <td class="nbHitsUncovered"><a title="Line 1258: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1258: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1259</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = interpolateString(lic.getUrl(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLine"> 1260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp += <span class="string">": "</span> + interpolateString(lic.getUrl(), pomProperties);</span></pre></td></tr>
-<tr> <td class="numLine"> 1262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1264</td> <td class="nbHitsUncovered"><a title="Line 1264: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1264: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1265</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 1266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1267</td> <td class="nbHitsUncovered"><a title="Line 1267: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1267: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (HTML_DETECTION_PATTERN.matcher(tmp).find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1268</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tmp = Jsoup.parse(tmp).text();</span></pre></td></tr>
-<tr> <td class="numLine"> 1269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1270</td> <td class="nbHitsUncovered"><a title="Line 1270: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1270: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (license == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> license = tmp;</span></pre></td></tr>
-<tr> <td class="numLine"> 1272</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1257</td> <td class="nbHitsUncovered"><a title="Line 1257: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1257: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (license == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> license = tmp;</span></pre></td></tr>
+<tr> <td class="numLine"> 1259</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 1273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> license += <span class="string">"\n"</span> + tmp;</span></pre></td></tr>
-<tr> <td class="numLine"> 1274</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> license += <span class="string">"\n"</span> + tmp;</span></pre></td></tr>
+<tr> <td class="numLine"> 1261</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1276</td> <td class="nbHitsUncovered"><a title="Line 1276: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1276: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (license != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.setLicense(license);</span></pre></td></tr>
-<tr> <td class="numLine"> 1278</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1263</td> <td class="nbHitsUncovered"><a title="Line 1263: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1263: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (license != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.setLicense(license);</span></pre></td></tr>
+<tr> <td class="numLine"> 1265</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1279</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1266</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 1281</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1267</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1268</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1282</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1269</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1283</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1270</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Stores information about a class name.</span></pre></td></tr>
-<tr> <td class="numLine"> 1284</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1271</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1285</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1272</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">static</span> <span class="keyword">class</span> ClassNameInformation {</pre></td></tr>
-<tr> <td class="numLine"> 1286</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1273</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1287</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1274</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1288</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1275</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 1289</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1276</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Stores information about a given class name. This class will keep the fully qualified class name and a list</span></pre></td></tr>
-<tr> <td class="numLine"> 1290</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1277</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * of the important parts of the package structure. Up to the first four levels of the package structure are</span></pre></td></tr>
-<tr> <td class="numLine"> 1291</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1278</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * stored, excluding a leading "org" or "com". Example:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 1292</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1279</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <code>ClassNameInformation obj = new ClassNameInformation("org.owasp.dependencycheck.analyzer.JarAnalyzer");</span></pre></td></tr>
-<tr> <td class="numLine"> 1293</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1280</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * System.out.println(obj.getName());</span></pre></td></tr>
-<tr> <td class="numLine"> 1294</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1281</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * for (String p : obj.getPackageStructure())</span></pre></td></tr>
-<tr> <td class="numLine"> 1295</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1282</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * System.out.println(p);</span></pre></td></tr>
-<tr> <td class="numLine"> 1296</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1283</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * </code></span></pre></td></tr>
-<tr> <td class="numLine"> 1297</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1284</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 1298</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1285</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Would result in:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 1299</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1286</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <code>org.owasp.dependencycheck.analyzer.JarAnalyzer</span></pre></td></tr>
-<tr> <td class="numLine"> 1300</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1287</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * owasp</span></pre></td></tr>
-<tr> <td class="numLine"> 1301</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1288</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * dependencycheck</span></pre></td></tr>
-<tr> <td class="numLine"> 1302</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1289</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * analyzer</span></pre></td></tr>
-<tr> <td class="numLine"> 1303</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1290</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * jaranalyzer</code></span></pre></td></tr>
-<tr> <td class="numLine"> 1304</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1291</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1305</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1292</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param className a fully qualified class name</span></pre></td></tr>
+<tr> <td class="numLine"> 1293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1294</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> ClassNameInformation(String className) {</pre></td></tr>
+<tr> <td class="numLineCover"> 1295</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> name = className;</pre></td></tr>
+<tr> <td class="numLineCover"> 1296</td> <td class="nbHitsUncovered"><a title="Line 1296: Conditional coverage 50% (1/2)."> 1535</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1296: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (name.contains(<span class="string">"/"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1297</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] tmp = className.toLowerCase().split(<span class="string">"/"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 1298</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> <span class="keyword">int</span> start = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 1299</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> <span class="keyword">int</span> end = 3;</pre></td></tr>
+<tr> <td class="numLineCover"> 1300</td> <td class="nbHitsUncovered"><a title="Line 1300: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 1535</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1300: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (<span class="string">"com"</span>.equals(tmp[0]) || <span class="string">"org"</span>.equals(tmp[0])) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1301</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> start = 1;</pre></td></tr>
+<tr> <td class="numLineCover"> 1302</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> end = 4;</pre></td></tr>
+<tr> <td class="numLine"> 1303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 1304</td> <td class="nbHitsCovered"><a title="Line 1304: Conditional coverage 100% (2/2)."> 1535</a></td> <td class="src"><pre class="src"> <a title="Line 1304: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (tmp.length <= end) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1305</td> <td class="nbHitsCovered"> 345</td> <td class="src"><pre class="src"> end = tmp.length - 1;</pre></td></tr>
<tr> <td class="numLine"> 1306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1307</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ClassNameInformation(String className) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1308</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> name = className;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1309</td> <td class="nbHitsUncovered"><a title="Line 1309: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1309: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (name.contains(<span class="string">"/"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1310</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] tmp = className.toLowerCase().split(<span class="string">"/"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1311</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> start = 0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1312</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> end = 3;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1313</td> <td class="nbHitsUncovered"><a title="Line 1313: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1313: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (<span class="string">"com"</span>.equals(tmp[0]) || <span class="string">"org"</span>.equals(tmp[0])) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> start = 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1315</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> end = 4;</span></pre></td></tr>
-<tr> <td class="numLine"> 1316</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1317</td> <td class="nbHitsUncovered"><a title="Line 1317: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1317: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tmp.length <= end) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1318</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> end = tmp.length - 1;</span></pre></td></tr>
-<tr> <td class="numLine"> 1319</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1307</td> <td class="nbHitsCovered"><a title="Line 1307: Conditional coverage 100% (2/2)."> 7330</a></td> <td class="src"><pre class="src"> <a title="Line 1307: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = start; i <= end; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 1308</td> <td class="nbHitsCovered"> 5795</td> <td class="src"><pre class="src"> packageStructure.add(tmp[i]);</pre></td></tr>
+<tr> <td class="numLine"> 1309</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1320</td> <td class="nbHitsUncovered"><a title="Line 1320: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1320: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = start; i <= end; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1321</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> packageStructure.add(tmp[i]);</span></pre></td></tr>
-<tr> <td class="numLine"> 1322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1323</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1324</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> packageStructure.add(name);</span></pre></td></tr>
-<tr> <td class="numLine"> 1325</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1310</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 1311</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> packageStructure.add(name);</span></pre></td></tr>
+<tr> <td class="numLine"> 1312</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 1327</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1313</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1314</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1328</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1315</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The fully qualified class name.</span></pre></td></tr>
-<tr> <td class="numLine"> 1329</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1316</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1330</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1317</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> String name;</pre></td></tr>
-<tr> <td class="numLine"> 1331</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1318</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1332</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1319</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1333</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1320</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Get the value of name</span></pre></td></tr>
-<tr> <td class="numLine"> 1334</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1321</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1335</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1322</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the value of name</span></pre></td></tr>
-<tr> <td class="numLine"> 1336</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1323</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1337</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1324</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLine"> 1338</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1325</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">return</span> name;</pre></td></tr>
-<tr> <td class="numLine"> 1339</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1326</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1327</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 1328</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 1329</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of name</span></pre></td></tr>
+<tr> <td class="numLine"> 1330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 1331</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param name new value of name</span></pre></td></tr>
+<tr> <td class="numLine"> 1332</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 1333</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setName(String name) {</pre></td></tr>
+<tr> <td class="numLine"> 1334</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.name = name;</pre></td></tr>
+<tr> <td class="numLine"> 1335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 1336</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 1337</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Up to the first four levels of the package structure, excluding a leading "org" or "com".</span></pre></td></tr>
+<tr> <td class="numLine"> 1338</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1339</td> <td class="nbHitsCovered"> 1535</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ArrayList<String> packageStructure = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
<tr> <td class="numLine"> 1340</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 1341</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 1342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of name</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of packageStructure</span></pre></td></tr>
<tr> <td class="numLine"> 1343</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 1344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param name new value of name</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of packageStructure</span></pre></td></tr>
<tr> <td class="numLine"> 1345</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 1346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setName(String name) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> ArrayList<String> getPackageStructure() {</pre></td></tr>
<tr> <td class="numLine"> 1347</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.name = name;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> packageStructure;</pre></td></tr>
<tr> <td class="numLine"> 1348</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 1349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 1350</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Up to the first four levels of the package structure, excluding a leading "org" or "com".</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 1351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1352</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">final</span> ArrayList<String> packageStructure = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
-<tr> <td class="numLine"> 1353</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of packageStructure</span></pre></td></tr>
-<tr> <td class="numLine"> 1356</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1357</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of packageStructure</span></pre></td></tr>
-<tr> <td class="numLine"> 1358</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1359</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> ArrayList<String> getPackageStructure() {</pre></td></tr>
-<tr> <td class="numLine"> 1360</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> packageStructure;</pre></td></tr>
-<tr> <td class="numLine"> 1361</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1363</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 1364</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 1365</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1352</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Retrieves the next temporary directory to extract an archive too.</span></pre></td></tr>
-<tr> <td class="numLine"> 1366</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1353</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 1367</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1354</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return a directory</span></pre></td></tr>
-<tr> <td class="numLine"> 1368</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1355</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws AnalysisException thrown if unable to create temporary directory</span></pre></td></tr>
-<tr> <td class="numLine"> 1369</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1356</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 1370</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1357</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> File getNextTempDirectory() <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 1371</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dirCount += 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1372</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File directory = <span class="keyword">new</span> File(tempFileLocation, String.valueOf(dirCount));</span></pre></td></tr>
-<tr> <td class="numLine"> 1373</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1358</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dirCount += 1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1359</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File directory = <span class="keyword">new</span> File(tempFileLocation, String.valueOf(dirCount));</span></pre></td></tr>
+<tr> <td class="numLine"> 1360</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//getting an exception for some directories not being able to be created; might be because the directory already exists?</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1374</td> <td class="nbHitsUncovered"><a title="Line 1374: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1374: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (directory.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1375</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getNextTempDirectory();</span></pre></td></tr>
-<tr> <td class="numLine"> 1376</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1361</td> <td class="nbHitsUncovered"><a title="Line 1361: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1361: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (directory.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1362</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getNextTempDirectory();</span></pre></td></tr>
+<tr> <td class="numLine"> 1363</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1377</td> <td class="nbHitsUncovered"><a title="Line 1377: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1377: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!directory.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 1378</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create temp directory '%s'."</span>, directory.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 1379</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 1380</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1364</td> <td class="nbHitsUncovered"><a title="Line 1364: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 1364: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!directory.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 1365</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create temp directory '%s'."</span>, directory.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 1366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 1367</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 1381</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> directory;</span></pre></td></tr>
-<tr> <td class="numLine"> 1382</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 1368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> directory;</span></pre></td></tr>
+<tr> <td class="numLine"> 1369</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 1383</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 1370</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 1edd35ebd..ec86df6eb 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/26</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.0;</span>2</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html">JavaScriptAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">26%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:26px"><span class="text">7/26</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.0;</span>2</td></tr>
</table>
<div class="separator"> </div>
@@ -105,11 +105,11 @@
<td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 45</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(JavaScriptAnalyzer.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(JavaScriptAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implmentation details of Analyzer"></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"></span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
@@ -124,14 +124,14 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The set of file extensions supported by this analyzer.</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> EXTENSIONS = newHashSet(<span class="string">"js"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> EXTENSIONS = newHashSet(<span class="string">"js"</span>);</pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
@@ -148,7 +148,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EXTENSIONS;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EXTENSIONS;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
@@ -167,7 +167,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
@@ -186,7 +186,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
@@ -205,7 +205,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> String getAnalyzerEnabledSettingKey() {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_JAVASCRIPT_ENABLED;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_JAVASCRIPT_ENABLED;</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
@@ -228,7 +228,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyzeFileType(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedReader fin = <span class="keyword">null</span>;;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedReader fin = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
@@ -275,6 +275,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 e4d6a49c9..bb4c86232 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/39</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.NexusAnalyzer.html">NexusAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">15%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:15px"><span class="text">6/39</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
</table>
<div class="separator"> </div>
@@ -123,7 +123,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NexusAnalyzer.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NexusAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
@@ -142,7 +142,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase in which the analyzer runs.</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
@@ -151,7 +151,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The types of files on which this will work.</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> SUPPORTED_EXTENSIONS = newHashSet(<span class="string">"jar"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> SUPPORTED_EXTENSIONS = newHashSet(<span class="string">"jar"</span>);</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
@@ -218,7 +218,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
@@ -237,7 +237,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> String getAnalyzerEnabledSettingKey() {</pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_NEXUS_ENABLED;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_NEXUS_ENABLED;</pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
@@ -256,7 +256,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
@@ -324,7 +324,7 @@
<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException fnfe) {</span></pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//dependency.addAnalysisException(new AnalysisException("Artifact not found on repository"));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(String.format(<span class="string">"Artificat not found in repository '%s'"</span>, dependency.getFileName()));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(String.format(<span class="string">"Artifact not found in repository '%s'"</span>, dependency.getFileName()));</span></pre></td></tr>
<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, fnfe.getMessage(), fnfe);</span></pre></td></tr>
<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ioe) {</span></pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
@@ -336,6 +336,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 d99a93961..a457598dc 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html">NuspecAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">7/34</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6666666666666665;</span>2.667</td></tr>
</table>
<div class="separator"> </div>
@@ -107,7 +107,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NuspecAnalyzer.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NuspecAnalyzer.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
@@ -126,7 +126,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase in which the analyzer runs.</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
@@ -135,7 +135,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The types of files on which this will work.</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> SUPPORTED_EXTENSIONS = newHashSet(<span class="string">"nuspec"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Set<String> SUPPORTED_EXTENSIONS = newHashSet(<span class="string">"nuspec"</span>);</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
@@ -169,7 +169,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
@@ -188,7 +188,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> String getAnalyzerEnabledSettingKey() {</pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_NUSPEC_ENABLED;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Settings.KEYS.ANALYZER_NUSPEC_ENABLED;</pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
@@ -207,7 +207,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
@@ -226,7 +226,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getSupportedExtensions() {</pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> SUPPORTED_EXTENSIONS;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 852</td> <td class="src"><pre class="src"> <span class="keyword">return</span> SUPPORTED_EXTENSIONS;</pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
@@ -297,6 +297,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 d603489da..014d9e860 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.625;</span>1.625</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html">NvdCveAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">67%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">23/34</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">6/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.125;</span>2.125</td></tr>
</table>
<div class="separator"> </div>
@@ -129,9 +129,9 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> open() <span class="keyword">throws</span> SQLException, IOException, DatabaseException, ClassNotFoundException {</pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB = <span class="keyword">new</span> CveDB();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.open();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cveDB = <span class="keyword">new</span> CveDB();</pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cveDB.open();</pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
@@ -144,9 +144,9 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() {</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cveDB.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cveDB = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
@@ -161,7 +161,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isOpen() {</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"><a title="Line 76: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 76: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> (cveDB != <span class="keyword">null</span>);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"><a title="Line 76: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 76: Conditional coverage 50% (1/2)."> <span class="keyword">return</span> (cveDB != <span class="keyword">null</span>);</a></span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
@@ -180,12 +180,12 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> finalize() <span class="keyword">throws</span> Throwable {</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">super</span>.finalize();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (isOpen()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">super</span>.finalize();</pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (isOpen()) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> close();</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
@@ -206,80 +206,93 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(Dependency dependency, Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"><a title="Line 101: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 101: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Identifier id : dependency.getIdentifiers()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"><a title="Line 102: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 102: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(id.getType())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 101: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Identifier id : dependency.getIdentifiers()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"><a title="Line 102: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 102: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(id.getType())) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String value = id.getValue();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Vulnerability> vulns = cveDB.getVulnerabilities(value);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getVulnerabilities().addAll(vulns);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String value = id.getValue();</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<Vulnerability> vulns = cveDB.getVulnerabilities(value);</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> dependency.getVulnerabilities().addAll(vulns);</pre></td></tr>
<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"><a title="Line 112: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 112: Conditional coverage 50% (1/2)."> <span class="keyword">for</span> (Identifier id : dependency.getSuppressedIdentifiers()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"><a title="Line 113: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 113: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"cpe"</span>.equals(id.getType())) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the name of this analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the name of this analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"NVD CVE Analyzer"</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String value = id.getValue();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<Vulnerability> vulns = cveDB.getVulnerabilities(value);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dependency.getSuppressedVulnerabilities().addAll(vulns);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AnalysisException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the analysis phase that this analyzer should run in.</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the analysis phase that this analyzer should run in.</span></pre></td></tr>
-<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> AnalysisPhase.FINDING_ANALYSIS;</span></pre></td></tr>
-<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Opens the database used to gather NVD CVE data.</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the name of this analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an issue opening the index.</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the name of this analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"NVD CVE Analyzer"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the analysis phase that this analyzer should run in.</span></pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the analysis phase that this analyzer should run in.</span></pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.open();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> AnalysisPhase.FINDING_ANALYSIS;</pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Opens the database used to gather NVD CVE data.</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an issue opening the index.</span></pre></td></tr>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> Exception {</pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.open();</pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 50bb1b6e8..7d0324b97 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html">VulnerabilitySuppressionAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">55%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">5/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">1/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
</table>
<div class="separator"> </div>
@@ -97,7 +97,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The phase that this analyzer is intended to run in.</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_FINDING_ANALYSIS;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_FINDING_ANALYSIS;</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
@@ -114,7 +114,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYZER_NAME;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYZER_NAME;</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
@@ -133,7 +133,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AnalysisPhase getAnalysisPhase() {</pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ANALYSIS_PHASE;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ANALYSIS_PHASE;</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
@@ -146,8 +146,8 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> analyze(<span class="keyword">final</span> Dependency dependency, <span class="keyword">final</span> Engine engine) <span class="keyword">throws</span> AnalysisException {</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (getRules() == <span class="keyword">null</span> || getRules().size() <= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (getRules() == <span class="keyword">null</span> || getRules().size() <= 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
@@ -160,6 +160,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f8f753d57..8aa19cf3c 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 3d6ca0d9d..544cf52bd 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 d6761bac5..7fa294788 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 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/91</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.9285714285714284;</span>2.929</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html">CpeMemoryIndex</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">73%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:73px"><span class="text">68/92</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">42%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:42px"><span class="text">12/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.9285714285714284;</span>2.929</td></tr>
</table>
<div class="separator"> </div>
@@ -130,452 +130,457 @@
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> CpeMemoryIndex {</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * singleton instance.</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> CpeMemoryIndex instance = <span class="keyword">new</span> CpeMemoryIndex();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(CpeMemoryIndex.<span class="keyword">class</span>.getName());</pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * singleton instance.</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * private constructor for singleton.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> CpeMemoryIndex instance = <span class="keyword">new</span> CpeMemoryIndex();</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> CpeMemoryIndex() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * private constructor for singleton.</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> CpeMemoryIndex() {</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the singleton instance of the CpeMemoryIndex.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the instance of the CpeMemoryIndex</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the singleton instance of the CpeMemoryIndex.</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> CpeMemoryIndex getInstance() {</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> instance;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the instance of the CpeMemoryIndex</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The in memory Lucene index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> CpeMemoryIndex getInstance() {</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> instance;</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> RAMDirectory index;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The in memory Lucene index.</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Lucene IndexReader.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> RAMDirectory index;</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> IndexReader indexReader;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Lucene IndexReader.</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Lucene IndexSearcher.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> IndexReader indexReader;</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> IndexSearcher indexSearcher;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Lucene IndexSearcher.</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Lucene Analyzer used for Searching.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> IndexSearcher indexSearcher;</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Analyzer searchingAnalyzer;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Lucene Analyzer used for Searching.</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Lucene QueryParser used for Searching.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Analyzer searchingAnalyzer;</pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> QueryParser queryParser;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Lucene QueryParser used for Searching.</span></pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The search field analyzer for the product field.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> QueryParser queryParser;</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> SearchFieldAnalyzer productSearchFieldAnalyzer;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The search field analyzer for the product field.</span></pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The search field analyzer for the vendor field.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> SearchFieldAnalyzer productSearchFieldAnalyzer;</pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> SearchFieldAnalyzer vendorSearchFieldAnalyzer;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The search field analyzer for the vendor field.</span></pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates and loads data into an in memory index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> SearchFieldAnalyzer vendorSearchFieldAnalyzer;</pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cve the data source to retrieve the cpe data</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IndexException thrown if there is an error creating the index</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates and loads data into an in memory index.</span></pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cve the data source to retrieve the cpe data</span></pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IndexException thrown if there is an error creating the index</span></pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> open(CveDB cve) <span class="keyword">throws</span> IndexException {</pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"><a title="Line 113: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 113: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!openState) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> index = <span class="keyword">new</span> RAMDirectory();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> buildIndex(cve);</span></pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"><a title="Line 116: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 116: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!openState) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> index = <span class="keyword">new</span> RAMDirectory();</pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> buildIndex(cve);</pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexReader = DirectoryReader.open(index);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexSearcher = <span class="keyword">new</span> IndexSearcher(indexReader);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> searchingAnalyzer = createSearchingAnalyzer();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> queryParser = <span class="keyword">new</span> QueryParser(LuceneUtils.CURRENT_VERSION, Fields.DOCUMENT_KEY, searchingAnalyzer);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> openState = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexReader = DirectoryReader.open(index);</pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexSearcher = <span class="keyword">new</span> IndexSearcher(indexReader);</pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> searchingAnalyzer = createSearchingAnalyzer();</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> queryParser = <span class="keyword">new</span> QueryParser(LuceneUtils.CURRENT_VERSION, Fields.DOCUMENT_KEY, searchingAnalyzer);</pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> openState = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A flag indicating whether or not the index is open.</span></pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> openState = <span class="keyword">false</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A flag indicating whether or not the index is open.</span></pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * returns whether or not the index is open.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> openState = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the index is open</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * returns whether or not the index is open.</span></pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isOpen() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> openState;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the index is open</span></pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isOpen() {</pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> openState;</pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates the indexing analyzer for the CPE Index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the CPE Analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @SuppressWarnings(<span class="string">"unchecked"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Analyzer createIndexingAnalyzer() {</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Map fieldAnalyzers = <span class="keyword">new</span> HashMap();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fieldAnalyzers.put(Fields.DOCUMENT_KEY, <span class="keyword">new</span> KeywordAnalyzer());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> PerFieldAnalyzerWrapper(<span class="keyword">new</span> FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);</span></pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates an Analyzer for searching the CPE Index.</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates the indexing analyzer for the CPE Index.</span></pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the CPE Analyzer.</span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @SuppressWarnings(<span class="string">"unchecked"</span>)</pre></td></tr>
-<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Analyzer createSearchingAnalyzer() {</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Map fieldAnalyzers = <span class="keyword">new</span> HashMap();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fieldAnalyzers.put(Fields.DOCUMENT_KEY, <span class="keyword">new</span> KeywordAnalyzer());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productSearchFieldAnalyzer = <span class="keyword">new</span> SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorSearchFieldAnalyzer = <span class="keyword">new</span> SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);</span></pre></td></tr>
-<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> PerFieldAnalyzerWrapper(<span class="keyword">new</span> FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);</span></pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Analyzer createIndexingAnalyzer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Map fieldAnalyzers = <span class="keyword">new</span> HashMap();</pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> fieldAnalyzers.put(Fields.DOCUMENT_KEY, <span class="keyword">new</span> KeywordAnalyzer());</pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> PerFieldAnalyzerWrapper(<span class="keyword">new</span> FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);</pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates an Analyzer for searching the CPE Index.</span></pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the CPE Analyzer.</span></pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @SuppressWarnings(<span class="string">"unchecked"</span>)</pre></td></tr>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Analyzer createSearchingAnalyzer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Map fieldAnalyzers = <span class="keyword">new</span> HashMap();</pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> fieldAnalyzers.put(Fields.DOCUMENT_KEY, <span class="keyword">new</span> KeywordAnalyzer());</pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> productSearchFieldAnalyzer = <span class="keyword">new</span> SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);</pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vendorSearchFieldAnalyzer = <span class="keyword">new</span> SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);</pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);</pre></td></tr>
<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> PerFieldAnalyzerWrapper(<span class="keyword">new</span> FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Saves a CPE IndexEntry into the Lucene index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vendor the vendor to index</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param product the product to index</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Saves a CPE IndexEntry into the Lucene index.</span></pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param indexWriter the index writer to write the entry into</span></pre></td></tr>
-<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException is thrown if the index is corrupt</span></pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if an IOException occurs</span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> saveEntry(String vendor, String product, IndexWriter indexWriter) <span class="keyword">throws</span> CorruptIndexException, IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Document doc = <span class="keyword">new</span> Document();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Field v = <span class="keyword">new</span> TextField(Fields.VENDOR, vendor, Field.Store.YES);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Field p = <span class="keyword">new</span> TextField(Fields.PRODUCT, product, Field.Store.YES);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> doc.add(v);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> doc.add(p);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexWriter.addDocument(doc);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Closes the CPE Index.</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() {</pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"><a title="Line 192: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 192: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (searchingAnalyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> searchingAnalyzer.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> searchingAnalyzer = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"><a title="Line 196: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 196: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (indexReader != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexReader.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CpeMemoryIndex.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexReader = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> queryParser = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexSearcher = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"><a title="Line 206: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 206: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (index != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> index.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> index = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> openState = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Builds the CPE Lucene Index based off of the data within the CveDB.</span></pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cve the data base containing the CPE data</span></pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IndexException thrown if there is an issue creating the index</span></pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vendor the vendor to index</span></pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param product the product to index</span></pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param indexWriter the index writer to write the entry into</span></pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException is thrown if the index is corrupt</span></pre></td></tr>
+<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if an IOException occurs</span></pre></td></tr>
+<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> buildIndex(CveDB cve) <span class="keyword">throws</span> IndexException {</pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Analyzer analyzer = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> IndexWriter indexWriter = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzer = createIndexingAnalyzer();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IndexWriterConfig conf = <span class="keyword">new</span> IndexWriterConfig(LuceneUtils.CURRENT_VERSION, analyzer);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexWriter = <span class="keyword">new</span> IndexWriter(index, conf);</span></pre></td></tr>
-<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Pair<String, String>> data = cve.getVendorProductList();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"><a title="Line 228: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 228: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Pair<String, String> pair : data) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saveEntry(pair.getLeft(), pair.getRight(), indexWriter);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CpeMemoryIndex.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Error reading CPE data"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"><a title="Line 240: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 240: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (indexWriter != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexWriter.commit();</span></pre></td></tr>
-<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> indexWriter.close(<span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"><a title="Line 252: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 252: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (analyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> analyzer.close();</span></pre></td></tr>
-<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> saveEntry(String vendor, String product, IndexWriter indexWriter) <span class="keyword">throws</span> CorruptIndexException, IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Document doc = <span class="keyword">new</span> Document();</pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Field v = <span class="keyword">new</span> TextField(Fields.VENDOR, vendor, Field.Store.YES);</pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Field p = <span class="keyword">new</span> TextField(Fields.PRODUCT, product, Field.Store.YES);</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> doc.add(v);</pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> doc.add(p);</pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> indexWriter.addDocument(doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Resets the searching analyzers</span></pre></td></tr>
-<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Closes the CPE Index.</span></pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> resetSearchingAnalyzer() {</pre></td></tr>
-<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"><a title="Line 263: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 263: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (productSearchFieldAnalyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productSearchFieldAnalyzer.clear();</span></pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() {</pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"><a title="Line 195: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 195: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (searchingAnalyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> searchingAnalyzer.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> searchingAnalyzer = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"><a title="Line 266: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 266: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (vendorSearchFieldAnalyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorSearchFieldAnalyzer.clear();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"><a title="Line 199: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 199: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (indexReader != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexReader.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexReader = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> queryParser = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexSearcher = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (index != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> index.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> index = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> openState = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Builds the CPE Lucene Index based off of the data within the CveDB.</span></pre></td></tr>
+<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cve the data base containing the CPE data</span></pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IndexException thrown if there is an issue creating the index</span></pre></td></tr>
+<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> buildIndex(CveDB cve) <span class="keyword">throws</span> IndexException {</pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Analyzer analyzer = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> IndexWriter indexWriter = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> analyzer = createIndexingAnalyzer();</pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> IndexWriterConfig conf = <span class="keyword">new</span> IndexWriterConfig(LuceneUtils.CURRENT_VERSION, analyzer);</pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexWriter = <span class="keyword">new</span> IndexWriter(index, conf);</pre></td></tr>
+<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<Pair<String, String>> data = cve.getVendorProductList();</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"><a title="Line 231: Conditional coverage 100% (2/2)."> 1</a></td> <td class="src"><pre class="src"> <a title="Line 231: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Pair<String, String> pair : data) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> saveEntry(pair.getLeft(), pair.getRight(), indexWriter);</pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsCovered"> 21494</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Error reading CPE data"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"><a title="Line 243: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 243: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (indexWriter != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexWriter.commit();</pre></td></tr>
+<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> indexWriter.close(<span class="keyword">true</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IndexException(<span class="string">"Unable to close an in-memory index"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 254</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"><a title="Line 255: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 255: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (analyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> analyzer.close();</pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Resets the searching analyzers</span></pre></td></tr>
+<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> resetSearchingAnalyzer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"><a title="Line 266: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 266: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (productSearchFieldAnalyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productSearchFieldAnalyzer.clear();</span></pre></td></tr>
<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"><a title="Line 269: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 269: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (vendorSearchFieldAnalyzer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorSearchFieldAnalyzer.clear();</span></pre></td></tr>
<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Searches the index using the given search string.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param searchString the query text</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param maxQueryResults the maximum number of documents to return</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Searches the index using the given search string.</span></pre></td></tr>
<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the TopDocs found by the search</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws ParseException thrown when the searchString is invalid</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param searchString the query text</span></pre></td></tr>
<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if there is an issue with the underlying Index</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param maxQueryResults the maximum number of documents to return</span></pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the TopDocs found by the search</span></pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> TopDocs search(String searchString, <span class="keyword">int</span> maxQueryResults) <span class="keyword">throws</span> ParseException, IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"><a title="Line 281: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 281: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (searchString == <span class="keyword">null</span> || searchString.trim().isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ParseException(<span class="string">"Query is null or empty"</span>);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws ParseException thrown when the searchString is invalid</span></pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if there is an issue with the underlying Index</span></pre></td></tr>
+<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Query query = queryParser.parse(searchString);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> indexSearcher.search(query, maxQueryResults);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> TopDocs search(String searchString, <span class="keyword">int</span> maxQueryResults) <span class="keyword">throws</span> ParseException, IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"><a title="Line 284: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 284: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (searchString == <span class="keyword">null</span> || searchString.trim().isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ParseException(<span class="string">"Query is null or empty"</span>);</span></pre></td></tr>
<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Searches the index using the given query.</span></pre></td></tr>
-<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param query the query used to search the index</span></pre></td></tr>
-<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param maxQueryResults the max number of results to return</span></pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the TopDocs found be the query</span></pre></td></tr>
-<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException thrown if the Index is corrupt</span></pre></td></tr>
-<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an IOException</span></pre></td></tr>
-<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> TopDocs search(Query query, <span class="keyword">int</span> maxQueryResults) <span class="keyword">throws</span> CorruptIndexException, IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> resetSearchingAnalyzer();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> indexSearcher.search(query, maxQueryResults);</span></pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieves a document from the Index.</span></pre></td></tr>
-<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param documentId the id of the document to retrieve</span></pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the Document</span></pre></td></tr>
-<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an IOException</span></pre></td></tr>
-<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Document getDocument(<span class="keyword">int</span> documentId) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 310</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> indexSearcher.doc(documentId);</span></pre></td></tr>
-<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the number of CPE entries stored in the index.</span></pre></td></tr>
-<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the number of CPE entries stored in the index</span></pre></td></tr>
-<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> numDocs() {</pre></td></tr>
-<tr> <td class="numLineCover"> 319</td> <td class="nbHitsUncovered"><a title="Line 319: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 319: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (indexReader == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> -1;</span></pre></td></tr>
-<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> indexReader.numDocs();</span></pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 287</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Query query = queryParser.parse(searchString);</pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">return</span> indexSearcher.search(query, maxQueryResults);</pre></td></tr>
+<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Searches the index using the given query.</span></pre></td></tr>
+<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param query the query used to search the index</span></pre></td></tr>
+<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param maxQueryResults the max number of results to return</span></pre></td></tr>
+<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the TopDocs found be the query</span></pre></td></tr>
+<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException thrown if the Index is corrupt</span></pre></td></tr>
+<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an IOException</span></pre></td></tr>
+<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> TopDocs search(Query query, <span class="keyword">int</span> maxQueryResults) <span class="keyword">throws</span> CorruptIndexException, IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> resetSearchingAnalyzer();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> indexSearcher.search(query, maxQueryResults);</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Retrieves a document from the Index.</span></pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param documentId the id of the document to retrieve</span></pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the Document</span></pre></td></tr>
+<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an IOException</span></pre></td></tr>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Document getDocument(<span class="keyword">int</span> documentId) <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 313</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">return</span> indexSearcher.doc(documentId);</pre></td></tr>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the number of CPE entries stored in the index.</span></pre></td></tr>
+<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the number of CPE entries stored in the index</span></pre></td></tr>
+<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> numDocs() {</pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"><a title="Line 322: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 322: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (indexReader == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> -1;</span></pre></td></tr>
<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> indexReader.numDocs();</pre></td></tr>
+<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 834e56adf..d4d363648 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
@@ -103,6 +103,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 d6b481239..b55cf4e39 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/32</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.cpe.IndexEntry.html">IndexEntry</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">58%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:58px"><span class="text">14/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">34%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:34px"><span class="text">11/32</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
</table>
<div class="separator"> </div>
@@ -302,19 +302,19 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> parseName(String cpeName) <span class="keyword">throws</span> UnsupportedEncodingException {</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 145: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cpeName != <span class="keyword">null</span> && cpeName.length() > 7) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] data = cpeName.substring(7).split(<span class="string">":"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"><a title="Line 147: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 147: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (data.length >= 1) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendor = URLDecoder.decode(data[0].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"><a title="Line 149: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 149: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (data.length >= 2) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> product = URLDecoder.decode(data[1].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 145: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (cpeName != <span class="keyword">null</span> && cpeName.length() > 7) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] data = cpeName.substring(7).split(<span class="string">":"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"><a title="Line 147: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 147: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (data.length >= 1) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vendor = URLDecoder.decode(data[0].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"><a title="Line 149: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 149: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (data.length >= 2) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> product = URLDecoder.decode(data[1].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
@@ -332,21 +332,21 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"><a title="Line 165: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 165: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"><a title="Line 165: Conditional coverage 50% (1/2)."> 336</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 165: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"><a title="Line 168: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 168: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"><a title="Line 168: Conditional coverage 50% (1/2)."> 336</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 168: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> IndexEntry other = (IndexEntry) obj;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"><a title="Line 172: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 172: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.vendor == <span class="keyword">null</span>) ? (other.vendor != <span class="keyword">null</span>) : !<span class="keyword">this</span>.vendor.equals(other.vendor)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 336</td> <td class="src"><pre class="src"> <span class="keyword">final</span> IndexEntry other = (IndexEntry) obj;</pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"><a title="Line 172: Conditional coverage 50% (3/6) [each condition: 50%, 0%, 100%]."> 336</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 172: Conditional coverage 50% (3/6) [each condition: 50%, 0%, 100%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.vendor == <span class="keyword">null</span>) ? (other.vendor != <span class="keyword">null</span>) : !<span class="keyword">this</span>.vendor.equals(other.vendor)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"> 279</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"><a title="Line 175: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 175: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.product == <span class="keyword">null</span>) ? (other.product != <span class="keyword">null</span>) : !<span class="keyword">this</span>.product.equals(other.product)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"><a title="Line 175: Conditional coverage 33% (2/6) [each condition: 50%, 0%, 50%]."> 57</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 175: Conditional coverage 33% (2/6) [each condition: 50%, 0%, 50%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.product == <span class="keyword">null</span>) ? (other.product != <span class="keyword">null</span>) : !<span class="keyword">this</span>.product.equals(other.product)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 57</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
@@ -375,6 +375,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 780cc993f..57ef2676d 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 e85de9f6d..2c345540b 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/21</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.cwe.CweDB.html">CweDB</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">54%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:54px"><span class="text">12/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">2/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.3333333333333335;</span>3.333</td></tr>
</table>
<div class="separator"> </div>
@@ -80,98 +80,103 @@
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> CweDB {</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Empty private constructor as this is a utility class.</span></pre></td></tr>
-<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(CweDB.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> CweDB() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//empty</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Empty private constructor as this is a utility class.</span></pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> CweDB() {</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A HashMap of the CWE data.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//empty</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> HashMap<String, String> CWE = loadData();</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A HashMap of the CWE data.</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads a HashMap containing the CWE data from a resource found in the jar.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> HashMap<String, String> CWE = loadData();</pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a HashMap of CWE data</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> HashMap<String, String> loadData() {</pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ObjectInputStream oin = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String filePath = <span class="string">"data/cwe.hashmap.serialized"</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputStream input = CweDB.<span class="keyword">class</span>.getClassLoader().getResourceAsStream(filePath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> oin = <span class="keyword">new</span> ObjectInputStream(input);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> (HashMap<String, String>) oin.readObject();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CweDB.<span class="keyword">class</span>.getName()).log(Level.WARNING, <span class="string">"Unable to load CWE data. This should not be an issue."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CweDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CweDB.<span class="keyword">class</span>.getName()).log(Level.WARNING, <span class="string">"Unable to load CWE data due to an IO Error. This should not be an issue."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CweDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"><a title="Line 63: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 63: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (oin != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> oin.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CweDB.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the full CWE name from the CWE ID.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads a HashMap containing the CWE data from a resource found in the jar.</span></pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cweId the CWE ID</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the full name of the CWE</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a HashMap of CWE data</span></pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getCweName(String cweId) {</pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"><a title="Line 82: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 82: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cweId != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CWE.get(cweId);</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> HashMap<String, String> loadData() {</pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ObjectInputStream oin = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String filePath = <span class="string">"data/cwe.hashmap.serialized"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> InputStream input = CweDB.<span class="keyword">class</span>.getClassLoader().getResourceAsStream(filePath);</pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> oin = <span class="keyword">new</span> ObjectInputStream(input);</pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> (HashMap<String, String>) oin.readObject();</pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Unable to load CWE data. This should not be an issue."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Unable to load CWE data due to an IO Error. This should not be an issue."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"><a title="Line 66: Conditional coverage 12% (1/8) [each condition: 50%, 0%, 0%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 66: Conditional coverage 12% (1/8) [each condition: 50%, 0%, 0%, 0%]."> <span class="keyword">if</span> (oin != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> oin.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the full CWE name from the CWE ID.</p></span></pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cweId the CWE ID</span></pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the full name of the CWE</span></pre></td></tr>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getCweName(String cweId) {</pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"><a title="Line 85: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 85: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (cweId != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CWE.get(cweId);</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 8b0dcbd13..da169430a 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 5b2c888f7..b5871c832 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html">AbstractTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">10/10</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
</table>
<div class="separator"> </div>
@@ -85,7 +85,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The char term attribute.</span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 35</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">final</span> CharTermAttribute termAtt = addAttribute(CharTermAttribute.<span class="keyword">class</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> CharTermAttribute termAtt = addAttribute(CharTermAttribute.<span class="keyword">class</span>);</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
@@ -144,9 +144,9 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AbstractTokenizingFilter(TokenStream stream) {</pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">super</span>(stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tokens = <span class="keyword">new</span> LinkedList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> tokens = <span class="keyword">new</span> LinkedList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
@@ -161,20 +161,20 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">boolean</span> addTerm() {</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"><a title="Line 75: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 75: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">boolean</span> termAdded = tokens.size() > 0;</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"><a title="Line 76: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 76: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (termAdded) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String term = tokens.pop();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> clearAttributes();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> termAtt.append(term);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"><a title="Line 75: Conditional coverage 100% (2/2)."> 26554</a></td> <td class="src"><pre class="src"> <a title="Line 75: Conditional coverage 100% (2/2)."> <span class="keyword">final</span> <span class="keyword">boolean</span> termAdded = tokens.size() > 0;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"><a title="Line 76: Conditional coverage 100% (2/2)."> 26542</a></td> <td class="src"><pre class="src"> <a title="Line 76: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (termAdded) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 17463</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String term = tokens.pop();</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 17464</td> <td class="src"><pre class="src"> clearAttributes();</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 17475</td> <td class="src"><pre class="src"> termAtt.append(term);</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> termAdded;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 26532</td> <td class="src"><pre class="src"> <span class="keyword">return</span> termAdded;</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f1420ec9e..79d7873fa 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html">AlphaNumericTokenizer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">1/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
</table>
<div class="separator"> </div>
@@ -135,13 +135,13 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">boolean</span> isTokenChar(<span class="keyword">int</span> c) {</pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"><a title="Line 60: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 60: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">return</span> Character.isLetter(c) || Character.isDigit(c);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"><a title="Line 60: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 501912</a></td> <td class="src"><pre class="src"> <a title="Line 60: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">return</span> Character.isLetter(c) || Character.isDigit(c);</a></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 cc3fa360d..6a36aa7d5 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 517b15be6..8e836e888 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html">FieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">6/6</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator"> </div>
@@ -139,13 +139,13 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> TokenStreamComponents createComponents(String fieldName, Reader reader) {</pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Tokenizer source = <span class="keyword">new</span> AlphaNumericTokenizer(version, reader);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Tokenizer source = <span class="keyword">new</span> AlphaNumericTokenizer(version, reader);</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> TokenStream stream = source;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> TokenStream stream = source;</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = <span class="keyword">new</span> WordDelimiterFilter(stream,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> stream = <span class="keyword">new</span> WordDelimiterFilter(stream,</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> WordDelimiterFilter.CATENATE_WORDS</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
@@ -162,17 +162,17 @@
<td class="src"><pre class="src"> | WordDelimiterFilter.STEM_ENGLISH_POSSESSIVE, <span class="keyword">null</span>);</pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = <span class="keyword">new</span> LowerCaseFilter(version, stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = <span class="keyword">new</span> StopFilter(version, stream, StopAnalyzer.ENGLISH_STOP_WORDS_SET);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> stream = <span class="keyword">new</span> LowerCaseFilter(version, stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> stream = <span class="keyword">new</span> StopFilter(version, stream, StopAnalyzer.ENGLISH_STOP_WORDS_SET);</pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> TokenStreamComponents(source, stream);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> TokenStreamComponents(source, stream);</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 bb1f92987..e83150713 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.0;</span>9</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.LuceneUtils.html">LuceneUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">16/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">90%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">9/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">9.0;</span>9</td></tr>
</table>
<div class="separator"> </div>
@@ -83,7 +83,7 @@
<td class="src"><pre class="src"> <span class="comment"> * the code base.</span></pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 34</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> Version CURRENT_VERSION = Version.LUCENE_45;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> Version CURRENT_VERSION = Version.LUCENE_45;</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
@@ -124,15 +124,15 @@
<td class="src"><pre class="src"> <span class="keyword">final</span> CharSequence text) {</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"><a title="Line 55: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 55: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (text == <span class="keyword">null</span> || buf == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"><a title="Line 55: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 227</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 55: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (text == <span class="keyword">null</span> || buf == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"><a title="Line 59: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 59: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < text.length(); i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">char</span> c = text.charAt(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"><a title="Line 61: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 61: Conditional coverage 0% (0/2)."> <span class="keyword">switch</span> (c) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"><a title="Line 59: Conditional coverage 100% (2/2)."> 2333</a></td> <td class="src"><pre class="src"> <a title="Line 59: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < text.length(); i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 2107</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">char</span> c = text.charAt(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"><a title="Line 61: Conditional coverage 100% (2/2)."> 2107</a></td> <td class="src"><pre class="src"> <a title="Line 61: Conditional coverage 100% (2/2)."> <span class="keyword">switch</span> (c) {</a></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">case</span> <span class="string">'+'</span>:</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
@@ -169,17 +169,17 @@
<td class="src"><pre class="src"> <span class="keyword">case</span> <span class="string">':'</span>:</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">case</span> <span class="string">'\\'</span>: <span class="comment">//it is supposed to fall through here</span></pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> buf.append(<span class="string">'\\'</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 72</td> <td class="src"><pre class="src"> buf.append(<span class="string">'\\'</span>);</pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">default</span>:</pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> buf.append(c);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 2107</td> <td class="src"><pre class="src"> buf.append(c);</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 226</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
@@ -198,27 +198,27 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String escapeLuceneQuery(<span class="keyword">final</span> CharSequence text) {</pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"><a title="Line 96: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 96: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"><a title="Line 96: Conditional coverage 100% (2/2)."> 226</a></td> <td class="src"><pre class="src"> <a title="Line 96: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> size = text.length();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> size = size >> 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder buf = <span class="keyword">new</span> StringBuilder(size);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 225</td> <td class="src"><pre class="src"> <span class="keyword">int</span> size = text.length();</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 225</td> <td class="src"><pre class="src"> size = size >> 1;</pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 225</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringBuilder buf = <span class="keyword">new</span> StringBuilder(size);</pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> appendEscapedLuceneQuery(buf, text);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 225</td> <td class="src"><pre class="src"> appendEscapedLuceneQuery(buf, text);</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> buf.toString();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 225</td> <td class="src"><pre class="src"> <span class="keyword">return</span> buf.toString();</pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 96987705a..35bf21f5e 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html">SearchFieldAnalyzer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">1/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
</table>
<div class="separator"> </div>
@@ -145,13 +145,13 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> TokenStreamComponents createComponents(String fieldName, Reader reader) {</pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Tokenizer source = <span class="keyword">new</span> AlphaNumericTokenizer(version, reader);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Tokenizer source = <span class="keyword">new</span> AlphaNumericTokenizer(version, reader);</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> TokenStream stream = source;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> TokenStream stream = source;</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = <span class="keyword">new</span> WordDelimiterFilter(stream,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> stream = <span class="keyword">new</span> WordDelimiterFilter(stream,</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> WordDelimiterFilter.GENERATE_WORD_PARTS</pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
@@ -166,14 +166,14 @@
<td class="src"><pre class="src"> | WordDelimiterFilter.STEM_ENGLISH_POSSESSIVE, <span class="keyword">null</span>);</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = <span class="keyword">new</span> LowerCaseFilter(version, stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = <span class="keyword">new</span> UrlTokenizingFilter(stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> concatenatingFilter = <span class="keyword">new</span> TokenPairConcatenatingFilter(stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = concatenatingFilter;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stream = <span class="keyword">new</span> StopFilter(version, stream, StopAnalyzer.ENGLISH_STOP_WORDS_SET);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> stream = <span class="keyword">new</span> LowerCaseFilter(version, stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> stream = <span class="keyword">new</span> UrlTokenizingFilter(stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> concatenatingFilter = <span class="keyword">new</span> TokenPairConcatenatingFilter(stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> stream = concatenatingFilter;</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> stream = <span class="keyword">new</span> StopFilter(version, stream, StopAnalyzer.ENGLISH_STOP_WORDS_SET);</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> TokenStreamComponents(source, stream);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> TokenStreamComponents(source, stream);</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
@@ -194,15 +194,15 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> clear() {</pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"><a title="Line 94: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 94: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (concatenatingFilter != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> concatenatingFilter.clear();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"><a title="Line 94: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 94: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (concatenatingFilter != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> concatenatingFilter.clear();</pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 a1da0ba89..e052bb97e 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 6aca86c3b..55a803bff 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2;</span>2.2</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html">TokenPairConcatenatingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">24/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">8/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2;</span>2.2</td></tr>
</table>
<div class="separator"> </div>
@@ -93,7 +93,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The char term attribute.</span></pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">final</span> CharTermAttribute termAtt = addAttribute(CharTermAttribute.<span class="keyword">class</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> CharTermAttribute termAtt = addAttribute(CharTermAttribute.<span class="keyword">class</span>);</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
@@ -160,9 +160,9 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> TokenPairConcatenatingFilter(TokenStream stream) {</pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">super</span>(stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> words = <span class="keyword">new</span> LinkedList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> words = <span class="keyword">new</span> LinkedList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
@@ -187,35 +187,35 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//collect all the terms into the words collection</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"><a title="Line 88: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 88: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (input.incrementToken()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String word = <span class="keyword">new</span> String(termAtt.buffer(), 0, termAtt.length());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> words.add(word);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"><a title="Line 88: Conditional coverage 100% (2/2)."> 1540</a></td> <td class="src"><pre class="src"> <a title="Line 88: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (input.incrementToken()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String word = <span class="keyword">new</span> String(termAtt.buffer(), 0, termAtt.length());</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> words.add(word);</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//if we have a previousTerm - write it out as its own token concatenated</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// with the current word (if one is available).</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"><a title="Line 95: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 95: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (previousWord != <span class="keyword">null</span> && words.size() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String word = words.getFirst();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> clearAttributes();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> termAtt.append(previousWord).append(word);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> previousWord = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"><a title="Line 95: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 1101</a></td> <td class="src"><pre class="src"> <a title="Line 95: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (previousWord != <span class="keyword">null</span> && words.size() > 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 431</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String word = words.getFirst();</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 431</td> <td class="src"><pre class="src"> clearAttributes();</pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 431</td> <td class="src"><pre class="src"> termAtt.append(previousWord).append(word);</pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 431</td> <td class="src"><pre class="src"> previousWord = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 431</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//if we have words, write it out as a single token</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (words.size() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String word = words.removeFirst();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> clearAttributes();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> termAtt.append(word);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> previousWord = word;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"><a title="Line 103: Conditional coverage 100% (2/2)."> 670</a></td> <td class="src"><pre class="src"> <a title="Line 103: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (words.size() > 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String word = words.removeFirst();</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> clearAttributes();</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> termAtt.append(word);</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> previousWord = word;</pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 439</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 231</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
@@ -236,13 +236,13 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> clear() {</pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> previousWord = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> words.clear();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> previousWord = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> words.clear();</pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 1eb29b246..7826fff2e 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/18</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html">UrlTokenizingFilter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">78%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">15/19</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">90%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">9/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
</table>
<div class="separator"> </div>
@@ -94,79 +94,84 @@
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> UrlTokenizingFilter <span class="keyword">extends</span> AbstractTokenizingFilter {</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new VersionTokenizingFilter.</span></pre></td></tr>
-<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(UrlTokenizingFilter.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param stream the TokenStream that this filter will process</span></pre></td></tr>
-<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> UrlTokenizingFilter(TokenStream stream) {</pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">super</span>(stream);</pre></td></tr>
-<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Increments the underlying TokenStream and sets CharTermAttributes to construct an expanded set of tokens by</span></pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * concatenating tokens with the previous token.</span></pre></td></tr>
-<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new VersionTokenizingFilter.</span></pre></td></tr>
+<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not we have hit the end of the TokenStream</span></pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when an IOException occurs</span></pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param stream the TokenStream that this filter will process</span></pre></td></tr>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> incrementToken() <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> LinkedList<String> tokens = getTokens();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> CharTermAttribute termAtt = getTermAtt();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"><a title="Line 60: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 60: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (tokens.size() == 0 && input.incrementToken()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String text = <span class="keyword">new</span> String(termAtt.buffer(), 0, termAtt.length());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"><a title="Line 62: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 62: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (UrlStringUtils.containsUrl(text)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] parts = text.split(<span class="string">"\\s"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"><a title="Line 64: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 64: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String part : parts) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"><a title="Line 65: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 65: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (UrlStringUtils.isUrl(part)) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> data = UrlStringUtils.extractImportantUrlData(part);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tokens.addAll(data);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(UrlTokenizingFilter.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"error parsing "</span> + part, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tokens.add(part);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tokens.add(part);</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tokens.add(text);</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> addTerm();</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> UrlTokenizingFilter(TokenStream stream) {</pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">super</span>(stream);</pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Increments the underlying TokenStream and sets CharTermAttributes to construct an expanded set of tokens by</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * concatenating tokens with the previous token.</span></pre></td></tr>
+<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not we have hit the end of the TokenStream</span></pre></td></tr>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when an IOException occurs</span></pre></td></tr>
+<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> incrementToken() <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 26632</td> <td class="src"><pre class="src"> <span class="keyword">final</span> LinkedList<String> tokens = getTokens();</pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 26636</td> <td class="src"><pre class="src"> <span class="keyword">final</span> CharTermAttribute termAtt = getTermAtt();</pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"><a title="Line 63: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 26652</a></td> <td class="src"><pre class="src"> <a title="Line 63: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (tokens.size() == 0 && input.incrementToken()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 17476</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String text = <span class="keyword">new</span> String(termAtt.buffer(), 0, termAtt.length());</pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"><a title="Line 65: Conditional coverage 100% (2/2)."> 17473</a></td> <td class="src"><pre class="src"> <a title="Line 65: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (UrlStringUtils.containsUrl(text)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] parts = text.split(<span class="string">"\\s"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"><a title="Line 67: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 67: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String part : parts) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"><a title="Line 68: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 68: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (UrlStringUtils.isUrl(part)) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> data = UrlStringUtils.extractImportantUrlData(part);</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> tokens.addAll(data);</pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"error parsing "</span> + part, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tokens.add(part);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> tokens.add(part);</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 17472</td> <td class="src"><pre class="src"> tokens.add(text);</pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 84</td> <td class="nbHitsCovered"> 26545</td> <td class="src"><pre class="src"> <span class="keyword">return</span> addTerm();</pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 8e23c0137..6e32c7bda 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 ba4fde1f3..c834b39c8 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 b83712b6c..717fce5c4 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nexus.MavenArtifact.html">MavenArtifact</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">6/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator"> </div>
@@ -158,12 +158,12 @@
<td class="src"><pre class="src"> <span class="comment"> * @param url the artifactLink url</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> MavenArtifact(String groupId, String artifactId, String version, String url) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> setGroupId(groupId);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> setArtifactId(artifactId);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> setVersion(version);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> setArtifactUrl(url);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> MavenArtifact(String groupId, String artifactId, String version, String url) {</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> setGroupId(groupId);</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> setArtifactId(artifactId);</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> setVersion(version);</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> setArtifactUrl(url);</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
@@ -335,6 +335,6 @@
<td class="src"><pre class="src"> <span class="comment">// vim: cc=120:sw=4:ts=4:sts=4</span></pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 90d27a848..8d80f252a 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/48</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.666666666666667;</span>6.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nexus.NexusSearch.html">NexusSearch</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">36/51</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">62%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:62px"><span class="text">10/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.333333333333333;</span>7.333</td></tr>
</table>
<div class="separator"> </div>
@@ -64,265 +64,266 @@
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URL;</pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URLConnection;</pre></td></tr>
-<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
-<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
-<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> javax.xml.parsers.DocumentBuilder;</pre></td></tr>
-<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> javax.xml.parsers.DocumentBuilderFactory;</pre></td></tr>
-<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> javax.xml.xpath.XPath;</pre></td></tr>
-<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> javax.xml.xpath.XPathFactory;</pre></td></tr>
-<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.InvalidSettingException;</pre></td></tr>
-<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
-<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.URLConnectionFactory;</pre></td></tr>
-<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.w3c.dom.Document;</pre></td></tr>
+<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Class of methods to search Nexus repositories.</span></pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @author colezlaw</span></pre></td></tr>
-<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> NexusSearch {</pre></td></tr>
+<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The root URL for the Nexus repository service</span></pre></td></tr>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> URL rootURL;</pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Whether to use the Proxy when making requests</span></pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> useProxy;</pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Used for logging.</span></pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NexusSearch.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NexusSearch.<span class="keyword">class</span></pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> .getName());</pre></td></tr>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Creates a NexusSearch for the given repository URL.</span></pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param rootURL the root URL of the repository on which searches should execute. full URL's are calculated</span></pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * relative to this URL, so it should end with a /</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> NexusSearch(URL rootURL) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.rootURL = rootURL;</span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">public</span> NexusSearch(URL rootURL) {</pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.rootURL = rootURL;</pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"><a title="Line 68: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 68: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">null</span> != Settings.getString(Settings.KEYS.PROXY_URL)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (<span class="keyword">null</span> != Settings.getString(Settings.KEYS.PROXY_URL)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> && Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> useProxy = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(<span class="string">"Using proxy"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> useProxy = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(<span class="string">"Using proxy"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> useProxy = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(<span class="string">"Not using proxy"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> useProxy = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> LOGGER.fine(<span class="string">"Not using proxy"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidSettingException ise) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> useProxy = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidSettingException ise) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> useProxy = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Searches the configured Nexus repository for the given sha1 hash. If the artifact is found, a</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <code>MavenArtifact</code> is populated with the coordinate information.</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param sha1 The SHA-1 hash string for which to search</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the populated Maven coordinates</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException if it's unable to connect to the specified repository or if the specified artifact is not</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException if it's unable to connect to the specified repositor or if the specified artifact is not</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * found.</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> MavenArtifact searchSha1(String sha1) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"><a title="Line 91: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 91: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == sha1 || !sha1.matches(<span class="string">"^[0-9A-Fa-f]{40}$"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"Invalid SHA1 format"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"><a title="Line 90: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 90: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == sha1 || !sha1.matches(<span class="string">"^[0-9A-Fa-f]{40}$"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"Invalid SHA1 format"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URL url = <span class="keyword">new</span> URL(rootURL, String.format(<span class="string">"identify/sha1/%s"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> URL url = <span class="keyword">new</span> URL(rootURL, String.format(<span class="string">"identify/sha1/%s"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> sha1.toLowerCase()));</pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> LOGGER.fine(String.format(<span class="string">"Searching Nexus url %s"</span>, url.toString()));</pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(String.format(<span class="string">"Searching Nexus url %s"</span>, url.toString()));</span></pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Determine if we need to use a proxy. The rules:</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// 1) If the proxy is set, AND the setting is set to true, use the proxy</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// 2) Otherwise, don't use the proxy (either the proxy isn't configured,</span></pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// or proxy is specifically</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// set to false</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> URLConnection conn = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);</pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> conn.setDoOutput(<span class="keyword">true</span>);</pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.setDoOutput(<span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// JSON would be more elegant, but there's not currently a dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// on JSON, so don't want to add one just for this</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.addRequestProperty(<span class="string">"Accept"</span>, <span class="string">"application/xml"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.connect();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> conn.addRequestProperty(<span class="string">"Accept"</span>, <span class="string">"application/xml"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> conn.connect();</pre></td></tr>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"><a title="Line 113: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 113: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (conn.getResponseCode() == 200) {</a></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DocumentBuilder builder = DocumentBuilderFactory</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .newInstance().newDocumentBuilder();</pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Document doc = builder.parse(conn.getInputStream());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String groupId = xpath</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> DocumentBuilder builder = DocumentBuilderFactory</pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .newInstance().newDocumentBuilder();</pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Document doc = builder.parse(conn.getInputStream());</pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String groupId = xpath</pre></td></tr>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .evaluate(</pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .evaluate(</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/groupId"</span>,</pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/groupId"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> doc);</pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String artifactId = xpath.evaluate(</span></pre></td></tr>
+ <td class="src"><pre class="src"> doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String artifactId = xpath.evaluate(</pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/artifactId"</span>,</pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/artifactId"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> doc);</pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String version = xpath</span></pre></td></tr>
+ <td class="src"><pre class="src"> doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String version = xpath</pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .evaluate(</pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .evaluate(</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/version"</span>,</pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/version"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> doc);</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String link = xpath</span></pre></td></tr>
+ <td class="src"><pre class="src"> doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String link = xpath</pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .evaluate(</pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .evaluate(</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/artifactLink"</span>,</pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"/org.sonatype.nexus.rest.model.NexusArtifact/artifactLink"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> doc);</pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> MavenArtifact(groupId, artifactId, version, link);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException fnfe) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> MavenArtifact(groupId, artifactId, version, link);</pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Anything else is jacked-up XML stuff that we really can't recover</span></pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/* This is what we get when the SHA1 they sent doesn't exist in</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Nexus. This is useful upstream for recovery, so we just re-throw it</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// from well</span></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(e.getMessage(), e);</span></pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> fnfe;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"><a title="Line 140: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 140: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (conn.getResponseCode() == 404) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> FileNotFoundException(<span class="string">"Artifact not found in Nexus"</span>);</pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Anything else is jacked-up XML stuff that we really can't recover</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// from well</span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(e.getMessage(), e);</span></pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Could not connect to Nexus received response code: %d %s"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> conn.getResponseCode(), conn.getResponseMessage());</pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(msg);</span></pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Do a preflight request to see if the repository is actually working.</span></pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether the repository is listening and returns the /status URL correctly</span></pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> preflightRequest() {</pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(<span class="keyword">new</span> URL(rootURL, <span class="string">"status"</span>), useProxy);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.addRequestProperty(<span class="string">"Accept"</span>, <span class="string">"application/xml"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.connect();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"><a title="Line 158: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 158: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (conn.getResponseCode() != 200) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Expected 200 result from Nexus, got {0}"</span>, conn.getResponseCode());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Document doc = builder.parse(conn.getInputStream());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"><a title="Line 164: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 164: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!<span class="string">"status"</span>.equals(doc.getDocumentElement().getNodeName())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Expected root node name of status, got {0}"</span>, doc.getDocumentElement().getNodeName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Do a preflight request to see if the repository is actually working.</span></pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether the repository is listening and returns the /status URL correctly</span></pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> preflightRequest() {</pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(<span class="keyword">new</span> URL(rootURL, <span class="string">"status"</span>), useProxy);</pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> conn.addRequestProperty(<span class="string">"Accept"</span>, <span class="string">"application/xml"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> conn.connect();</pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"><a title="Line 160: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 160: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (conn.getResponseCode() != 200) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Expected 200 result from Nexus, got {0}"</span>, conn.getResponseCode());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();</pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Document doc = builder.parse(conn.getInputStream());</pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"><a title="Line 166: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 166: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!<span class="string">"status"</span>.equals(doc.getDocumentElement().getNodeName())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, <span class="string">"Expected root node name of status, got {0}"</span>, doc.getDocumentElement().getNodeName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// vim: cc=120:sw=4:ts=4:sts=4</span></pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 adff45eb2..f8f22a5e8 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 26005863e..da52696e1 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
@@ -134,7 +134,7 @@
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param message the detail message (whcih is saved for later retrieval by the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param message the detail message (which is saved for later retrieval by the</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * {@link java.lang.Throwable#getMessage()} method.</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
@@ -153,6 +153,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 a9bd9f005..89d37d24d 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 23d2bbf74..c931cf3e2 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.0;</span>6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html">XPathNuspecParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">94%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:94px"><span class="text">16/17</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">6/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.0;</span>6</td></tr>
</table>
<div class="separator"> </div>
@@ -99,8 +99,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> String getOrNull(Node n) {</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"><a title="Line 42: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 42: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (n != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> n.getTextContent();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"><a title="Line 42: Conditional coverage 50% (1/2)."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 42: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (n != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> n.getTextContent();</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
<tr> <td class="numLineCover"> 45</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
@@ -130,32 +130,32 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> NugetPackage parse(InputStream stream) <span class="keyword">throws</span> NuspecParseException {</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> NugetPackage nuspec = <span class="keyword">new</span> NugetPackage();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> XPath xpath = XPathFactory.newInstance().newXPath();</pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> NugetPackage nuspec = <span class="keyword">new</span> NugetPackage();</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"><a title="Line 63: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 63: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (xpath.evaluate(<span class="string">"/package/metadata/id"</span>, d, XPathConstants.NODE) == <span class="keyword">null</span></a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"><a title="Line 63: Conditional coverage 62% (5/8) [each condition: 100%, 50%, 50%, 50%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 63: Conditional coverage 62% (5/8) [each condition: 100%, 50%, 50%, 50%]."> <span class="keyword">if</span> (xpath.evaluate(<span class="string">"/package/metadata/id"</span>, d, XPathConstants.NODE) == <span class="keyword">null</span></a></span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> || xpath.evaluate(<span class="string">"/package/metadata/version"</span>, d, XPathConstants.NODE) == <span class="keyword">null</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> || xpath.evaluate(<span class="string">"/package/metadata/authors"</span>, d, XPathConstants.NODE) == <span class="keyword">null</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> || xpath.evaluate(<span class="string">"/package/metadata/description"</span>, d, XPathConstants.NODE) == <span class="keyword">null</span>) {</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NuspecParseException(<span class="string">"Invalid Nuspec format"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NuspecParseException(<span class="string">"Invalid Nuspec format"</span>);</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nuspec.setId(xpath.evaluate(<span class="string">"/package/metadata/id"</span>, d));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nuspec.setVersion(xpath.evaluate(<span class="string">"/package/metadata/version"</span>, d));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nuspec.setAuthors(xpath.evaluate(<span class="string">"/package/metadata/authors"</span>, d));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nuspec.setOwners(getOrNull((Node) xpath.evaluate(<span class="string">"/package/metadata/owners"</span>, d, XPathConstants.NODE)));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nuspec.setLicenseUrl(getOrNull((Node) xpath.evaluate(<span class="string">"/package/metadata/licenseUrl"</span>, d, XPathConstants.NODE)));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nuspec.setTitle(getOrNull((Node) xpath.evaluate(<span class="string">"/package/metadata/title"</span>, d, XPathConstants.NODE)));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> nuspec;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NuspecParseException(<span class="string">"Unable to parse nuspec"</span>, e);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> nuspec.setId(xpath.evaluate(<span class="string">"/package/metadata/id"</span>, d));</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> nuspec.setVersion(xpath.evaluate(<span class="string">"/package/metadata/version"</span>, d));</pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> nuspec.setAuthors(xpath.evaluate(<span class="string">"/package/metadata/authors"</span>, d));</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> nuspec.setOwners(getOrNull((Node) xpath.evaluate(<span class="string">"/package/metadata/owners"</span>, d, XPathConstants.NODE)));</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> nuspec.setLicenseUrl(getOrNull((Node) xpath.evaluate(<span class="string">"/package/metadata/licenseUrl"</span>, d, XPathConstants.NODE)));</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> nuspec.setTitle(getOrNull((Node) xpath.evaluate(<span class="string">"/package/metadata/title"</span>, d, XPathConstants.NODE)));</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> nuspec;</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Throwable e) {</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NuspecParseException(<span class="string">"Unable to parse nuspec"</span>, e);</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
@@ -164,6 +164,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 183c31933..d04b12a10 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/143</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.111111111111111;</span>6.111</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html">ConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">45%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:45px"><span class="text">66/146</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">32%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:32px"><span class="text">13/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.222222222222222;</span>6.222</td></tr>
</table>
<div class="separator"> </div>
@@ -106,442 +106,451 @@
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> ConnectionFactory {</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The version of the current DB Schema.</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_SCHEMA_VERSION = <span class="string">"2.9"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The version of the current DB Schema.</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Resource location for SQL file used to create the database schema.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_SCHEMA_VERSION = <span class="string">"2.9"</span>;</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_STRUCTURE_RESOURCE = <span class="string">"data/initialize.sql"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Resource location for SQL file used to create the database schema.</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The database driver used to connect to the database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> Driver driver = <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_STRUCTURE_RESOURCE = <span class="string">"data/initialize.sql"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The database driver used to connect to the database.</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The database connection string.</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> String connectionString = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> Driver driver = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The database connection string.</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The username to connect to the database.</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> String userName = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> String connectionString = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The username to connect to the database.</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The password for the database.</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> String password = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> String userName = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The password for the database.</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for this factory class; no instance is ever needed.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> String password = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> ConnectionFactory() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for this factory class; no instance is ever needed.</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> ConnectionFactory() {</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Initializes the connection factory. Ensuring that the appropriate drivers are loaded and that a connection can be</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * made successfully.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if we are unable to connect to the database</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Initializes the connection factory. Ensuring that the appropriate drivers are loaded and that a connection can be</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * made successfully.</span></pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//this only needs to be called once.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"><a title="Line 85: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 85: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (connectionString != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if we are unable to connect to the database</span></pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> initialize() <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Connection conn = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//this only needs to be called once.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"><a title="Line 88: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 88: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (connectionString != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Connection conn = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//load the driver if necessary</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String driverName = Settings.getString(Settings.KEYS.DB_DRIVER_NAME, <span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"><a title="Line 92: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 92: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!driverName.isEmpty()) { <span class="comment">//likely need to load the correct driver</span></a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Loading driver: {0}"</span>, driverName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String driverPath = Settings.getString(Settings.KEYS.DB_DRIVER_PATH, <span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String driverName = Settings.getString(Settings.KEYS.DB_DRIVER_NAME, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"><a title="Line 95: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 95: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!driverName.isEmpty()) { <span class="comment">//likely need to load the correct driver</span></a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Loading driver: {0}"</span>, driverName);</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String driverPath = Settings.getString(Settings.KEYS.DB_DRIVER_PATH, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"><a title="Line 96: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 96: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!driverPath.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Loading driver from: {0}"</span>, driverPath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> driver = DriverLoader.load(driverName, driverPath);</span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"><a title="Line 99: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 99: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!driverPath.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Loading driver from: {0}"</span>, driverPath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> driver = DriverLoader.load(driverName, driverPath);</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> driver = DriverLoader.load(driverName);</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> driver = DriverLoader.load(driverName);</pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DriverLoadException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Unable to load database driver"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to load database driver"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DriverLoadException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Unable to load database driver"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to load database driver"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> userName = Settings.getString(Settings.KEYS.DB_USER, <span class="string">"dcuser"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> userName = Settings.getString(Settings.KEYS.DB_USER, <span class="string">"dcuser"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//yes, yes - hard-coded password - only if there isn't one in the properties file.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> password = Settings.getString(Settings.KEYS.DB_PASSWORD, <span class="string">"DC-Pass1337!"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> password = Settings.getString(Settings.KEYS.DB_PASSWORD, <span class="string">"DC-Pass1337!"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> connectionString = getConnectionString();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE,</span></pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> connectionString = getConnectionString();</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE,</span></pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Unable to retrieve the database connection string"</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to retrieve the database connection string"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> shouldCreateSchema = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to retrieve the database connection string"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> shouldCreateSchema = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"><a title="Line 119: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 119: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (connectionString.startsWith(<span class="string">"jdbc:h2:file:"</span>)) { <span class="comment">//H2</span></a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"><a title="Line 120: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 120: Conditional coverage 0% (0/2)."> shouldCreateSchema = !dbSchemaExists();</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Need to create DB Structure: {0}"</span>, shouldCreateSchema);</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"><a title="Line 122: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 122: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (connectionString.startsWith(<span class="string">"jdbc:h2:file:"</span>)) { <span class="comment">//H2</span></a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"><a title="Line 123: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 123: Conditional coverage 50% (1/2)."> shouldCreateSchema = !dbSchemaExists();</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Need to create DB Structure: {0}"</span>, shouldCreateSchema);</pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ioex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Unable to verify database exists"</span>, ioex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to verify database exists"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Loading database connection"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Connection String: {0}"</span>, connectionString);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Database User: {0}"</span>, userName);</span></pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ioex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Unable to verify database exists"</span>, ioex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to verify database exists"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Loading database connection"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Connection String: {0}"</span>, connectionString);</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="string">"Database User: {0}"</span>, userName);</pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = DriverManager.getConnection(connectionString, userName, password);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"><a title="Line 134: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 134: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (ex.getMessage().contains(<span class="string">"java.net.UnknownHostException"</span>) && connectionString.contains(<span class="string">"AUTO_SERVER=TRUE;"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> connectionString = connectionString.replace(<span class="string">"AUTO_SERVER=TRUE;"</span>, <span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> conn = DriverManager.getConnection(connectionString, userName, password);</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"><a title="Line 137: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 137: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (ex.getMessage().contains(<span class="string">"java.net.UnknownHostException"</span>) && connectionString.contains(<span class="string">"AUTO_SERVER=TRUE;"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> connectionString = connectionString.replace(<span class="string">"AUTO_SERVER=TRUE;"</span>, <span class="string">""</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = DriverManager.getConnection(connectionString, userName, password);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE,</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = DriverManager.getConnection(connectionString, userName, password);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE,</span></pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Unable to start the database in server mode; reverting to single user mode"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException sqlex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Unable to connect to the database"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to connect to the database"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Unable to connect to the database"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to connect to the database"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException sqlex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Unable to connect to the database"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to connect to the database"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Unable to connect to the database"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to connect to the database"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"><a title="Line 151: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 151: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (shouldCreateSchema) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"><a title="Line 154: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 154: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (shouldCreateSchema) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> createTables(conn);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException dex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, dex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to create the database structure"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> createTables(conn);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException dex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, dex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to create the database structure"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ensureSchemaVersion(conn);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException dex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, dex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Database schema does not match this version of dependency-check"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"><a title="Line 167: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 167: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (conn != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ensureSchemaVersion(conn);</pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException dex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, dex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Database schema does not match this version of dependency-check"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"An error occured closing the connection"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"><a title="Line 170: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 170: Conditional coverage 25% (1/4) [each condition: 50%, 0%]."> <span class="keyword">if</span> (conn != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> conn.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"An error occurred closing the connection"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Cleans up resources and unloads any registered database drivers. This needs to be called to ensure the driver is</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * unregistered prior to the finalize method being called as during shutdown the class loader used to load the</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * driver may be unloaded prior to the driver being de-registered.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Cleans up resources and unloads any registered database drivers. This needs to be called to ensure the driver is</span></pre></td></tr>
<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> cleanup() {</pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"><a title="Line 183: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 183: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (driver != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * unregistered prior to the finalize method being called as during shutdown the class loader used to load the</span></pre></td></tr>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * driver may be unloaded prior to the driver being de-registered.</span></pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> cleanup() {</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"><a title="Line 186: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 186: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (driver != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DriverManager.deregisterDriver(driver);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"An error occured unloading the databse driver"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> driver = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> connectionString = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> userName = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> password = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DriverManager.deregisterDriver(driver);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"An error occurred unloading the database driver"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable unexpected) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE,</span></pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"An unexpected throwable occurred unloading the database driver"</span>, unexpected);</pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> driver = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new database connection object per the database configuration.</span></pre></td></tr>
-<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a database connection object</span></pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an exception loading the database connection</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> connectionString = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> userName = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> password = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Connection getConnection() <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> initialize();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Connection conn = <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new database connection object per the database configuration.</span></pre></td></tr>
+<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a database connection object</span></pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an exception loading the database connection</span></pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Connection getConnection() <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> initialize();</pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> Connection conn = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = DriverManager.getConnection(connectionString, userName, password);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to connect to the database"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> conn;</span></pre></td></tr>
-<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the configured connection string. If using the embedded H2 database this function will also ensure the</span></pre></td></tr>
-<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * data directory exists and if not create it.</span></pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> conn = DriverManager.getConnection(connectionString, userName, password);</pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to connect to the database"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span> conn;</pre></td></tr>
<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the connection string</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown the data directory cannot be created</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the configured connection string. If using the embedded H2 database this function will also ensure the</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * data directory exists and if not create it.</span></pre></td></tr>
+<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the connection string</span></pre></td></tr>
+<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown the data directory cannot be created</span></pre></td></tr>
+<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> String getConnectionString() <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String connStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING, <span class="string">"jdbc:h2:file:%s;AUTO_SERVER=TRUE"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (connStr.contains(<span class="string">"%s"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String directory = getDataDirectory().getCanonicalPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File dataFile = <span class="keyword">new</span> File(directory, <span class="string">"cve."</span> + DB_SCHEMA_VERSION);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, String.format(<span class="string">"File path for H2 file: '%s'"</span>, dataFile.toString()));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> String.format(connStr, dataFile.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> connStr;</span></pre></td></tr>
-<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory</span></pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String connStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING, <span class="string">"jdbc:h2:file:%s;AUTO_SERVER=TRUE"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"><a title="Line 229: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 229: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (connStr.contains(<span class="string">"%s"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String directory = getDataDirectory().getCanonicalPath();</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File dataFile = <span class="keyword">new</span> File(directory, <span class="string">"cve."</span> + DB_SCHEMA_VERSION);</pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, String.format(<span class="string">"File path for H2 file: '%s'"</span>, dataFile.toString()));</pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> String.format(connStr, dataFile.getAbsolutePath());</pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * for the embedded H2 database. This is public solely for some unit tests; otherwise this should be private.</span></pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> connStr;</span></pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the data directory to store data files</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if an IOException occurs of course...</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getDataDirectory() <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"><a title="Line 241: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 241: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!path.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"><a title="Line 242: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 242: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!path.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(<span class="string">"Unable to create NVD CVE Data directory"</span>);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory</span></pre></td></tr>
+<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * for the embedded H2 database. This is public solely for some unit tests; otherwise this should be private.</span></pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the data directory to store data files</span></pre></td></tr>
+<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if an IOException occurs of course...</span></pre></td></tr>
<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path;</span></pre></td></tr>
-<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getDataDirectory() <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);</pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"><a title="Line 247: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 247: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!path.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"><a title="Line 248: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 248: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!path.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(<span class="string">"Unable to create NVD CVE Data directory"</span>);</span></pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines if the H2 database file exists. If it does not exist then the data structure will need to be created.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the H2 database file does not exist; otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if the data directory does not exist and cannot be created</span></pre></td></tr>
-<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">boolean</span> dbSchemaExists() <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File dir = getDataDirectory();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String name = String.format(<span class="string">"cve.%s.h2.db"</span>, DB_SCHEMA_VERSION);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(dir, name);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> file.exists();</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates the database structure (tables and indexes) to store the CVE data.</span></pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param conn the database connection</span></pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is a Database Exception</span></pre></td></tr>
-<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> createTables(Connection conn) <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Creating database structure"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> InputStream is;</pre></td></tr>
-<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> InputStreamReader reader;</pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedReader in = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> is = ConnectionFactory.<span class="keyword">class</span>.getClassLoader().getResourceAsStream(DB_STRUCTURE_RESOURCE);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = <span class="keyword">new</span> InputStreamReader(is, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in = <span class="keyword">new</span> BufferedReader(reader);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(2110);</span></pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String tmp;</pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"><a title="Line 279: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 279: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((tmp = in.readLine()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(tmp);</span></pre></td></tr>
-<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Statement statement = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> statement = conn.createStatement();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> statement.execute(sb.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to create database statement"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DBUtils.closeStatement(statement);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to create database schema"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"><a title="Line 295: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 295: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (in != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> path;</pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Uses the provided connection to check the specified schema version within the database.</span></pre></td></tr>
-<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines if the H2 database file exists. If it does not exist then the data structure will need to be created.</span></pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param conn the database connection object</span></pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if the schema version is not compatible with this version of dependency-check</span></pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the H2 database file does not exist; otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if the data directory does not exist and cannot be created</span></pre></td></tr>
+<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> ensureSchemaVersion(Connection conn) <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 312</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ResultSet rs = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 313</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> CallableStatement cs = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">boolean</span> dbSchemaExists() <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File dir = getDataDirectory();</pre></td></tr>
+<tr> <td class="numLineCover"> 263</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String name = String.format(<span class="string">"cve.%s.h2.db"</span>, DB_SCHEMA_VERSION);</pre></td></tr>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(dir, name);</pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> file.exists();</pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates the database structure (tables and indexes) to store the CVE data.</span></pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param conn the database connection</span></pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is a Database Exception</span></pre></td></tr>
+<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> createTables(Connection conn) <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Creating database structure"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> InputStream is;</pre></td></tr>
+<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> InputStreamReader reader;</pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedReader in = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 315</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cs = conn.prepareCall(<span class="string">"SELECT value FROM properties WHERE id = 'version'"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 316</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rs = cs.executeQuery();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"><a title="Line 317: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 317: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (rs.next()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 318</td> <td class="nbHitsUncovered"><a title="Line 318: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 318: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">boolean</span> isWrongSchema = !DB_SCHEMA_VERSION.equals(rs.getString(1));</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 319</td> <td class="nbHitsUncovered"><a title="Line 319: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 319: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (isWrongSchema) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Incorrect database schema; unable to continue"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 323</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Database schema is missing"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> is = ConnectionFactory.<span class="keyword">class</span>.getClassLoader().getResourceAsStream(DB_STRUCTURE_RESOURCE);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = <span class="keyword">new</span> InputStreamReader(is, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in = <span class="keyword">new</span> BufferedReader(reader);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(2110);</span></pre></td></tr>
+<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> String tmp;</pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"><a title="Line 285: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 285: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((tmp = in.readLine()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(tmp);</span></pre></td></tr>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ConnectionFactory.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to check the database schema version"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Statement statement = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> statement = conn.createStatement();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> statement.execute(sb.toString());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to create database statement"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DBUtils.closeStatement(statement);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to create database schema"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DBUtils.closeResultSet(rs);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 330</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DBUtils.closeStatement(cs);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"><a title="Line 301: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 301: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (in != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Uses the provided connection to check the specified schema version within the database.</span></pre></td></tr>
+<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param conn the database connection object</span></pre></td></tr>
+<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if the schema version is not compatible with this version of dependency-check</span></pre></td></tr>
+<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> ensureSchemaVersion(Connection conn) <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ResultSet rs = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 319</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> CallableStatement cs = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cs = conn.prepareCall(<span class="string">"SELECT value FROM properties WHERE id = 'version'"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> rs = cs.executeQuery();</pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsUncovered"><a title="Line 323: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 323: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (rs.next()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"><a title="Line 324: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 324: Conditional coverage 50% (1/2)."> <span class="keyword">final</span> <span class="keyword">boolean</span> isWrongSchema = !DB_SCHEMA_VERSION.equals(rs.getString(1));</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"><a title="Line 325: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 325: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (isWrongSchema) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Incorrect database schema; unable to continue"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Database schema is missing"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to check the database schema version"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> DBUtils.closeResultSet(rs);</pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> DBUtils.closeStatement(cs);</pre></td></tr>
+<tr> <td class="numLineCover"> 337</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 338</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 866b0a7cf..a317aee4e 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 9ed07ff81..2d0f33604 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 8326a4e47..e6aba6379 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html">DatabaseProperties</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">21%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:21px"><span class="text">7/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
</table>
<div class="separator"> </div>
@@ -56,23 +56,23 @@
<tr> <td class="numLine"> 19</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 20</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> com.hazelcast.logging.Logger;</pre></td></tr>
-<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.text.DateFormat;</pre></td></tr>
-<tr> <td class="numLine"> 22</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.text.SimpleDateFormat;</pre></td></tr>
-<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 22</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Date;</pre></td></tr>
-<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Map;</pre></td></tr>
-<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Map.Entry;</pre></td></tr>
-<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Properties;</pre></td></tr>
-<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.TreeMap;</pre></td></tr>
-<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
+<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.update.NvdCveInfo;</pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
@@ -96,226 +96,233 @@
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Modified key word, used as a key to store information about the modified file (i.e. the containing the last 8</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * days of updates)..</span></pre></td></tr>
-<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(DatabaseProperties.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String MODIFIED = <span class="string">"Modified"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Modified key word, used as a key to store information about the modified file (i.e. the containing the last 8</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties file key for the last updated field - used to store the last updated time of the Modified NVD CVE</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * days of updates)..</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * xml file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String MODIFIED = <span class="string">"Modified"</span>;</pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String LAST_UPDATED = <span class="string">"NVD CVE Modified"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties file key for the last updated field - used to store the last updated time of the Modified NVD CVE</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Stores the last updated time for each of the NVD CVE files. These timestamps should be updated if we process the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * xml file.</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * modified file within 7 days of the last update.</span></pre></td></tr>
-<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String LAST_UPDATED = <span class="string">"NVD CVE Modified"</span>;</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String LAST_UPDATED_BASE = <span class="string">"NVD CVE "</span>;</pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Stores the last updated time for each of the NVD CVE files. These timestamps should be updated if we process the</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of properties about the data.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * modified file within 7 days of the last update.</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Properties properties;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String LAST_UPDATED_BASE = <span class="string">"NVD CVE "</span>;</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A reference to the database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of properties about the data.</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cveDB;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Properties properties;</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A reference to the database.</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new data properties object.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cveDB;</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cveDB the database object holding the properties</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DatabaseProperties(CveDB cveDB) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cveDB = cveDB;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> loadProperties();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads the properties from the database.</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new data properties object.</span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cveDB the database object holding the properties</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> DatabaseProperties(CveDB cveDB) {</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.cveDB = cveDB;</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> loadProperties();</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> loadProperties() {</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.properties = cveDB.getProperties();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads the properties from the database.</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns whether or not any properties are set.</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> loadProperties() {</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.properties = cveDB.getProperties();</pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not any properties are set</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isEmpty() {</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"><a title="Line 86: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 86: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">return</span> properties == <span class="keyword">null</span> || properties.isEmpty();</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns whether or not any properties are set.</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not any properties are set</span></pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Writes a properties file containing the last updated date to the VULNERABLE_CPE directory.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isEmpty() {</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"><a title="Line 90: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 90: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">return</span> properties == <span class="keyword">null</span> || properties.isEmpty();</a></span></pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param updatedValue the updated NVD CVE entry</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException is thrown if there is an update exception</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Writes a properties file containing the last updated date to the VULNERABLE_CPE directory.</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> save(NvdCveInfo updatedValue) <span class="keyword">throws</span> UpdateException {</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"><a title="Line 96: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 96: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (updatedValue == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param updatedValue the updated NVD CVE entry</span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException is thrown if there is an update exception</span></pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties.put(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.saveProperty(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> save(NvdCveInfo updatedValue) <span class="keyword">throws</span> UpdateException {</pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"><a title="Line 100: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 100: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (updatedValue == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the property value for the given key. If the key is not contained in the underlying properties null is</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * returned.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties.put(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.saveProperty(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the property key</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of the property</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the property value for the given key. If the key is not contained in the underlying properties null is</span></pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * returned.</span></pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getProperty(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> properties.getProperty(key);</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the property value for the given key. If the key is not contained in the underlying properties the</span></pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * default value is returned.</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param key the property key</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value</span></pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the value of the property</span></pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getProperty(String key) {</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> properties.getProperty(key);</span></pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the property value for the given key. If the key is not contained in the underlying properties the</span></pre></td></tr>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * default value is returned.</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getProperty(String key, String defaultValue) {</pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> properties.getProperty(key, defaultValue);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the property key</span></pre></td></tr>
+<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value</span></pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of the property</span></pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the collection of Database Properties as a properties collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getProperty(String key, String defaultValue) {</pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> properties.getProperty(key, defaultValue);</span></pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the collection of Database Properties</span></pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Properties getProperties() {</pre></td></tr>
-<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> properties;</pre></td></tr>
-<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a map of the meta data from the database properties. This primarily contains timestamps of when the NVD</span></pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * CVE information was last updated.</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the collection of Database Properties as a properties collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a map of the database meta data</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the collection of Database Properties</span></pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Map getMetaData() {</pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> TreeMap map = <span class="keyword">new</span> TreeMap();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"><a title="Line 143: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 143: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Entry<Object, Object> entry : properties.entrySet()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String key = (String) entry.getKey();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 145: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!<span class="string">"version"</span>.equals(key)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"><a title="Line 146: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 146: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.startsWith(<span class="string">"NVD CVE "</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">long</span> epoch = Long.parseLong((String) entry.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Date date = <span class="keyword">new</span> Date(epoch);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DateFormat format = <span class="keyword">new</span> SimpleDateFormat(<span class="string">"dd/MM/yyyy HH:mm:ss"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String formatted = format.format(date);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> map.put(key, formatted);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) { <span class="comment">//deliberatly being broad in this catch clause</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DatabaseProperties.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Unable to parse timestamp from DB"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> map.put(key, entry.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> map.put(key, entry.getValue());</span></pre></td></tr>
-<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> map;</span></pre></td></tr>
-<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Properties getProperties() {</pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> properties;</pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a map of the meta data from the database properties. This primarily contains timestamps of when the NVD</span></pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * CVE information was last updated.</span></pre></td></tr>
+<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a map of the database meta data</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Map getMetaData() {</pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> TreeMap map = <span class="keyword">new</span> TreeMap();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"><a title="Line 147: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 147: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Entry<Object, Object> entry : properties.entrySet()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String key = (String) entry.getKey();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"><a title="Line 149: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 149: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!<span class="string">"version"</span>.equals(key)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"><a title="Line 150: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 150: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.startsWith(<span class="string">"NVD CVE "</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">long</span> epoch = Long.parseLong((String) entry.getValue());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Date date = <span class="keyword">new</span> Date(epoch);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DateFormat format = <span class="keyword">new</span> SimpleDateFormat(<span class="string">"dd/MM/yyyy HH:mm:ss"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String formatted = format.format(date);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> map.put(key, formatted);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) { <span class="comment">//deliberately being broad in this catch clause</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Unable to parse timestamp from DB"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> map.put(key, entry.getValue());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> map.put(key, entry.getValue());</span></pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> map;</span></pre></td></tr>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 cd9b7af9d..0e7464450 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 9f582e0df..c9f28a64d 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
@@ -12,8 +12,8 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/46</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:57px"><span class="text">27/47</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">8/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverLoader.html">DriverLoader$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.4;</span>4.4</td></tr>
</table>
<div class="separator"> </div>
@@ -99,172 +99,181 @@
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> DriverLoader() {</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(DriverLoader.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads the specified class using the system class loader and registers the driver with the driver manager.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> DriverLoader() {</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param className the fully qualified name of the desired class</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the loaded Driver</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DriverLoadException thrown if the driver cannot be loaded</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads the specified class using the system class loader and registers the driver with the driver manager.</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Driver load(String className) <span class="keyword">throws</span> DriverLoadException {</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ClassLoader loader = DriverLoader.<span class="keyword">class</span>.getClassLoader(); <span class="comment">//ClassLoader.getSystemClassLoader();</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> load(className, loader);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param className the fully qualified name of the desired class</span></pre></td></tr>
+<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the loaded Driver</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DriverLoadException thrown if the driver cannot be loaded</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads the specified class by registering the supplied paths to the class loader and then registers the driver</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * with the driver manager. The pathToDriver argument is added to the class loader so that an external driver can be</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Driver load(String className) <span class="keyword">throws</span> DriverLoadException {</pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ClassLoader loader = DriverLoader.<span class="keyword">class</span>.getClassLoader(); <span class="comment">//ClassLoader.getSystemClassLoader();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> load(className, loader);</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * loaded. Note, the pathTodriver can contain a semi-colon separated list of paths so any dependencies can be added</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * as needed. If a path in the pathToDriver argument is a directory all files in the directory are added to the</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * class path.</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param className the fully qualified name of the desired class</span></pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param pathToDriver the path to the JAR file containing the driver; note, this can be a semi-colon separated list</span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * of paths</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the loaded Driver</span></pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DriverLoadException thrown if the driver cannot be loaded</span></pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Driver load(String className, String pathToDriver) <span class="keyword">throws</span> DriverLoadException {</pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URLClassLoader parent = (URLClassLoader) ClassLoader.getSystemClassLoader();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<URL> urls = <span class="keyword">new</span> ArrayList<URL>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] paths = pathToDriver.split(File.pathSeparator);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"><a title="Line 75: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 75: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String path : paths) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(path);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"><a title="Line 77: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 77: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file.isDirectory()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File[] files = file.listFiles();</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"><a title="Line 80: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 80: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (File f : files) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> urls.add(f.toURI().toURL());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'; invalid path provided '%s'"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> className, f.getAbsoluteFile());</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverLoader.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"><a title="Line 90: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 90: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (file.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> urls.add(file.toURI().toURL());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'; invalid path provided '%s'"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> className, file.getAbsoluteFile());</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverLoader.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URLClassLoader loader = AccessController.doPrivileged(<span class="keyword">new</span> PrivilegedAction<URLClassLoader>() {</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> URLClassLoader run() {</pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> URLClassLoader(urls.toArray(<span class="keyword">new</span> URL[urls.size()]), parent);</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> });</pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> load(className, loader);</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads the specified class using the supplied class loader and registers the driver with the driver manager.</span></pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads the specified class by registering the supplied paths to the class loader and then registers the driver</span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * with the driver manager. The pathToDriver argument is added to the class loader so that an external driver can be</span></pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * loaded. Note, the pathToDriver can contain a semi-colon separated list of paths so any dependencies can be added</span></pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * as needed. If a path in the pathToDriver argument is a directory all files in the directory are added to the</span></pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * class path.</span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param className the fully qualified name of the desired class</span></pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param loader the class loader to use when loading the driver</span></pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param pathToDriver the path to the JAR file containing the driver; note, this can be a semi-colon separated list</span></pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * of paths</span></pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the loaded Driver</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws DriverLoadException thrown if the driver cannot be loaded</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> Driver load(String className, ClassLoader loader) <span class="keyword">throws</span> DriverLoadException {</pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Class c = Class.forName(className, <span class="keyword">true</span>, loader);</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//final Class c = loader.loadClass(className);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Driver driver = (Driver) c.newInstance();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Driver shim = <span class="keyword">new</span> DriverShim(driver);</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//using the DriverShim to get around the fact that the DriverManager won't register a driver not in the base class path</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> DriverManager.registerDriver(shim);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> shim;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverLoader.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InstantiationException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverLoader.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalAccessException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverLoader.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverLoader.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Driver load(String className, String pathToDriver) <span class="keyword">throws</span> DriverLoadException {</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> URLClassLoader parent = (URLClassLoader) ClassLoader.getSystemClassLoader();</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<URL> urls = <span class="keyword">new</span> ArrayList<URL>();</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] paths = pathToDriver.split(File.pathSeparator);</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"><a title="Line 80: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 80: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String path : paths) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(path);</pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"><a title="Line 82: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 82: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (file.isDirectory()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File[] files = file.listFiles();</pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"><a title="Line 85: Conditional coverage 100% (2/2)."> 29</a></td> <td class="src"><pre class="src"> <a title="Line 85: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (File f : files) {</a></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> urls.add(f.toURI().toURL());</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'; invalid path provided '%s'"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> className, f.getAbsoluteFile());</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"><a title="Line 95: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 95: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (file.exists()) {</a></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> urls.add(file.toURI().toURL());</pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'; invalid path provided '%s'"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> className, file.getAbsoluteFile());</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> URLClassLoader loader = AccessController.doPrivileged(<span class="keyword">new</span> PrivilegedAction<URLClassLoader>() {</pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> URLClassLoader run() {</pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> URLClassLoader(urls.toArray(<span class="keyword">new</span> URL[urls.size()]), parent);</pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> });</pre></td></tr>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> load(className, loader);</pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads the specified class using the supplied class loader and registers the driver with the driver manager.</span></pre></td></tr>
+<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param className the fully qualified name of the desired class</span></pre></td></tr>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param loader the class loader to use when loading the driver</span></pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the loaded Driver</span></pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DriverLoadException thrown if the driver cannot be loaded</span></pre></td></tr>
+<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> Driver load(String className, ClassLoader loader) <span class="keyword">throws</span> DriverLoadException {</pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Class c = Class.forName(className, <span class="keyword">true</span>, loader);</pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//final Class c = loader.loadClass(className);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Driver driver = (Driver) c.newInstance();</pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Driver shim = <span class="keyword">new</span> DriverShim(driver);</pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//using the DriverShim to get around the fact that the DriverManager won't register a driver not in the base class path</span></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> DriverManager.registerDriver(shim);</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> shim;</pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, msg, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InstantiationException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalAccessException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to load database driver '%s'"</span>, className);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DriverLoadException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 131dd0002..7ec760ac4 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/31</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3636363636363638;</span>2.364</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.nvdcve.DriverShim.html">DriverShim</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">9%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:9px"><span class="text">3/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3636363636363638;</span>2.364</td></tr>
</table>
<div class="separator"> </div>
@@ -102,292 +102,299 @@
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The database driver being wrapped.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Driver driver;</pre></td></tr>
+<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(DriverShim.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The database driver being wrapped.</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new wrapper around a Driver.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Driver driver;</pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param driver the database driver to wrap</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> DriverShim(Driver driver) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new wrapper around a Driver.</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.driver = driver;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param driver the database driver to wrap</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> DriverShim(Driver driver) {</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Wraps the underlying driver's call to acceptsURL. Returns whether or not the driver can open a connection to the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.driver = driver;</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * given URL.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the database</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the wrapped driver can connect to the specified URL</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Wraps the underlying driver's call to acceptsURL. Returns whether or not the driver can open a connection to the</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SQLException thrown if there is an error connecting to the database</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * given URL.</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#acceptsURL(java.lang.String)</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the database</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the wrapped driver can connect to the specified URL</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> acceptsURL(String url) <span class="keyword">throws</span> SQLException {</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.acceptsURL(url);</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Wraps the call to the underlying driver's connect method.</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the database</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param info a collection of string/value pairs</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a Connection object</span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws SQLException thrown if there is an error connecting to the database</span></pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#acceptsURL(java.lang.String)</span></pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> acceptsURL(String url) <span class="keyword">throws</span> SQLException {</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.acceptsURL(url);</pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Wraps the call to the underlying driver's connect method.</span></pre></td></tr>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#connect(java.lang.String, java.util.Properties)</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Connection connect(String url, Properties info) <span class="keyword">throws</span> SQLException {</pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.connect(url, info);</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the wrapped driver's major version number.</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the wrapped driver's major version number</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getMajorVersion()</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getMajorVersion() {</pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.getMajorVersion();</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the wrapped driver's minor version number.</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the wrapped driver's minor version number</span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getMinorVersion()</span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getMinorVersion() {</pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.getMinorVersion();</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Wraps the call to the underlying driver's getParentLogger method.</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the parent's Logger</span></pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SQLFeatureNotSupportedException thrown if the feature is not supported</span></pre></td></tr>
-<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getParentLogger()</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//@Override</span></pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Logger getParentLogger() <span class="keyword">throws</span> SQLFeatureNotSupportedException {</pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//return driver.getParentLogger();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Method m = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> m = driver.getClass().getMethod(<span class="string">"getParentLogger"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SQLFeatureNotSupportedException();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"><a title="Line 122: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 122: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (m != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> (Logger) m.invoke(m);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalAccessException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverShim.<span class="keyword">class</span>.getName()).log(Level.FINER, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalArgumentException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverShim.<span class="keyword">class</span>.getName()).log(Level.FINER, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvocationTargetException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(DriverShim.<span class="keyword">class</span>.getName()).log(Level.FINER, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SQLFeatureNotSupportedException();</span></pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Wraps the call to the underlying driver's getPropertyInfo method.</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the database</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param info a collection of string/value pairs</span></pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a Connection object</span></pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SQLException thrown if there is an error connecting to the database</span></pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#connect(java.lang.String, java.util.Properties)</span></pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Connection connect(String url, Properties info) <span class="keyword">throws</span> SQLException {</pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.connect(url, info);</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the wrapped driver's major version number.</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the wrapped driver's major version number</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getMajorVersion()</span></pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getMajorVersion() {</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.getMajorVersion();</span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the wrapped driver's minor version number.</span></pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the wrapped driver's minor version number</span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getMinorVersion()</span></pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getMinorVersion() {</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.getMinorVersion();</span></pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Wraps the call to the underlying driver's getParentLogger method.</span></pre></td></tr>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the parent's Logger</span></pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SQLFeatureNotSupportedException thrown if the feature is not supported</span></pre></td></tr>
+<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getParentLogger()</span></pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//@Override</span></pre></td></tr>
+<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Logger getParentLogger() <span class="keyword">throws</span> SQLFeatureNotSupportedException {</pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//return driver.getParentLogger();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Method m = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> m = driver.getClass().getMethod(<span class="string">"getParentLogger"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable e) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SQLFeatureNotSupportedException();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"><a title="Line 126: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 126: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (m != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> (Logger) m.invoke(m);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalAccessException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINER, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalArgumentException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINER, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvocationTargetException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINER, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SQLFeatureNotSupportedException();</span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an array of DriverPropertyInfo objects</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Wraps the call to the underlying driver's getPropertyInfo method.</span></pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SQLException thrown if there is an error accessing the database</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getPropertyInfo(java.lang.String, java.util.Properties)</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the database</span></pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param info a collection of string/value pairs</span></pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an array of DriverPropertyInfo objects</span></pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> DriverPropertyInfo[] getPropertyInfo(String url, Properties info) <span class="keyword">throws</span> SQLException {</pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.getPropertyInfo(url, info);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SQLException thrown if there is an error accessing the database</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#getPropertyInfo(java.lang.String, java.util.Properties)</span></pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns whether or not the wrapped driver is jdbcCompliant.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> DriverPropertyInfo[] getPropertyInfo(String url, Properties info) <span class="keyword">throws</span> SQLException {</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.getPropertyInfo(url, info);</span></pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the wrapped driver is JDBC compliant; otherwise false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#jdbcCompliant()</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns whether or not the wrapped driver is jdbcCompliant.</span></pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> jdbcCompliant() {</pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.jdbcCompliant();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the wrapped driver is JDBC compliant; otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @see java.sql.Driver#jdbcCompliant()</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of hashCode.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> jdbcCompliant() {</pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.driver.jdbcCompliant();</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the hashCode of the object</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of hashCode.</span></pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 7;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"><a title="Line 169: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 169: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.driver != <span class="keyword">null</span> ? <span class="keyword">this</span>.driver.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the hashCode of the object</span></pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of equals.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 7;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"><a title="Line 173: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 173: Conditional coverage 0% (0/2)."> hash = 97 * hash + (<span class="keyword">this</span>.driver != <span class="keyword">null</span> ? <span class="keyword">this</span>.driver.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return returns true if the objects are equal; otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"><a title="Line 184: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 184: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DriverShim other = (DriverShim) obj;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"><a title="Line 188: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 188: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">return</span> <span class="keyword">this</span>.driver == other.driver || (<span class="keyword">this</span>.driver != <span class="keyword">null</span> && <span class="keyword">this</span>.driver.equals(other.driver));</a></span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of toString().</span></pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of equals.</span></pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the String representation of the object</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return returns true if the objects are equal; otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"DriverShim{"</span> + <span class="string">"driver="</span> + driver + <span class="string">'}'</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"><a title="Line 185: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 185: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"><a title="Line 188: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 188: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DriverShim other = (DriverShim) obj;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"><a title="Line 192: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 192: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">return</span> <span class="keyword">this</span>.driver == other.driver || (<span class="keyword">this</span>.driver != <span class="keyword">null</span> && <span class="keyword">this</span>.driver.equals(other.driver));</a></span></pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of toString().</span></pre></td></tr>
+<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the String representation of the object</span></pre></td></tr>
+<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"DriverShim{"</span> + <span class="string">"driver="</span> + driver + <span class="string">'}'</span>;</pre></td></tr>
+<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 98ff7d4cd..1fe3b5c81 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 33c84387b..921d55830 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 c71451c84..b496fe839 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.NvdCveUpdater.html">NvdCveUpdater</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/11</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.NvdCveUpdater.html">NvdCveUpdater</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
</table>
<div class="separator"> </div>
@@ -84,42 +84,51 @@
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger</span></pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Downloads the latest NVD CVE XML file from the web and imports it into the current CVE Database.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException is thrown if there is an error updating the database</span></pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 36</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NvdCveUpdater.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> update() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Downloads the latest NVD CVE XML file from the web and imports it into the current CVE Database.</p></span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StandardUpdate task = <span class="keyword">new</span> StandardUpdate();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"><a title="Line 43: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 43: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (task.isUpdateNeeded()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> task.update();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException is thrown if there is an error updating the database</span></pre></td></tr>
+<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> update() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StandardUpdate task = <span class="keyword">new</span> StandardUpdate();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"><a title="Line 48: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 48: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (task.isUpdateNeeded()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> task.update();</span></pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(NvdCveUpdater.<span class="keyword">class</span>.getName()).log(Level.WARNING,</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING,</span></pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"NVD CVE properties files contain an invalid URL, unable to update the data to use the most current data."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(NvdCveUpdater.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(NvdCveUpdater.<span class="keyword">class</span>.getName()).log(Level.WARNING,</span></pre></td></tr>
-<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING,</span></pre></td></tr>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Unable to download the NVD CVE data, unable to update the data to use the most current data."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(NvdCveUpdater.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 ea64cc014..dd4794a96 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.StandardUpdate.html">StandardUpdate</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/140</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/52</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.875;</span>6.875</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.StandardUpdate.html">StandardUpdate</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/141</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/52</span></div></div></td></tr></table></td><td class="value"><span class="hidden">6.875;</span>6.875</td></tr>
</table>
<div class="separator"> </div>
@@ -118,429 +118,432 @@
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The max thread pool size to use when downloading files.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Static logger.</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> MAX_THREAD_POOL_SIZE = Settings.getInt(Settings.KEYS.MAX_DOWNLOAD_THREAD_POOL_SIZE, 3);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName());</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Information about the timestamps and URLs for data that needs to be updated.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The max thread pool size to use when downloading files.</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> DatabaseProperties properties;</pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> MAX_THREAD_POOL_SIZE = Settings.getInt(Settings.KEYS.MAX_DOWNLOAD_THREAD_POOL_SIZE, 3);</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of updateable NVD CVE items.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Information about the timestamps and URLs for data that needs to be updated.</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> UpdateableNvdCve updateable;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> DatabaseProperties properties;</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Reference to the Cve Database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of updateable NVD CVE items.</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> CveDB cveDB = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> UpdateableNvdCve updateable;</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Reference to the Cve Database.</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets whether or not an update is needed.</span></pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> CveDB cveDB = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false depending on whether an update is needed</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isUpdateNeeded() {</pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> updateable.isUpdateNeeded();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets whether or not an update is needed.</span></pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false depending on whether an update is needed</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new Standard Update Task.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isUpdateNeeded() {</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> updateable.isUpdateNeeded();</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws MalformedURLException thrown if a configured URL is malformed</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException thrown if a timestamp cannot be checked on a configured URL</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException thrown if there is an exception generating the update task</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> StandardUpdate() <span class="keyword">throws</span> MalformedURLException, DownloadFailedException, UpdateException {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> openDataStores();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties = cveDB.getDatabaseProperties();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updateable = updatesNeeded();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Downloads the latest NVD CVE XML file from the web and imports it into the current CVE Database.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new Standard Update Task.</span></pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException is thrown if there is an error updating the database</span></pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws MalformedURLException thrown if a configured URL is malformed</span></pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException thrown if a timestamp cannot be checked on a configured URL</span></pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException thrown if there is an exception generating the update task</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> StandardUpdate() <span class="keyword">throws</span> MalformedURLException, DownloadFailedException, UpdateException {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> openDataStores();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties = cveDB.getDatabaseProperties();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updateable = updatesNeeded();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> update() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> maxUpdates = 0;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Downloads the latest NVD CVE XML file from the web and imports it into the current CVE Database.</p></span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"><a title="Line 98: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 98: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo cve : updateable) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"><a title="Line 99: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 99: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cve.getNeedsUpdate()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> maxUpdates += 1;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException is thrown if there is an error updating the database</span></pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> update() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> maxUpdates = 0;</span></pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates <= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"><a title="Line 102: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 102: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo cve : updateable) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cve.getNeedsUpdate()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> maxUpdates += 1;</span></pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"><a title="Line 106: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 106: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates > 3) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.INFO,</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates <= 0) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"NVD CVE requires several updates; this could take a couple of minutes."</span>);</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"><a title="Line 110: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 110: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> openDataStores();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"><a title="Line 110: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 110: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates > 3) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.INFO,</span></pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="string">"NVD CVE requires several updates; this could take a couple of minutes."</span>);</pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"><a title="Line 114: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 114: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">int</span> poolSize = (MAX_THREAD_POOL_SIZE < maxUpdates) ? MAX_THREAD_POOL_SIZE : maxUpdates;</a></span></pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ExecutorService downloadExecutors = Executors.newFixedThreadPool(poolSize);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ExecutorService processExecutor = Executors.newSingleThreadExecutor();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Future<Future<ProcessTask>>> downloadFutures = <span class="keyword">new</span> HashSet<Future<Future<ProcessTask>>>(maxUpdates);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"><a title="Line 119: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 119: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo cve : updateable) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"><a title="Line 120: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 120: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cve.getNeedsUpdate()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> CallableDownloadTask call = <span class="keyword">new</span> CallableDownloadTask(cve, processExecutor, cveDB);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadFutures.add(downloadExecutors.submit(call));</span></pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdown();</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//next, move the future future processTasks to just future processTasks</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Future<ProcessTask>> processFutures = <span class="keyword">new</span> HashSet<Future<ProcessTask>>(maxUpdates);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"><a title="Line 129: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 129: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Future<Future<ProcessTask>> future : downloadFutures) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Future<ProcessTask> task = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> task = future.get();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Thread was interrupted during download"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"The download was interrupted"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ExecutionException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Thread was interrupted during download execution"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"The execution of the download was interrupted"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"><a title="Line 146: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 146: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (task == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Thread was interrupted during download"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"The download was interrupted; unable to complete the update"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processFutures.add(task);</span></pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"><a title="Line 156: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 156: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Future<ProcessTask> future : processFutures) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ProcessTask task = future.get();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"><a title="Line 159: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 159: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (task.getException() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> task.getException();</span></pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Thread was interrupted during processing"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ExecutionException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Execution Exception during process"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdown();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"><a title="Line 175: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 175: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates >= 1) { <span class="comment">//ensure the modified file date gets written (we may not have actually updated it)</span></a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties.save(updateable.get(MODIFIED));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.cleanupDatabase();</span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> closeDataStores();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"><a title="Line 114: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 114: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> openDataStores();</span></pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines if the index needs to be updated. This is done by fetching the NVD CVE meta data and checking the last</span></pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * update date. If the data needs to be refreshed this method will return the NvdCveUrl for the files that need to</span></pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * be updated.</span></pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the collection of files that need to be updated</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws MalformedURLException is thrown if the URL for the NVD CVE Meta data is incorrect</span></pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if there is an error. downloading the NVD CVE download data file</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException Is thrown if there is an issue with the last updated properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">final</span> UpdateableNvdCve updatesNeeded() <span class="keyword">throws</span> MalformedURLException, DownloadFailedException, UpdateException {</pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> UpdateableNvdCve updates = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates = retrieveCurrentTimestampsFromWeb();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidDataException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"Unable to retrieve valid timestamp from nvd cve downloads page"</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidSettingException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Invalid setting found when retrieving timestamps"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Invalid settings"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"><a title="Line 118: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 118: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">int</span> poolSize = (MAX_THREAD_POOL_SIZE < maxUpdates) ? MAX_THREAD_POOL_SIZE : maxUpdates;</a></span></pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"><a title="Line 207: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 207: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (updates == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Unable to retrieve the timestamps of the currently published NVD CVE data"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"><a title="Line 210: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 210: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!properties.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">long</span> lastUpdated = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED, <span class="string">"0"</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Date now = <span class="keyword">new</span> Date();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"><a title="Line 215: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 215: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (lastUpdated == updates.getTimeStamp(MODIFIED)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates.clear(); <span class="comment">//we don't need to update anything.</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"><a title="Line 217: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 217: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (withinRange(lastUpdated, now.getTime(), days)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"><a title="Line 218: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 218: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo entry : updates) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"><a title="Line 219: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 219: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (MODIFIED.equals(entry.getId())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">false</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> { <span class="comment">//we figure out which of the several XML files need to be downloaded.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"><a title="Line 226: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 226: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo entry : updates) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"><a title="Line 227: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 227: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (MODIFIED.equals(entry.getId())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">long</span> currentTimestamp = 0;</span></pre></td></tr>
-<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> currentTimestamp = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED_BASE + entry.getId(), <span class="string">"0"</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Error parsing '%s' '%s' from nvdcve.lastupdated"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> DatabaseProperties.LAST_UPDATED_BASE, entry.getId());</pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getLogger(StandardUpdate.<span class="keyword">class</span></pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINE, msg, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"><a title="Line 240: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 240: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (currentTimestamp == entry.getTimestamp()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">false</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ExecutorService downloadExecutors = Executors.newFixedThreadPool(poolSize);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ExecutorService processExecutor = Executors.newSingleThreadExecutor();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Future<Future<ProcessTask>>> downloadFutures = <span class="keyword">new</span> HashSet<Future<Future<ProcessTask>>>(maxUpdates);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"><a title="Line 123: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 123: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo cve : updateable) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"><a title="Line 124: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 124: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cve.getNeedsUpdate()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> CallableDownloadTask call = <span class="keyword">new</span> CallableDownloadTask(cve, processExecutor, cveDB, Settings.getInstance());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadFutures.add(downloadExecutors.submit(call));</span></pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"An invalid schema version or timestamp exists in the data.properties file."</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> updates;</span></pre></td></tr>
-<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdown();</span></pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//next, move the future future processTasks to just future processTasks</span></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Future<ProcessTask>> processFutures = <span class="keyword">new</span> HashSet<Future<ProcessTask>>(maxUpdates);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"><a title="Line 133: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 133: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Future<Future<ProcessTask>> future : downloadFutures) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Future<ProcessTask> task = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> task = future.get();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Thread was interrupted during download"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"The download was interrupted"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ExecutionException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Thread was interrupted during download execution"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"The execution of the download was interrupted"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"><a title="Line 150: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 150: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (task == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> downloadExecutors.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Thread was interrupted during download"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"The download was interrupted; unable to complete the update"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processFutures.add(task);</span></pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"><a title="Line 160: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 160: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Future<ProcessTask> future : processFutures) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ProcessTask task = future.get();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"><a title="Line 163: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 163: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (task.getException() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> task.getException();</span></pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Thread was interrupted during processing"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ExecutionException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdownNow();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Execution Exception during process"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processExecutor.shutdown();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (maxUpdates >= 1) { <span class="comment">//ensure the modified file date gets written (we may not have actually updated it)</span></a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties.save(updateable.get(MODIFIED));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.cleanupDatabase();</span></pre></td></tr>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> closeDataStores();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieves the timestamps from the NVD CVE meta data file.</span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines if the index needs to be updated. This is done by fetching the NVD CVE meta data and checking the last</span></pre></td></tr>
+<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * update date. If the data needs to be refreshed this method will return the NvdCveUrl for the files that need to</span></pre></td></tr>
+<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * be updated.</span></pre></td></tr>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the timestamp from the currently published nvdcve downloads page</span></pre></td></tr>
-<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws MalformedURLException thrown if the URL for the NVD CCE Meta data is incorrect.</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException thrown if there is an error downloading the nvd cve meta data file</span></pre></td></tr>
-<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidDataException thrown if there is an exception parsing the timestamps</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException thrown if the settings are invalid</span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the collection of files that need to be updated</span></pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws MalformedURLException is thrown if the URL for the NVD CVE Meta data is incorrect</span></pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if there is an error. downloading the NVD CVE download data file</span></pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException Is thrown if there is an issue with the last updated properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> UpdateableNvdCve retrieveCurrentTimestampsFromWeb()</pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {</pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> UpdateableNvdCve updates = <span class="keyword">new</span> UpdateableNvdCve();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates.add(MODIFIED, Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL),</span></pre></td></tr>
-<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),</pre></td></tr>
-<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">false</span>);</pre></td></tr>
-<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> end = Calendar.getInstance().get(Calendar.YEAR);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"><a title="Line 276: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 276: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = start; i <= end; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates.add(Integer.toString(i), String.format(baseUrl20, i),</span></pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String.format(baseUrl12, i),</pre></td></tr>
-<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">true</span>);</pre></td></tr>
-<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> updates;</span></pre></td></tr>
-<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Closes the CVE and CPE data stores.</span></pre></td></tr>
-<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> closeDataStores() {</pre></td></tr>
-<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"><a title="Line 289: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 289: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cveDB != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ignore) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="string">"Error closing the cveDB"</span>, ignore);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Opens the CVE and CPE data stores.</span></pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException thrown if a data store cannot be opened</span></pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">final</span> <span class="keyword">void</span> openDataStores() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
-<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"><a title="Line 304: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 304: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cveDB != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">final</span> UpdateableNvdCve updatesNeeded() <span class="keyword">throws</span> MalformedURLException, DownloadFailedException, UpdateException {</pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> UpdateableNvdCve updates = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB = <span class="keyword">new</span> CveDB();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.open();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 310</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 311</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> closeDataStores();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 312</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Database Exception opening databases"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 313</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"Error updating the CPE/CVE data, please see the log file for more details."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 315</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates = retrieveCurrentTimestampsFromWeb();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidDataException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"Unable to retrieve valid timestamp from nvd cve downloads page"</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InvalidSettingException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Invalid setting found when retrieving timestamps"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Invalid settings"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines if the epoch date is within the range specified of the compareTo epoch time. This takes the</span></pre></td></tr>
-<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * (compareTo-date)/1000/60/60/24 to get the number of days. If the calculated days is less then the range the date</span></pre></td></tr>
-<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * is considered valid.</span></pre></td></tr>
-<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param date the date to be checked.</span></pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param compareTo the date to compare to.</span></pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param range the range in days to be considered valid.</span></pre></td></tr>
-<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the date is within the range.</span></pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">boolean</span> withinRange(<span class="keyword">long</span> date, <span class="keyword">long</span> compareTo, <span class="keyword">int</span> range) {</pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">double</span> differenceInDays = (compareTo - date) / 1000.0 / 60.0 / 60.0 / 24.0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"><a title="Line 329: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 329: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> differenceInDays < range;</a></span></pre></td></tr>
-<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"><a title="Line 211: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 211: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (updates == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Unable to retrieve the timestamps of the currently published NVD CVE data"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"><a title="Line 214: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 214: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!properties.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">long</span> lastUpdated = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED, <span class="string">"0"</span>));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Date now = <span class="keyword">new</span> Date();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"><a title="Line 219: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 219: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (lastUpdated == updates.getTimeStamp(MODIFIED)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates.clear(); <span class="comment">//we don't need to update anything.</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"><a title="Line 221: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 221: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (withinRange(lastUpdated, now.getTime(), days)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"><a title="Line 222: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 222: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo entry : updates) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (MODIFIED.equals(entry.getId())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">true</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">false</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> { <span class="comment">//we figure out which of the several XML files need to be downloaded.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"><a title="Line 230: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 230: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo entry : updates) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (MODIFIED.equals(entry.getId())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">true</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">long</span> currentTimestamp = 0;</span></pre></td></tr>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> currentTimestamp = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED_BASE + entry.getId(), <span class="string">"0"</span>));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Error parsing '%s' '%s' from nvdcve.lastupdated"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> DatabaseProperties.LAST_UPDATED_BASE, entry.getId());</pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"><a title="Line 242: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 242: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (currentTimestamp == entry.getTimestamp()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> entry.setNeedsUpdate(<span class="keyword">false</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"An invalid schema version or timestamp exists in the data.properties file."</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">""</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> updates;</span></pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Retrieves the timestamps from the NVD CVE meta data file.</span></pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the timestamp from the currently published nvdcve downloads page</span></pre></td></tr>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws MalformedURLException thrown if the URL for the NVD CCE Meta data is incorrect.</span></pre></td></tr>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException thrown if there is an error downloading the nvd cve meta data file</span></pre></td></tr>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidDataException thrown if there is an exception parsing the timestamps</span></pre></td></tr>
+<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException thrown if the settings are invalid</span></pre></td></tr>
+<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> UpdateableNvdCve retrieveCurrentTimestampsFromWeb()</pre></td></tr>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {</pre></td></tr>
+<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> UpdateableNvdCve updates = <span class="keyword">new</span> UpdateableNvdCve();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates.add(MODIFIED, Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL),</span></pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),</pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">false</span>);</pre></td></tr>
+<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> end = Calendar.getInstance().get(Calendar.YEAR);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"><a title="Line 278: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 278: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = start; i <= end; i++) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> updates.add(Integer.toString(i), String.format(baseUrl20, i),</span></pre></td></tr>
+<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> String.format(baseUrl12, i),</pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">true</span>);</pre></td></tr>
+<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> updates;</span></pre></td></tr>
+<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Closes the CVE and CPE data stores.</span></pre></td></tr>
+<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> closeDataStores() {</pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"><a title="Line 291: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 291: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cveDB != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ignore) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="string">"Error closing the cveDB"</span>, ignore);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Opens the CVE and CPE data stores.</span></pre></td></tr>
+<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException thrown if a data store cannot be opened</span></pre></td></tr>
+<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">final</span> <span class="keyword">void</span> openDataStores() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsUncovered"><a title="Line 306: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 306: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cveDB != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 307</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 310</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB = <span class="keyword">new</span> CveDB();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 311</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.open();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 312</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 313</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> closeDataStores();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Database Exception opening databases"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 315</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"Error updating the CPE/CVE data, please see the log file for more details."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 316</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines if the epoch date is within the range specified of the compareTo epoch time. This takes the</span></pre></td></tr>
+<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * (compareTo-date)/1000/60/60/24 to get the number of days. If the calculated days is less then the range the date</span></pre></td></tr>
+<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * is considered valid.</span></pre></td></tr>
+<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param date the date to be checked.</span></pre></td></tr>
+<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param compareTo the date to compare to.</span></pre></td></tr>
+<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param range the range in days to be considered valid.</span></pre></td></tr>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the date is within the range.</span></pre></td></tr>
+<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">boolean</span> withinRange(<span class="keyword">long</span> date, <span class="keyword">long</span> compareTo, <span class="keyword">int</span> range) {</pre></td></tr>
+<tr> <td class="numLineCover"> 330</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">double</span> differenceInDays = (compareTo - date) / 1000.0 / 60.0 / 60.0 / 24.0;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"><a title="Line 331: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 331: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> differenceInDays < range;</a></span></pre></td></tr>
+<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 71916461d..b6518b7be 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateService.html">UpdateService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/7</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.3333333333333333;</span>1.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateService.html">UpdateService</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator"> </div>
@@ -64,84 +64,63 @@
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The CachedWebDataSource Service Loader. This class loads all services that implement</span></pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * org.owasp.dependencycheck.data.update.CachedWebDataSource.</span></pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> UpdateService {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> UpdateService {</pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the singleton reference to the service.</span></pre></td></tr>
-<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> UpdateService service;</pre></td></tr>
-<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the service loader for CachedWebDataSource.</span></pre></td></tr>
-<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ServiceLoader<CachedWebDataSource> loader;</pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the service loader for CachedWebDataSource.</span></pre></td></tr>
+<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ServiceLoader<CachedWebDataSource> loader;</pre></td></tr>
+<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates a new instance of UpdateService.</span></pre></td></tr>
+<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates a new instance of UpdateService</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param classLoader the ClassLoader to use when dynamically loading Analyzer and Update services</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> UpdateService() {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> loader = ServiceLoader.load(CachedWebDataSource.<span class="keyword">class</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> UpdateService(ClassLoader classLoader) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> loader = ServiceLoader.load(CachedWebDataSource.<span class="keyword">class</span>, classLoader);</span></pre></td></tr>
<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieve the singleton instance of UpdateService.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns an Iterator for all instances of the CachedWebDataSource interface.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a singleton UpdateService.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an iterator of CachedWebDataSource.</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">synchronized</span> UpdateService getInstance() {</pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"><a title="Line 51: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 51: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (service == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> service = <span class="keyword">new</span> UpdateService();</span></pre></td></tr>
-<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> service;</span></pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns an Iterator for all instances of the CachedWebDataSource interface.</span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an iterator of CachedWebDataSource.</span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Iterator<CachedWebDataSource> getDataSources() {</pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> loader.iterator();</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> loader.iterator();</span></pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 39a101f22..80a06a36c 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.UpdateableNvdCve.html">UpdateableNvdCve</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">93%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:93px"><span class="text">27/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.25;</span>1.25</td></tr>
</table>
<div class="separator"> </div>
@@ -85,7 +85,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 35</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> UpdateableNvdCve <span class="keyword">implements</span> java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> UpdateableNvdCve <span class="keyword">implements</span> java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
@@ -94,7 +94,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A collection of sources of data.</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 40</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> Map<String, NvdCveInfo> collection = <span class="keyword">new</span> TreeMap<String, NvdCveInfo>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Map<String, NvdCveInfo> collection = <span class="keyword">new</span> TreeMap<String, NvdCveInfo>();</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
@@ -127,13 +127,13 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isUpdateNeeded() {</pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"><a title="Line 57: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 57: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (NvdCveInfo item : <span class="keyword">this</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"><a title="Line 58: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 58: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (item.getNeedsUpdate()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"><a title="Line 57: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 57: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (NvdCveInfo item : <span class="keyword">this</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"><a title="Line 58: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 58: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (item.getNeedsUpdate()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
@@ -160,8 +160,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> add(String id, String url, String oldUrl) <span class="keyword">throws</span> MalformedURLException, DownloadFailedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> add(id, url, oldUrl, <span class="keyword">false</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> add(id, url, oldUrl, <span class="keyword">false</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
@@ -188,14 +188,14 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> add(String id, String url, String oldUrl, <span class="keyword">boolean</span> needsUpdate) <span class="keyword">throws</span> MalformedURLException, DownloadFailedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> NvdCveInfo item = <span class="keyword">new</span> NvdCveInfo();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> item.setNeedsUpdate(needsUpdate); <span class="comment">//the others default to true, to make life easier later this should default to false.</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> item.setId(id);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> item.setUrl(url);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> item.setOldSchemaVersionUrl(oldUrl);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> item.setTimestamp(Downloader.getLastModified(<span class="keyword">new</span> URL(url)));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> collection.put(id, item);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">final</span> NvdCveInfo item = <span class="keyword">new</span> NvdCveInfo();</pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> item.setNeedsUpdate(needsUpdate); <span class="comment">//the others default to true, to make life easier later this should default to false.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> item.setId(id);</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> item.setUrl(url);</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> item.setOldSchemaVersionUrl(oldUrl);</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> item.setTimestamp(Downloader.getLastModified(<span class="keyword">new</span> URL(url)));</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> collection.put(id, item);</pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
@@ -206,8 +206,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> clear() {</pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> collection.clear();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> collection.clear();</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
@@ -233,7 +233,7 @@
<td class="src"><pre class="src"> <span class="comment"> * An internal iterator used to implement iterable.</span></pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> Iterator<Entry<String, NvdCveInfo>> iterableContent = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Iterator<Entry<String, NvdCveInfo>> iterableContent = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
@@ -256,8 +256,8 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Iterator<NvdCveInfo> iterator() {</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> iterableContent = collection.entrySet().iterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> iterableContent = collection.entrySet().iterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>;</pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
@@ -282,7 +282,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasNext() {</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> iterableContent.hasNext();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> iterableContent.hasNext();</pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
@@ -307,7 +307,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> NvdCveInfo next() {</pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> iterableContent.next().getValue();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> iterableContent.next().getValue();</pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
@@ -328,8 +328,8 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> remove() {</pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> iterableContent.remove();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> iterableContent.remove();</pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
@@ -346,7 +346,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> NvdCveInfo get(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> collection.get(key);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> collection.get(key);</pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
@@ -362,6 +362,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 296bbccab..a18f3335b 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 4198ff5ca..d406b7b07 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html
index ef7d8a389..179465eab 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html">CallableDownloadTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/47</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4545454545454546;</span>2.455</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.task.CallableDownloadTask.html">CallableDownloadTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/52</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4545454545454546;</span>2.455</td></tr>
</table>
<div class="separator"> </div>
@@ -76,340 +76,369 @@
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.update.NvdCveInfo;</pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.DownloadFailedException;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.update.exception.UpdateException;</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Downloader;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.DownloadFailedException;</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Downloader;</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A callable object to download two files.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A callable object to download two files.</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
+<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> CallableDownloadTask <span class="keyword">implements</span> Callable<Future<ProcessTask>> {</span></pre></td></tr>
-<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> CallableDownloadTask <span class="keyword">implements</span> Callable<Future<ProcessTask>> {</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Simple constructor for the callable download task.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param nvdCveInfo the NVD CVE info</span></pre></td></tr>
-<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param processor the processor service to submit the downloaded files to</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 45</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(CallableDownloadTask.<span class="keyword">class</span>.getName());</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cveDB the CVE DB to use to store the vulnerability data</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> CallableDownloadTask(NvdCveInfo nvdCveInfo, ExecutorService processor, CveDB cveDB) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.nvdCveInfo = nvdCveInfo;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.processorService = processor;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cveDB = cveDB;</span></pre></td></tr>
-<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">final</span> File file1;</pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">final</span> File file2;</pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file1 = File.createTempFile(<span class="string">"cve"</span> + nvdCveInfo.getId() + <span class="string">"_"</span>, <span class="string">".xml"</span>, Settings.getTempDirectory());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file2 = File.createTempFile(<span class="string">"cve_1_2_"</span> + nvdCveInfo.getId() + <span class="string">"_"</span>, <span class="string">".xml"</span>, Settings.getTempDirectory());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.first = file1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.second = file2;</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The CVE DB to use when processing the files.</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cveDB;</pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The processor service to pass the results of the download to.</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> ExecutorService processorService;</pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The NVD CVE Meta Data.</span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> NvdCveInfo nvdCveInfo;</pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of nvdCveInfo.</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Simple constructor for the callable download task.</span></pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of nvdCveInfo</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param nvdCveInfo the NVD CVE info</span></pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param processor the processor service to submit the downloaded files to</span></pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cveDB the CVE DB to use to store the vulnerability data</span></pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param settings a reference to the global settings object; this is necessary so that when the thread is started</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the dependencies have a correct reference to the global settings.</span></pre></td></tr>
+<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException thrown if temporary files could not be created</span></pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> NvdCveInfo getNvdCveInfo() {</pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> nvdCveInfo;</pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> CallableDownloadTask(NvdCveInfo nvdCveInfo, ExecutorService processor, CveDB cveDB, Settings settings) <span class="keyword">throws</span> UpdateException {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.nvdCveInfo = nvdCveInfo;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.processorService = processor;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cveDB = cveDB;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.settings = settings;</span></pre></td></tr>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">final</span> File file1;</pre></td></tr>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">final</span> File file2;</pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file1 = File.createTempFile(<span class="string">"cve"</span> + nvdCveInfo.getId() + <span class="string">"_"</span>, <span class="string">".xml"</span>, Settings.getTempDirectory());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file2 = File.createTempFile(<span class="string">"cve_1_2_"</span> + nvdCveInfo.getId() + <span class="string">"_"</span>, <span class="string">".xml"</span>, Settings.getTempDirectory());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(<span class="string">"Unable to create temporary files"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.first = file1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.second = file2;</span></pre></td></tr>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The CVE DB to use when processing the files.</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cveDB;</pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The processor service to pass the results of the download to.</span></pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> ExecutorService processorService;</pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The NVD CVE Meta Data.</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> NvdCveInfo nvdCveInfo;</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of nvdCveInfo.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A reference to the global settings object.</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param nvdCveInfo new value of nvdCveInfo</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Settings settings;</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNvdCveInfo(NvdCveInfo nvdCveInfo) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.nvdCveInfo = nvdCveInfo;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of nvdCveInfo.</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * a file.</span></pre></td></tr>
-<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> File first;</pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of first.</span></pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of first</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of nvdCveInfo</span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> File getFirst() {</pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> first;</pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> NvdCveInfo getNvdCveInfo() {</pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> nvdCveInfo;</pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of nvdCveInfo.</span></pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param nvdCveInfo new value of nvdCveInfo</span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNvdCveInfo(NvdCveInfo nvdCveInfo) {</pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.nvdCveInfo = nvdCveInfo;</pre></td></tr>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of first.</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param first new value of first</span></pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFirst(File first) {</pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.first = first;</pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * a file.</span></pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> File second;</pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> File first;</pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of second.</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of first.</span></pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of second</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of first</span></pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> File getSecond() {</pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> second;</pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> File getFirst() {</pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> first;</pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of first.</span></pre></td></tr>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param first new value of first</span></pre></td></tr>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFirst(File first) {</pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.first = first;</pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of second.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * a file.</span></pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param second new value of second</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> File second;</pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSecond(File second) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.second = second;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of second.</span></pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A placeholder for an exception.</span></pre></td></tr>
-<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> Exception exception = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of exception.</span></pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of exception</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of second</span></pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Exception getException() {</pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> exception;</pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> File getSecond() {</pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> second;</pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of second.</span></pre></td></tr>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param second new value of second</span></pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSecond(File second) {</pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.second = second;</pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * returns whether or not an exception occurred during download.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A placeholder for an exception.</span></pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not an exception occurred during download</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> Exception exception = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasException() {</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"><a title="Line 160: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 160: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> exception != <span class="keyword">null</span>;</a></span></pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Future<ProcessTask> call() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URL url1 = <span class="keyword">new</span> URL(nvdCveInfo.getUrl());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URL url2 = <span class="keyword">new</span> URL(nvdCveInfo.getOldSchemaVersionUrl());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String msg = String.format(<span class="string">"Download Started for NVD CVE - %s"</span>, nvdCveInfo.getId());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CallableDownloadTask.<span class="keyword">class</span>.getName()).log(Level.INFO, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Downloader.fetchFile(url1, first);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Downloader.fetchFile(url2, second);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> msg = String.format(<span class="string">"Download Failed for NVD CVE - %s%nSome CVEs may not be reported."</span>, nvdCveInfo.getId());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CallableDownloadTask.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CallableDownloadTask.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> msg = String.format(<span class="string">"Download Complete for NVD CVE - %s"</span>, nvdCveInfo.getId());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CallableDownloadTask.<span class="keyword">class</span>.getName()).log(Level.INFO, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ProcessTask task = <span class="keyword">new</span> ProcessTask(cveDB, <span class="keyword">this</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.processorService.submit(task);</span></pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"An exception occurred downloading NVD CVE - %s%nSome CVEs may not be reported."</span>, nvdCveInfo.getId());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CallableDownloadTask.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CallableDownloadTask.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Download Task Failed"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Attempts to delete the files that were downloaded.</span></pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of exception.</span></pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of exception</span></pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Exception getException() {</pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> exception;</pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * returns whether or not an exception occurred during download.</span></pre></td></tr>
+<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not an exception occurred during download</span></pre></td></tr>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasException() {</pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"><a title="Line 174: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 174: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> exception != <span class="keyword">null</span>;</a></span></pre></td></tr>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Future<ProcessTask> call() <span class="keyword">throws</span> Exception {</pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setInstance(settings);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URL url1 = <span class="keyword">new</span> URL(nvdCveInfo.getUrl());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URL url2 = <span class="keyword">new</span> URL(nvdCveInfo.getOldSchemaVersionUrl());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String msg = String.format(<span class="string">"Download Started for NVD CVE - %s"</span>, nvdCveInfo.getId());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.INFO, msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Downloader.fetchFile(url1, first);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Downloader.fetchFile(url2, second);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DownloadFailedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> msg = String.format(<span class="string">"Download Failed for NVD CVE - %s%nSome CVEs may not be reported."</span>, nvdCveInfo.getId());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> msg = String.format(<span class="string">"Download Complete for NVD CVE - %s"</span>, nvdCveInfo.getId());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.INFO, msg);</span></pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> cleanup() {</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> deleted = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"><a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (first != <span class="keyword">null</span> && first.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleted = first.delete();</span></pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ProcessTask task = <span class="keyword">new</span> ProcessTask(cveDB, <span class="keyword">this</span>, settings);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.processorService.submit(task);</span></pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"An exception occurred downloading NVD CVE - %s%nSome CVEs may not be reported."</span>, nvdCveInfo.getId());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Download Task Failed"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"><a title="Line 204: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 204: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (first != <span class="keyword">null</span> && (first.exists() || !deleted)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> first.deleteOnExit();</span></pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleted = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"><a title="Line 210: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 210: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (second != <span class="keyword">null</span> && second.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleted = second.delete();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.cleanup();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Attempts to delete the files that were downloaded.</span></pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"><a title="Line 214: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 214: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (second != <span class="keyword">null</span> && (second.exists() || !deleted)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> second.deleteOnExit();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> cleanup() {</pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> deleted = <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"><a title="Line 217: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 217: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (first != <span class="keyword">null</span> && first.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleted = first.delete();</span></pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"><a title="Line 221: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 221: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (first != <span class="keyword">null</span> && (first.exists() || !deleted)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> first.deleteOnExit();</span></pre></td></tr>
+<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleted = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"><a title="Line 227: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 227: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (second != <span class="keyword">null</span> && second.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> deleted = second.delete();</span></pre></td></tr>
+<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 0% (0/12) [each condition: 0%, 0%, 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (second != <span class="keyword">null</span> && (second.exists() || !deleted)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> second.deleteOnExit();</span></pre></td></tr>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 4d8833bfc..9df851fe2 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
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.task.ProcessTask.html">ProcessTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/46</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.5;</span>3.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.task.ProcessTask.html">ProcessTask</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/50</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.5;</span>3.5</td></tr>
</table>
<div class="separator"> </div>
@@ -86,15 +86,15 @@
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.update.StandardUpdate;</pre></td></tr>
-<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.update.exception.UpdateException;</pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.update.xml.NvdCve12Handler;</pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.update.xml.NvdCve20Handler;</pre></td></tr>
-<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.dependency.VulnerableSoftware;</pre></td></tr>
+<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.xml.sax.SAXException;</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
@@ -115,210 +115,234 @@
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A field to store any update exceptions that occur during the "call".</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> UpdateException exception = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(ProcessTask.<span class="keyword">class</span>.getName());</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A field to store any update exceptions that occur during the "call".</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of exception.</span></pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> UpdateException exception = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of exception</span></pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> UpdateException getException() {</pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> exception;</pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of exception.</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of exception.</span></pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param exception new value of exception</span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of exception</span></pre></td></tr>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setException(UpdateException exception) {</pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.exception = exception;</pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> UpdateException getException() {</pre></td></tr>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> exception;</pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A reference to the CveDB.</span></pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of exception.</span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param exception new value of exception</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setException(UpdateException exception) {</pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.exception = exception;</pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> CveDB cveDB;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A reference to the callable download task.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A reference to the CveDB.</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> CallableDownloadTask filePair;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> CveDB cveDB;</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A reference to the properties.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A reference to the callable download task.</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> DatabaseProperties properties;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> CallableDownloadTask filePair;</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A reference to the properties.</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new ProcessTask used to process an NVD CVE update.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> DatabaseProperties properties;</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cveDB the data store object</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param filePair the download task that contains the URL references to download</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A reference to the global settings object.</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> ProcessTask(<span class="keyword">final</span> CveDB cveDB, <span class="keyword">final</span> CallableDownloadTask filePair) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cveDB = cveDB;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.filePair = filePair;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.properties = cveDB.getDatabaseProperties();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Settings settings;</pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new ProcessTask used to process an NVD CVE update.</span></pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cveDB the data store object</span></pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param filePair the download task that contains the URL references to download</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Implements the callable interface.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param settings a reference to the global settings object; this is necessary so that when the thread is started</span></pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the dependencies have a correct reference to the global settings.</span></pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> ProcessTask(<span class="keyword">final</span> CveDB cveDB, <span class="keyword">final</span> CallableDownloadTask filePair, Settings settings) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cveDB = cveDB;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.filePair = filePair;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.properties = cveDB.getDatabaseProperties();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.settings = settings;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Implements the callable interface.</span></pre></td></tr>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return this object</span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws Exception thrown if there is an exception; note that any UpdateExceptions are simply added to the tasks</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * exception collection</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> ProcessTask call() <span class="keyword">throws</span> Exception {</pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processFiles();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UpdateException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.exception = ex;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws Exception thrown if there is an exception; note that any UpdateExceptions are simply added to the tasks</span></pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * exception collection</span></pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Imports the NVD CVE XML File into the Lucene Index.</span></pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> ProcessTask call() <span class="keyword">throws</span> Exception {</pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the file containing the NVD CVE XML</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param oldVersion contains the file containing the NVD CVE XML 1.2</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws ParserConfigurationException is thrown if there is a parser configuration exception</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is thrown if there is a SAXException</span></pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if there is a IO Exception</span></pre></td></tr>
-<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SQLException is thrown if there is a SQL exception</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException is thrown if there is a database exception</span></pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws ClassNotFoundException thrown if the h2 database driver cannot be loaded</span></pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> importXML(File file, File oldVersion) <span class="keyword">throws</span> ParserConfigurationException,</pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> SAXException, IOException, SQLException, DatabaseException, ClassNotFoundException {</pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParserFactory factory = SAXParserFactory.newInstance();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParser saxParser = factory.newSAXParser();</span></pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> NvdCve12Handler cve12Handler = <span class="keyword">new</span> NvdCve12Handler();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saxParser.parse(oldVersion, cve12Handler);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Map<String, List<VulnerableSoftware>> prevVersionVulnMap = cve12Handler.getVulnerabilities();</span></pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> NvdCve20Handler cve20Handler = <span class="keyword">new</span> NvdCve20Handler();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve20Handler.setCveDB(cveDB);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saxParser.parse(file, cve20Handler);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Processes the NVD CVE XML file and imports the data into the DB.</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException thrown if there is an error loading the data into the database</span></pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> processFiles() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String msg = String.format(<span class="string">"Processing Started for NVD CVE - %s"</span>, filePair.getNvdCveInfo().getId());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.INFO, msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> importXML(filePair.getFirst(), filePair.getSecond());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.commit();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties.save(filePair.getNvdCveInfo());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SAXException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.setInstance(settings);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> processFiles();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UpdateException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.exception = ex;</span></pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> filePair.cleanup();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> msg = String.format(<span class="string">"Processing Complete for NVD CVE - %s"</span>, filePair.getNvdCveInfo().getId());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(StandardUpdate.<span class="keyword">class</span>.getName()).log(Level.INFO, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Settings.cleanup();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Imports the NVD CVE XML File into the Lucene Index.</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the file containing the NVD CVE XML</span></pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param oldVersion contains the file containing the NVD CVE XML 1.2</span></pre></td></tr>
+<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws ParserConfigurationException is thrown if there is a parser configuration exception</span></pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is thrown if there is a SAXException</span></pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if there is a IO Exception</span></pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SQLException is thrown if there is a SQL exception</span></pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException is thrown if there is a database exception</span></pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws ClassNotFoundException thrown if the h2 database driver cannot be loaded</span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> importXML(File file, File oldVersion) <span class="keyword">throws</span> ParserConfigurationException,</pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> SAXException, IOException, SQLException, DatabaseException, ClassNotFoundException {</pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParserFactory factory = SAXParserFactory.newInstance();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParser saxParser = factory.newSAXParser();</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> NvdCve12Handler cve12Handler = <span class="keyword">new</span> NvdCve12Handler();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saxParser.parse(oldVersion, cve12Handler);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Map<String, List<VulnerableSoftware>> prevVersionVulnMap = cve12Handler.getVulnerabilities();</span></pre></td></tr>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> NvdCve20Handler cve20Handler = <span class="keyword">new</span> NvdCve20Handler();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve20Handler.setCveDB(cveDB);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saxParser.parse(file, cve20Handler);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Processes the NVD CVE XML file and imports the data into the DB.</span></pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UpdateException thrown if there is an error loading the data into the database</span></pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> processFiles() <span class="keyword">throws</span> UpdateException {</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String msg = String.format(<span class="string">"Processing Started for NVD CVE - %s"</span>, filePair.getNvdCveInfo().getId());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.INFO, msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> importXML(filePair.getFirst(), filePair.getSecond());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.commit();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> properties.save(filePair.getNvdCveInfo());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SAXException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> UpdateException(ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> filePair.cleanup();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> msg = String.format(<span class="string">"Processing Complete for NVD CVE - %s"</span>, filePair.getNvdCveInfo().getId());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.INFO, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7a8e96738..e1a8ed62c 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
@@ -12,8 +12,8 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/48</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">46/48</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">86%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:86px"><span class="text">26/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html">NvdCve12Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">4/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6;</span>2.6</td></tr>
</table>
<div class="separator"> </div>
@@ -90,7 +90,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 37</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> NvdCve12Handler <span class="keyword">extends</span> DefaultHandler {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> NvdCve12Handler <span class="keyword">extends</span> DefaultHandler {</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
@@ -139,21 +139,21 @@
<td class="src"><pre class="src"> <span class="comment"> * if the nvd cve should be skipped because it was rejected.</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> skip = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> skip = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * flag indicating if there is a previous version.</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> hasPreviousVersion = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> hasPreviousVersion = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The current element.</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">final</span> Element current = <span class="keyword">new</span> Element();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Element current = <span class="keyword">new</span> Element();</pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
@@ -186,33 +186,33 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> startElement(String uri, String localName, String qName, Attributes attributes) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> current.setNode(qName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"><a title="Line 88: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 88: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendor = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> product = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> hasPreviousVersion = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String reject = attributes.getValue(<span class="string">"reject"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> skip = <span class="string">"1"</span>.equals(reject);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"><a title="Line 94: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 94: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!skip) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability = attributes.getValue(<span class="string">"name"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> software = <span class="keyword">new</span> ArrayList<VulnerableSoftware>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"> 1222</td> <td class="src"><pre class="src"> current.setNode(qName);</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"><a title="Line 88: Conditional coverage 100% (2/2)."> 1222</a></td> <td class="src"><pre class="src"> <a title="Line 88: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> vendor = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> product = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> hasPreviousVersion = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String reject = attributes.getValue(<span class="string">"reject"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> skip = <span class="string">"1"</span>.equals(reject);</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"><a title="Line 94: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 94: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!skip) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability = attributes.getValue(<span class="string">"name"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> software = <span class="keyword">new</span> ArrayList<VulnerableSoftware>();</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> software = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vulnerability = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> software = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"><a title="Line 101: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 101: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (!skip && current.isProdNode()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 101: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (!skip && current.isProdNode()) {</a></pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendor = attributes.getValue(<span class="string">"vendor"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> product = attributes.getValue(<span class="string">"name"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"><a title="Line 105: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 105: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (!skip && current.isVersNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String prev = attributes.getValue(<span class="string">"prev"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (prev != <span class="keyword">null</span> && <span class="string">"1"</span>.equals(prev)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> hasPreviousVersion = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String edition = attributes.getValue(<span class="string">"edition"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String num = attributes.getValue(<span class="string">"num"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 52</td> <td class="src"><pre class="src"> vendor = attributes.getValue(<span class="string">"vendor"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 52</td> <td class="src"><pre class="src"> product = attributes.getValue(<span class="string">"name"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"><a title="Line 105: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 1143</a></td> <td class="src"><pre class="src"> <a title="Line 105: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (!skip && current.isVersNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 761</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String prev = attributes.getValue(<span class="string">"prev"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 761</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (prev != <span class="keyword">null</span> && <span class="string">"1"</span>.equals(prev)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> hasPreviousVersion = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String edition = attributes.getValue(<span class="string">"edition"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String num = attributes.getValue(<span class="string">"num"</span>);</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
@@ -221,48 +221,48 @@
<td class="src"><pre class="src"> <span class="comment"> purposes this is good enough as we won't use this if we don't find a corresponding "a"</span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> in the nvd cve 2.0. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String cpe = <span class="string">"cpe:/a:"</span> + vendor + <span class="string">":"</span> + product;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"><a title="Line 116: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 116: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (num != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe += <span class="string">":"</span> + num;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> String cpe = <span class="string">"cpe:/a:"</span> + vendor + <span class="string">":"</span> + product;</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"><a title="Line 116: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 116: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (num != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> cpe += <span class="string">":"</span> + num;</pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"><a title="Line 119: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 119: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (edition != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"><a title="Line 119: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 119: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (edition != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cpe += <span class="string">":"</span> + edition;</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VulnerableSoftware vs = <span class="keyword">new</span> VulnerableSoftware();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vs.setCpe(cpe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vs.setPreviousVersion(prev);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> software.add(vs);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> VulnerableSoftware vs = <span class="keyword">new</span> VulnerableSoftware();</pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vs.setCpe(cpe);</pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vs.setPreviousVersion(prev);</pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> software.add(vs);</pre></td></tr>
<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"><a title="Line 127: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 127: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isNVDNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String nvdVer = attributes.getValue(<span class="string">"nvd_xml_version"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"><a title="Line 129: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 129: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"><a title="Line 127: Conditional coverage 100% (2/2)."> 761</a></td> <td class="src"><pre class="src"> <a title="Line 127: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isNVDNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String nvdVer = attributes.getValue(<span class="string">"nvd_xml_version"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"><a title="Line 129: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 129: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXNotSupportedException(<span class="string">"Schema version "</span> + nvdVer + <span class="string">" is not supported"</span>);</span></pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerabilities = <span class="keyword">new</span> HashMap<String, List<VulnerableSoftware>>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vulnerabilities = <span class="keyword">new</span> HashMap<String, List<VulnerableSoftware>>();</pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 1222</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> endElement(String uri, String localName, String qName) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> current.setNode(qName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"><a title="Line 139: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 139: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"><a title="Line 140: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 140: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (!skip && hasPreviousVersion) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerabilities.put(vulnerability, software);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 1222</td> <td class="src"><pre class="src"> current.setNode(qName);</pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsCovered"><a title="Line 139: Conditional coverage 100% (2/2)."> 1222</a></td> <td class="src"><pre class="src"> <a title="Line 139: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsCovered"><a title="Line 140: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 140: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (!skip && hasPreviousVersion) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> vulnerabilities.put(vulnerability, software);</pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> software = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> vulnerability = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 144</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> software = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"> 1222</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
@@ -273,7 +273,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A simple class to maintain information about the current element while parsing the NVD CVE XML.</span></pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">protected</span> <span class="keyword">static</span> <span class="keyword">class</span> Element {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">static</span> <span class="keyword">class</span> Element {</pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
@@ -374,7 +374,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isNVDNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> NVD.equals(node);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 382</td> <td class="src"><pre class="src"> <span class="keyword">return</span> NVD.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
@@ -391,7 +391,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isEntryNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ENTRY.equals(node);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 2444</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ENTRY.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
@@ -425,7 +425,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isProdNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> PROD.equals(node);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 1192</td> <td class="src"><pre class="src"> <span class="keyword">return</span> PROD.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
@@ -442,7 +442,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVersNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> VERS.equals(node);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"> 1140</td> <td class="src"><pre class="src"> <span class="keyword">return</span> VERS.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
@@ -453,6 +453,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 12181df9c..2b3d8f030 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
@@ -12,8 +12,8 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/84</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">84%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:84px"><span class="text">100/119</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">89%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:89px"><span class="text">75/84</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html">NvdCve20Handler$Element</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">15/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.04;</span>3.04</td></tr>
</table>
<div class="separator"> </div>
@@ -98,358 +98,357 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> NvdCve20Handler <span class="keyword">extends</span> DefaultHandler {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> NvdCve20Handler <span class="keyword">extends</span> DefaultHandler {</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the current supported schema version.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String CURRENT_SCHEMA_VERSION = <span class="string">"2.0"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(NvdCve20Handler.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the current element.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the current supported schema version.</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">final</span> Element current = <span class="keyword">new</span> Element();</span></pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String CURRENT_SCHEMA_VERSION = <span class="string">"2.0"</span>;</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the text of the node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the current element.</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> StringBuilder nodeText;</pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Element current = <span class="keyword">new</span> Element();</pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the vulnerability.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the text of the node.</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Vulnerability vulnerability;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> StringBuilder nodeText;</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * a reference for the cve.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the vulnerability.</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Reference reference;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Vulnerability vulnerability;</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * flag indicating whether the application has a cpe.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * a reference for the cve.</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">boolean</span> hasApplicationCpe = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Reference reference;</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The total number of entries parsed.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * flag indicating whether the application has a cpe.</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">int</span> totalNumberOfEntries;</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> hasApplicationCpe = <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The total number of entries parsed.</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of totalNumberOfEntries.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">int</span> totalNumberOfEntries;</pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of totalNumberOfEntries</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getTotalNumberOfEntries() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of totalNumberOfEntries.</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> totalNumberOfEntries;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of totalNumberOfEntries</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The total number of application entries parsed.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getTotalNumberOfEntries() {</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> totalNumberOfEntries;</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">int</span> totalNumberOfApplicationEntries;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The total number of application entries parsed.</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of totalNumberOfApplicationEntries.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">int</span> totalNumberOfApplicationEntries;</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of totalNumberOfApplicationEntries</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getTotalNumberOfApplicationEntries() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of totalNumberOfApplicationEntries.</span></pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> totalNumberOfApplicationEntries;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of totalNumberOfApplicationEntries</span></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> getTotalNumberOfApplicationEntries() {</pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> totalNumberOfApplicationEntries;</pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> startElement(String uri, String localName, String qName, Attributes attributes) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> current.setNode(qName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"><a title="Line 97: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 97: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> hasApplicationCpe = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability = <span class="keyword">new</span> Vulnerability();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setName(attributes.getValue(<span class="string">"id"</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"><a title="Line 101: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 101: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnProductNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(100);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnReferencesNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String lang = attributes.getValue(<span class="string">"xml:lang"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"><a title="Line 105: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 105: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"en"</span>.equals(lang)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reference = <span class="keyword">new</span> Reference();</span></pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 2412</td> <td class="src"><pre class="src"> current.setNode(qName);</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (2/2)."> 2412</a></td> <td class="src"><pre class="src"> <a title="Line 101: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> hasApplicationCpe = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> vulnerability = <span class="keyword">new</span> Vulnerability();</pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> vulnerability.setName(attributes.getValue(<span class="string">"id"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"><a title="Line 105: Conditional coverage 100% (2/2)."> 2385</a></td> <td class="src"><pre class="src"> <a title="Line 105: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnProductNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 727</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(100);</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"><a title="Line 107: Conditional coverage 100% (2/2)."> 1658</a></td> <td class="src"><pre class="src"> <a title="Line 107: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnReferencesNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String lang = attributes.getValue(<span class="string">"xml:lang"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"><a title="Line 109: Conditional coverage 50% (1/2)."> 90</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 109: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"en"</span>.equals(lang)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> reference = <span class="keyword">new</span> Reference();</pre></td></tr>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reference = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reference = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"><a title="Line 110: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 110: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnReferenceNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reference.setUrl(attributes.getValue(<span class="string">"href"</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(130);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"><a title="Line 113: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 113: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnSourceNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(30);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnSummaryNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(500);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"><a title="Line 117: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 117: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isNVDNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String nvdVer = attributes.getValue(<span class="string">"nvd_xml_version"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"><a title="Line 119: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 119: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXNotSupportedException(<span class="string">"Schema version "</span> + nvdVer + <span class="string">" is not supported"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"><a title="Line 114: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 90</a></td> <td class="src"><pre class="src"> <a title="Line 114: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnReferenceNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> reference.setUrl(attributes.getValue(<span class="string">"href"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(130);</pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"><a title="Line 117: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 1478</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 117: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnSourceNode()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(30);</pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"><a title="Line 119: Conditional coverage 100% (2/2)."> 1388</a></td> <td class="src"><pre class="src"> <a title="Line 119: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnSummaryNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(500);</pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"><a title="Line 121: Conditional coverage 100% (2/2)."> 1361</a></td> <td class="src"><pre class="src"> <a title="Line 121: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isNVDNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String nvdVer = attributes.getValue(<span class="string">"nvd_xml_version"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"><a title="Line 123: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 123: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXNotSupportedException(<span class="string">"Schema version "</span> + nvdVer + <span class="string">" is not supported"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"><a title="Line 122: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 122: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnCWENode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCwe(attributes.getValue(<span class="string">"id"</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"><a title="Line 124: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 124: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSScoreNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(5);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"><a title="Line 126: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 126: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessVectorNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(20);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"><a title="Line 128: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 128: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessComplexityNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(20);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"><a title="Line 130: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 130: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAuthenticationNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(20);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"><a title="Line 132: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 132: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAvailabilityImpactNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(20);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"><a title="Line 134: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 134: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSConfidentialityImpactNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(20);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"><a title="Line 136: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 136: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSIntegrityImpactNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">new</span> StringBuilder(20);</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"><a title="Line 126: Conditional coverage 100% (2/2)."> 1</a></td> <td class="src"><pre class="src"> <a title="Line 126: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnCWENode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> vulnerability.setCwe(attributes.getValue(<span class="string">"id"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"><a title="Line 128: Conditional coverage 100% (2/2)."> 1341</a></td> <td class="src"><pre class="src"> <a title="Line 128: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSScoreNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(5);</pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"><a title="Line 130: Conditional coverage 100% (2/2)."> 1315</a></td> <td class="src"><pre class="src"> <a title="Line 130: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessVectorNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(20);</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"><a title="Line 132: Conditional coverage 100% (2/2)."> 1289</a></td> <td class="src"><pre class="src"> <a title="Line 132: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessComplexityNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(20);</pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"><a title="Line 134: Conditional coverage 100% (2/2)."> 1263</a></td> <td class="src"><pre class="src"> <a title="Line 134: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAuthenticationNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(20);</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"><a title="Line 136: Conditional coverage 100% (2/2)."> 1237</a></td> <td class="src"><pre class="src"> <a title="Line 136: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAvailabilityImpactNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(20);</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"><a title="Line 138: Conditional coverage 100% (2/2)."> 1211</a></td> <td class="src"><pre class="src"> <a title="Line 138: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSConfidentialityImpactNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(20);</pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsCovered"><a title="Line 140: Conditional coverage 100% (2/2)."> 1185</a></td> <td class="src"><pre class="src"> <a title="Line 140: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSIntegrityImpactNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">new</span> StringBuilder(20);</pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> characters(<span class="keyword">char</span>[] ch, <span class="keyword">int</span> start, <span class="keyword">int</span> length) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"><a title="Line 143: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 143: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (nodeText != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText.append(ch, start, length);</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"> 2412</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> characters(<span class="keyword">char</span>[] ch, <span class="keyword">int</span> start, <span class="keyword">int</span> length) <span class="keyword">throws</span> SAXException {</pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"><a title="Line 147: Conditional coverage 100% (2/2)."> 3987</a></td> <td class="src"><pre class="src"> <a title="Line 147: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (nodeText != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 1142</td> <td class="src"><pre class="src"> nodeText.append(ch, start, length);</pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 3987</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> endElement(String uri, String localName, String qName) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> current.setNode(qName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"><a title="Line 151: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 151: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> totalNumberOfEntries += 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"><a title="Line 153: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 153: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (hasApplicationCpe) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> totalNumberOfApplicationEntries += 1;</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 2412</td> <td class="src"><pre class="src"> current.setNode(qName);</pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"><a title="Line 155: Conditional coverage 100% (2/2)."> 2412</a></td> <td class="src"><pre class="src"> <a title="Line 155: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (current.isEntryNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> totalNumberOfEntries += 1;</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"><a title="Line 157: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 157: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (hasApplicationCpe) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> totalNumberOfApplicationEntries += 1;</pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saveEntry(vulnerability);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> saveEntry(vulnerability);</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (DatabaseException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CorruptIndexException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"><a title="Line 166: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 166: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSScoreNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> vulnerability = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"><a title="Line 170: Conditional coverage 100% (2/2)."> 2385</a></td> <td class="src"><pre class="src"> <a title="Line 170: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSScoreNode()) {</a></pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">float</span> score = Float.parseFloat(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCvssScore(score);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(NvdCve20Handler.<span class="keyword">class</span>.getName()).log(Level.SEVERE, <span class="string">"Error parsing CVSS Score."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(NvdCve20Handler.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"><a title="Line 175: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 175: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessVectorNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCvssAccessVector(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"><a title="Line 178: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 178: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessComplexityNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCvssAccessComplexity(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAuthenticationNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCvssAuthentication(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"><a title="Line 184: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 184: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAvailabilityImpactNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCvssAvailabilityImpact(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"><a title="Line 187: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 187: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSConfidentialityImpactNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCvssConfidentialityImpact(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"><a title="Line 190: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 190: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSIntegrityImpactNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setCvssIntegrityImpact(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"><a title="Line 193: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 193: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnProductNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cpe = nodeText.toString();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"><a title="Line 195: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 195: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cpe.startsWith(<span class="string">"cpe:/a:"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> hasApplicationCpe = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.addVulnerableSoftware(cpe);</span></pre></td></tr>
-<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">float</span> score = Float.parseFloat(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability.setCvssScore(score);</pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, <span class="string">"Error parsing CVSS Score."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"><a title="Line 179: Conditional coverage 100% (2/2)."> 2359</a></td> <td class="src"><pre class="src"> <a title="Line 179: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessVectorNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability.setCvssAccessVector(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"><a title="Line 182: Conditional coverage 100% (2/2)."> 2333</a></td> <td class="src"><pre class="src"> <a title="Line 182: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAccessComplexityNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability.setCvssAccessComplexity(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"><a title="Line 185: Conditional coverage 100% (2/2)."> 2307</a></td> <td class="src"><pre class="src"> <a title="Line 185: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAuthenticationNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability.setCvssAuthentication(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"><a title="Line 188: Conditional coverage 100% (2/2)."> 2281</a></td> <td class="src"><pre class="src"> <a title="Line 188: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSAvailabilityImpactNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability.setCvssAvailabilityImpact(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"><a title="Line 191: Conditional coverage 100% (2/2)."> 2255</a></td> <td class="src"><pre class="src"> <a title="Line 191: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSConfidentialityImpactNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability.setCvssConfidentialityImpact(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"><a title="Line 194: Conditional coverage 100% (2/2)."> 2229</a></td> <td class="src"><pre class="src"> <a title="Line 194: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isCVSSIntegrityImpactNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> vulnerability.setCvssIntegrityImpact(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"><a title="Line 197: Conditional coverage 100% (2/2)."> 2203</a></td> <td class="src"><pre class="src"> <a title="Line 197: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnProductNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"> 727</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String cpe = nodeText.toString();</pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"><a title="Line 199: Conditional coverage 100% (2/2)."> 727</a></td> <td class="src"><pre class="src"> <a title="Line 199: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (cpe.startsWith(<span class="string">"cpe:/a:"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"> 614</td> <td class="src"><pre class="src"> hasApplicationCpe = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 614</td> <td class="src"><pre class="src"> vulnerability.addVulnerableSoftware(cpe);</pre></td></tr>
+<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"><a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnReferencesNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.addReference(reference);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reference = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"><a title="Line 203: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 203: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnReferenceNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reference.setName(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"><a title="Line 206: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 206: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnSourceNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reference.setSource(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnSummaryNode()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerability.setDescription(nodeText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"><a title="Line 211: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 211: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (nodeText.indexOf(<span class="string">"** REJECT **"</span>) >= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> hasApplicationCpe = <span class="keyword">true</span>; <span class="comment">//ensure we process this to delete the vuln</span></span></pre></td></tr>
-<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nodeText = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 727</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"><a title="Line 204: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 727</a></td> <td class="src"><pre class="src"> <a title="Line 204: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnReferencesNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> vulnerability.addReference(reference);</pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> reference = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"><a title="Line 207: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 1386</a></td> <td class="src"><pre class="src"> <a title="Line 207: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnReferenceNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> reference.setName(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"><a title="Line 210: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 1296</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 210: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (reference != <span class="keyword">null</span> && current.isVulnSourceNode()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> reference.setSource(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"><a title="Line 213: Conditional coverage 100% (2/2)."> 1206</a></td> <td class="src"><pre class="src"> <a title="Line 213: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (current.isVulnSummaryNode()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> vulnerability.setDescription(nodeText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsCovered"><a title="Line 215: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 215: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (nodeText.indexOf(<span class="string">"** REJECT **"</span>) >= 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> hasApplicationCpe = <span class="keyword">true</span>; <span class="comment">//ensure we process this to delete the vuln</span></pre></td></tr>
<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the cve database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> nodeText = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cveDB;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsCovered"> 2412</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the cve database.</span></pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the cveDB.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> CveDB cveDB;</pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param db a reference to the CveDB</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveDB(CveDB db) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the cveDB.</span></pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> cveDB = db;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param db a reference to the CveDB</span></pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A list of CVE entries and associated VulnerableSoftware entries that contain previous entries.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCveDB(CveDB db) {</pre></td></tr>
<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> cveDB = db;</pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Map<String, List<VulnerableSoftware>> prevVersionVulnMap;</pre></td></tr>
-<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the prevVersionVulnMap.</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param map the map of vulnerable software with previous versions being vulnerable</span></pre></td></tr>
-<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPrevVersionVulnMap(Map<String, List<VulnerableSoftware>> map) {</pre></td></tr>
-<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> prevVersionVulnMap = map;</pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Saves a vulnerability to the CVE Database.</span></pre></td></tr>
-<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A list of CVE entries and associated VulnerableSoftware entries that contain previous entries.</span></pre></td></tr>
+<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Map<String, List<VulnerableSoftware>> prevVersionVulnMap;</pre></td></tr>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the prevVersionVulnMap.</span></pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param map the map of vulnerable software with previous versions being vulnerable</span></pre></td></tr>
+<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPrevVersionVulnMap(Map<String, List<VulnerableSoftware>> map) {</pre></td></tr>
+<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> prevVersionVulnMap = map;</pre></td></tr>
+<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vuln the vulnerability to store in the database</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an error writing to the database</span></pre></td></tr>
-<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException is thrown if the CPE Index is corrupt</span></pre></td></tr>
-<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an IOException with the CPE Index</span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> saveEntry(Vulnerability vuln) <span class="keyword">throws</span> DatabaseException, CorruptIndexException, IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"><a title="Line 253: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 253: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cveDB == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cveName = vuln.getName();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"><a title="Line 257: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 257: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (prevVersionVulnMap.containsKey(cveName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<VulnerableSoftware> vulnSoftware = prevVersionVulnMap.get(cveName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"><a title="Line 259: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 259: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (VulnerableSoftware vs : vulnSoftware) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vuln.updateVulnerableSoftware(vs);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.updateVulnerability(vuln);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// <editor-fold defaultstate="collapsed" desc="The Element Class that maintains state information about the current node"></span></pre></td></tr>
-<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A simple class to maintain information about the current element while parsing the NVD CVE XML.</span></pre></td></tr>
-<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Saves a vulnerability to the CVE Database.</span></pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vuln the vulnerability to store in the database</span></pre></td></tr>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an error writing to the database</span></pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws CorruptIndexException is thrown if the CPE Index is corrupt</span></pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException thrown if there is an IOException with the CPE Index</span></pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">protected</span> <span class="keyword">static</span> <span class="keyword">class</span> Element {</span></pre></td></tr>
-<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> saveEntry(Vulnerability vuln) <span class="keyword">throws</span> DatabaseException, CorruptIndexException, IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"><a title="Line 257: Conditional coverage 50% (1/2)."> 19</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 257: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (cveDB == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String cveName = vuln.getName();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"><a title="Line 261: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 261: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (prevVersionVulnMap.containsKey(cveName)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<VulnerableSoftware> vulnSoftware = prevVersionVulnMap.get(cveName);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"><a title="Line 263: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 263: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (VulnerableSoftware vs : vulnSoftware) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vuln.updateVulnerableSoftware(vs);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cveDB.updateVulnerability(vuln);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// <editor-fold defaultstate="collapsed" desc="The Element Class that maintains state information about the current node"></span></pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A simple class to maintain information about the current element while parsing the NVD CVE XML.</span></pre></td></tr>
<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A node type in the NVD CVE Schema 2.0</span></pre></td></tr>
-<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">static</span> <span class="keyword">class</span> Element {</pre></td></tr>
<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String NVD = <span class="string">"nvd"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
@@ -457,7 +456,7 @@
<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ENTRY = <span class="string">"entry"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String NVD = <span class="string">"nvd"</span>;</pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
@@ -465,7 +464,7 @@
<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_PRODUCT = <span class="string">"vuln:product"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ENTRY = <span class="string">"entry"</span>;</pre></td></tr>
<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
@@ -473,7 +472,7 @@
<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_REFERENCES = <span class="string">"vuln:references"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_PRODUCT = <span class="string">"vuln:product"</span>;</pre></td></tr>
<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
@@ -481,7 +480,7 @@
<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_SOURCE = <span class="string">"vuln:source"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_REFERENCES = <span class="string">"vuln:references"</span>;</pre></td></tr>
<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
@@ -489,7 +488,7 @@
<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_REFERENCE = <span class="string">"vuln:reference"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_SOURCE = <span class="string">"vuln:source"</span>;</pre></td></tr>
<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
@@ -497,7 +496,7 @@
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_SUMMARY = <span class="string">"vuln:summary"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_REFERENCE = <span class="string">"vuln:reference"</span>;</pre></td></tr>
<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
@@ -505,7 +504,7 @@
<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_CWE = <span class="string">"vuln:cwe"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_SUMMARY = <span class="string">"vuln:summary"</span>;</pre></td></tr>
<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
@@ -513,7 +512,7 @@
<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_SCORE = <span class="string">"cvss:score"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String VULN_CWE = <span class="string">"vuln:cwe"</span>;</pre></td></tr>
<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
@@ -521,7 +520,7 @@
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_ACCESS_VECTOR = <span class="string">"cvss:access-vector"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_SCORE = <span class="string">"cvss:score"</span>;</pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
@@ -529,7 +528,7 @@
<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_ACCESS_COMPLEXITY = <span class="string">"cvss:access-complexity"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_ACCESS_VECTOR = <span class="string">"cvss:access-vector"</span>;</pre></td></tr>
<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
@@ -537,7 +536,7 @@
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_AUTHENTICATION = <span class="string">"cvss:authentication"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_ACCESS_COMPLEXITY = <span class="string">"cvss:access-complexity"</span>;</pre></td></tr>
<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
@@ -545,7 +544,7 @@
<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_CONFIDENTIALITY_IMPACT = <span class="string">"cvss:confidentiality-impact"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_AUTHENTICATION = <span class="string">"cvss:authentication"</span>;</pre></td></tr>
<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
@@ -553,7 +552,7 @@
<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_INTEGRITY_IMPACT = <span class="string">"cvss:integrity-impact"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_CONFIDENTIALITY_IMPACT = <span class="string">"cvss:confidentiality-impact"</span>;</pre></td></tr>
<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
@@ -561,314 +560,322 @@
<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_AVAILABILITY_IMPACT = <span class="string">"cvss:availability-impact"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_INTEGRITY_IMPACT = <span class="string">"cvss:integrity-impact"</span>;</pre></td></tr>
<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The current node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A node type in the NVD CVE Schema 2.0</span></pre></td></tr>
<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String node;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVSS_AVAILABILITY_IMPACT = <span class="string">"cvss:availability-impact"</span>;</pre></td></tr>
<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The current node.</span></pre></td></tr>
<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the value of node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String node;</pre></td></tr>
<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of node</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getNode() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the value of node.</span></pre></td></tr>
<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.node;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of node</span></pre></td></tr>
<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getNode() {</pre></td></tr>
<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the value of node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.node;</pre></td></tr>
<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param node new value of node</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNode(String node) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the value of node.</span></pre></td></tr>
<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.node = node;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param node new value of node</span></pre></td></tr>
<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setNode(String node) {</pre></td></tr>
<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the NVD node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.node = node;</pre></td></tr>
<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isNVDNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> NVD.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the NVD node.</span></pre></td></tr>
+<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the ENTRY node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isNVDNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsCovered"> 1361</td> <td class="src"><pre class="src"> <span class="keyword">return</span> NVD.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isEntryNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ENTRY.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the ENTRY node.</span></pre></td></tr>
+<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_PRODUCT node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isEntryNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 4824</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ENTRY.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnProductNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> VULN_PRODUCT.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_PRODUCT node.</span></pre></td></tr>
+<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the REFERENCES node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnProductNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"> 4588</td> <td class="src"><pre class="src"> <span class="keyword">return</span> VULN_PRODUCT.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnReferencesNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 388</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> VULN_REFERENCES.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the REFERENCES node.</span></pre></td></tr>
+<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the REFERENCE node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnReferencesNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 392</td> <td class="nbHitsCovered"> 1928</td> <td class="src"><pre class="src"> <span class="keyword">return</span> VULN_REFERENCES.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnReferenceNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 397</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> VULN_REFERENCE.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the REFERENCE node.</span></pre></td></tr>
+<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 401</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_SOURCE node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnReferenceNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 401</td> <td class="nbHitsCovered"> 360</td> <td class="src"><pre class="src"> <span class="keyword">return</span> VULN_REFERENCE.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnSourceNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 406</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> VULN_SOURCE.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_SOURCE node.</span></pre></td></tr>
+<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_SUMMARY node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnSourceNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 410</td> <td class="nbHitsCovered"> 180</td> <td class="src"><pre class="src"> <span class="keyword">return</span> VULN_SOURCE.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnSummaryNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> VULN_SUMMARY.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_SUMMARY node.</span></pre></td></tr>
+<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 416</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_CWE node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnSummaryNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 419</td> <td class="nbHitsCovered"> 2594</td> <td class="src"><pre class="src"> <span class="keyword">return</span> VULN_SUMMARY.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnCWENode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 424</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> VULN_CWE.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the VULN_CWE node.</span></pre></td></tr>
+<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 425</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 426</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 427</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_SCORE node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isVulnCWENode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 428</td> <td class="nbHitsCovered"> 1360</td> <td class="src"><pre class="src"> <span class="keyword">return</span> VULN_CWE.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSScoreNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 433</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CVSS_SCORE.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_SCORE node.</span></pre></td></tr>
+<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_ACCESS_VECTOR node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSScoreNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 437</td> <td class="nbHitsCovered"> 3726</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CVSS_SCORE.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAccessVectorNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 442</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CVSS_ACCESS_VECTOR.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_ACCESS_VECTOR node.</span></pre></td></tr>
+<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_ACCESS_COMPLEXITY node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAccessVectorNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 446</td> <td class="nbHitsCovered"> 3674</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CVSS_ACCESS_VECTOR.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 450</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAccessComplexityNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 451</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CVSS_ACCESS_COMPLEXITY.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_ACCESS_COMPLEXITY node.</span></pre></td></tr>
+<tr> <td class="numLine"> 451</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 453</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_AUTHENTICATION node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAccessComplexityNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 455</td> <td class="nbHitsCovered"> 3622</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CVSS_ACCESS_COMPLEXITY.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 456</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 458</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 459</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAuthenticationNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 460</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CVSS_AUTHENTICATION.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_AUTHENTICATION node.</span></pre></td></tr>
+<tr> <td class="numLine"> 460</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 464</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_CONFIDENTIALITY_IMPACT node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAuthenticationNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 464</td> <td class="nbHitsCovered"> 3570</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CVSS_AUTHENTICATION.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 468</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSConfidentialityImpactNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 469</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CVSS_CONFIDENTIALITY_IMPACT.equals(node);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_CONFIDENTIALITY_IMPACT node.</span></pre></td></tr>
+<tr> <td class="numLine"> 469</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 470</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 471</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 472</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_INTEGRITY_IMPACT node.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSConfidentialityImpactNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 473</td> <td class="nbHitsCovered"> 3466</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CVSS_CONFIDENTIALITY_IMPACT.equals(node);</pre></td></tr>
<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
-<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSIntegrityImpactNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 478</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CVSS_INTEGRITY_IMPACT.equals(node);</span></pre></td></tr>
-<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_AVAILABILITY_IMPACT node.</span></pre></td></tr>
-<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_INTEGRITY_IMPACT node.</span></pre></td></tr>
+<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
-<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAvailabilityImpactNode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 487</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CVSS_AVAILABILITY_IMPACT.equals(node);</span></pre></td></tr>
-<tr> <td class="numLine"> 488</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSIntegrityImpactNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 482</td> <td class="nbHitsCovered"> 3414</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CVSS_INTEGRITY_IMPACT.equals(node);</pre></td></tr>
+<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Checks if the handler is at the CVSS_AVAILABILITY_IMPACT node.</span></pre></td></tr>
+<tr> <td class="numLine"> 487</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 488</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true or false</span></pre></td></tr>
<tr> <td class="numLine"> 489</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 490</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isCVSSAvailabilityImpactNode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 491</td> <td class="nbHitsCovered"> 3518</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CVSS_AVAILABILITY_IMPACT.equals(node);</pre></td></tr>
+<tr> <td class="numLine"> 492</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 493</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 494</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// </editor-fold></span></pre></td></tr>
-<tr> <td class="numLine"> 491</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 495</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 eb41b5de0..df9f0d509 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Confidence.html">Confidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">5/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
</table>
<div class="separator"> </div>
@@ -65,7 +65,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 25</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> enum Confidence {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">public</span> enum Confidence {</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
@@ -74,32 +74,32 @@
<td class="src"><pre class="src"> <span class="comment"> * High confidence evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 30</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HIGHEST,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HIGHEST,</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * High confidence evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 34</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HIGH,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HIGH,</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Medium confidence evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> MEDIUM,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> MEDIUM,</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Low confidence evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOW</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> LOW</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 87694aa73..6261ec0c1 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 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/106</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.682926829268293;</span>2.683</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Dependency.html">Dependency</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">59%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:59px"><span class="text">67/113</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">17/118</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4680851063829787;</span>2.468</td></tr>
</table>
<div class="separator"> </div>
@@ -91,976 +91,1107 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> Dependency <span class="keyword">implements</span> Comparable<Dependency> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> Dependency <span class="keyword">implements</span> Comparable<Dependency> {</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The actual file path of the dependency on disk.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String actualFilePath;</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(Dependency.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The file path to display.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The actual file path of the dependency on disk.</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String filePath;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String actualFilePath;</pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The file name of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The file path to display.</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String fileName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String filePath;</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The file extension of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The file name of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String fileExtension;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String fileName;</pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The md5 hash of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The file extension of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String md5sum;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String fileExtension;</pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The SHA1 hash of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The md5 hash of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String sha1sum;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String md5sum;</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A list of Identifiers.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The SHA1 hash of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Set<Identifier> identifiers;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String sha1sum;</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of vendor evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A list of Identifiers.</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> EvidenceCollection vendorEvidence;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Set<Identifier> identifiers;</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of product evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of vendor evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> EvidenceCollection productEvidence;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> EvidenceCollection vendorEvidence;</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of version evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of product evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> EvidenceCollection versionEvidence;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> EvidenceCollection productEvidence;</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of version evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new Dependency object.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> Dependency() {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vendorEvidence = <span class="keyword">new</span> EvidenceCollection();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> productEvidence = <span class="keyword">new</span> EvidenceCollection();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionEvidence = <span class="keyword">new</span> EvidenceCollection();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> identifiers = <span class="keyword">new</span> TreeSet<Identifier>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerabilities = <span class="keyword">new</span> TreeSet<Vulnerability>(<span class="keyword">new</span> VulnerabilityComparator());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> EvidenceCollection versionEvidence;</pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Constructs a new Dependency object.</span></pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the File to create the dependency object from.</span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Dependency() {</pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> vendorEvidence = <span class="keyword">new</span> EvidenceCollection();</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> productEvidence = <span class="keyword">new</span> EvidenceCollection();</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> versionEvidence = <span class="keyword">new</span> EvidenceCollection();</pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> identifiers = <span class="keyword">new</span> TreeSet<Identifier>();</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> vulnerabilities = <span class="keyword">new</span> TreeSet<Vulnerability>(<span class="keyword">new</span> VulnerabilityComparator());</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> suppressedIdentifiers = <span class="keyword">new</span> TreeSet<Identifier>();</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> suppressedVulnerabilities = <span class="keyword">new</span> TreeSet<Vulnerability>(<span class="keyword">new</span> VulnerabilityComparator());</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new Dependency object.</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the File to create the dependency object from.</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Dependency(File file) {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.actualFilePath = file.getPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.filePath = <span class="keyword">this</span>.actualFilePath;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.fileName = file.getName();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.fileExtension = FileUtils.getFileExtension(fileName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> determineHashes(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the file name of the dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the file name of the dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>();</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.actualFilePath = file.getPath();</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.filePath = <span class="keyword">this</span>.actualFilePath;</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileName = file.getName();</pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileExtension = FileUtils.getFileExtension(fileName);</pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> determineHashes(file);</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getFileName() {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.fileName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the file name of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the file name of the dependency</span></pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the file name of the dependency with the backslash escaped for use in JavaScript. This is a complete hack</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * as I could not get the replace to work in the template itself.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getFileName() {</pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.fileName;</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the file name of the dependency with the backslash escaped for use in JavaScript</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getFileNameForJavaScript() {</pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.fileName.replace(<span class="string">"\\"</span>, <span class="string">"\\\\"</span>);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the file name of the dependency with the backslash escaped for use in JavaScript. This is a complete hack</span></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * as I could not get the replace to work in the template itself.</span></pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the file name of the dependency with the backslash escaped for use in JavaScript</span></pre></td></tr>
<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the file name of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param fileName the file name of the dependency</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getFileNameForJavaScript() {</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.fileName.replace(<span class="string">"\\"</span>, <span class="string">"\\\\"</span>);</span></pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFileName(String fileName) {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.fileName = fileName;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the actual file path of the dependency on disk.</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param actualFilePath the file path of the dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setActualFilePath(String actualFilePath) {</pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.actualFilePath = actualFilePath;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"><a title="Line 141: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 141: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.sha1sum == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(<span class="keyword">this</span>.actualFilePath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> determineHashes(file);</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the file path of the dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the file path of the dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getActualFilePath() {</pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.actualFilePath;</pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets a reference to the File object.</span></pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the File object</span></pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> File getActualFile() {</pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(<span class="keyword">this</span>.actualFilePath);</span></pre></td></tr>
-<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the file path of the dependency.</span></pre></td></tr>
-<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param filePath the file path of the dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFilePath(String filePath) {</pre></td></tr>
-<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.filePath = filePath;</pre></td></tr>
-<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the file path of the dependency.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <b>NOTE:</b> This may not be the actual path of the file on disk. The actual path of the file on disk can be</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * obtained via the getActualFilePath().</p></span></pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the file path of the dependency</span></pre></td></tr>
-<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getFilePath() {</pre></td></tr>
-<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.filePath;</pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Sets the file name of the dependency.</span></pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param fileName the file name of the dependency</span></pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFileName(String fileName) {</pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.fileName = fileName;</pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the actual file path of the dependency on disk.</span></pre></td></tr>
+<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param actualFilePath the file path of the dependency</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setActualFilePath(String actualFilePath) {</pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.actualFilePath = actualFilePath;</pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"><a title="Line 147: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 147: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.sha1sum == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(<span class="keyword">this</span>.actualFilePath);</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> determineHashes(file);</pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the file path of the dependency.</span></pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the file path of the dependency</span></pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getActualFilePath() {</pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.actualFilePath;</pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets a reference to the File object.</span></pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the File object</span></pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> File getActualFile() {</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> File(<span class="keyword">this</span>.actualFilePath);</pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the file path of the dependency.</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param filePath the file path of the dependency</span></pre></td></tr>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFilePath(String filePath) {</pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.filePath = filePath;</pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the file path of the dependency.</p></span></pre></td></tr>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <b>NOTE:</b> This may not be the actual path of the file on disk. The actual path of the file on disk can be</span></pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * obtained via the getActualFilePath().</p></span></pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the file path of the dependency</span></pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getFilePath() {</pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param fileExtension the file name of the dependency</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.filePath;</pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFileExtension(String fileExtension) {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.fileExtension = fileExtension;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the file name of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param fileExtension the file name of the dependency</span></pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the file extension of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setFileExtension(String fileExtension) {</pre></td></tr>
<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the file extension of the dependency</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.fileExtension = fileExtension;</pre></td></tr>
<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getFileExtension() {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.fileExtension;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the file extension of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the file extension of the dependency</span></pre></td></tr>
<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the MD5 Checksum of the dependency file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getFileExtension() {</pre></td></tr>
<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the MD5 Checksum</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.fileExtension;</pre></td></tr>
<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getMd5sum() {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.md5sum;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the MD5 Checksum of the dependency file.</span></pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the MD5 Checksum</span></pre></td></tr>
<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the MD5 Checksum of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getMd5sum() {</pre></td></tr>
<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param md5sum the MD5 Checksum</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.md5sum;</pre></td></tr>
<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setMd5sum(String md5sum) {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.md5sum = md5sum;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the MD5 Checksum of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param md5sum the MD5 Checksum</span></pre></td></tr>
<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the SHA1 Checksum of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setMd5sum(String md5sum) {</pre></td></tr>
<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the SHA1 Checksum</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.md5sum = md5sum;</pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getSha1sum() {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.sha1sum;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the SHA1 Checksum of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the SHA1 Checksum</span></pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets the SHA1 Checksum of the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getSha1sum() {</pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param sha1sum the SHA1 Checksum</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.sha1sum;</pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSha1sum(String sha1sum) {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.sha1sum = sha1sum;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the SHA1 Checksum of the dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param sha1sum the SHA1 Checksum</span></pre></td></tr>
<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a List of Identifiers.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSha1sum(String sha1sum) {</pre></td></tr>
<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an ArrayList of Identifiers</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.sha1sum = sha1sum;</pre></td></tr>
<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Identifier> getIdentifiers() {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.identifiers;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a List of Identifiers.</span></pre></td></tr>
<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an ArrayList of Identifiers</span></pre></td></tr>
<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets a List of Identifiers.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Identifier> getIdentifiers() {</pre></td></tr>
<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param identifiers A list of Identifiers</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.identifiers;</pre></td></tr>
<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setIdentifiers(Set<Identifier> identifiers) {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.identifiers = identifiers;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets a List of Identifiers.</span></pre></td></tr>
<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param identifiers A list of Identifiers</span></pre></td></tr>
<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Adds an entry to the list of detected Identifiers for the dependency file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setIdentifiers(Set<Identifier> identifiers) {</pre></td></tr>
<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param type the type of identifier (such as CPE)</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.identifiers = identifiers;</pre></td></tr>
<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param value the value of the identifier</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the identifier</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addIdentifier(String type, String value, String url) {</pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = <span class="keyword">new</span> Identifier(type, value, url);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.identifiers.add(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Adds an entry to the list of detected Identifiers for the dependency file.</span></pre></td></tr>
-<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param type the type of identifier (such as CPE)</span></pre></td></tr>
-<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param value the value of the identifier</span></pre></td></tr>
-<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addIdentifier(String type, String value, String url) {</pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier i = <span class="keyword">new</span> Identifier(type, value, url);</pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.identifiers.add(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param confidence the confidence in the Identifier being accurate</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addIdentifier(String type, String value, String url, Confidence confidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = <span class="keyword">new</span> Identifier(type, value, url);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> i.setConfidence(confidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.identifiers.add(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Adds an entry to the list of detected Identifiers for the dependency file.</span></pre></td></tr>
-<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param identifier the identifier to add</span></pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param type the type of identifier (such as CPE)</span></pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param value the value of the identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the identifier</span></pre></td></tr>
+<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param confidence the confidence in the Identifier being accurate</span></pre></td></tr>
+<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addIdentifier(String type, String value, String url, Confidence confidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = <span class="keyword">new</span> Identifier(type, value, url);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> i.setConfidence(confidence);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.identifiers.add(i);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addIdentifier(Identifier identifier) {</pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.identifiers.add(identifier);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds an entry to the list of detected Identifiers for the dependency file.</span></pre></td></tr>
<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param identifier the identifier to add</span></pre></td></tr>
<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the evidence used to identify this dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
-<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addIdentifier(Identifier identifier) {</pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.identifiers.add(identifier);</pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getEvidence() {</pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EvidenceCollection.merge(<span class="keyword">this</span>.productEvidence, <span class="keyword">this</span>.vendorEvidence, <span class="keyword">this</span>.versionEvidence);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A set of identifiers that have been suppressed.</span></pre></td></tr>
<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Set<Identifier> suppressedIdentifiers;</pre></td></tr>
<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the evidence used to identify this dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of suppressedIdentifiers.</span></pre></td></tr>
<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of suppressedIdentifiers</span></pre></td></tr>
<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getEvidenceUsed() {</pre></td></tr>
-<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EvidenceCollection.mergeUsed(<span class="keyword">this</span>.productEvidence, <span class="keyword">this</span>.vendorEvidence, <span class="keyword">this</span>.versionEvidence);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Identifier> getSuppressedIdentifiers() {</pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> suppressedIdentifiers;</pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the Vendor Evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of suppressedIdentifiers.</span></pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param suppressedIdentifiers new value of suppressedIdentifiers</span></pre></td></tr>
<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getVendorEvidence() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.vendorEvidence;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSuppressedIdentifiers(Set<Identifier> suppressedIdentifiers) {</pre></td></tr>
<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.suppressedIdentifiers = suppressedIdentifiers;</pre></td></tr>
<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the Product Evidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
-<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getProductEvidence() {</pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.productEvidence;</pre></td></tr>
-<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Gets the Version Evidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds an identifier to the list of suppressed identifiers.</span></pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
-<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param identifier an identifier that was suppressed.</span></pre></td></tr>
+<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getVersionEvidence() {</pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.versionEvidence;</pre></td></tr>
-<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addSuppressedIdentifier(Identifier identifier) {</pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.suppressedIdentifiers.add(identifier);</pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A set of vulnerabilities that have been suppressed.</span></pre></td></tr>
+<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> SortedSet<Vulnerability> suppressedVulnerabilities;</pre></td></tr>
+<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of suppressedVulnerabilities.</span></pre></td></tr>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The description of the JAR file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of suppressedVulnerabilities</span></pre></td></tr>
<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String description;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> SortedSet<Vulnerability> getSuppressedVulnerabilities() {</pre></td></tr>
<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> suppressedVulnerabilities;</pre></td></tr>
<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of description.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of description</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of suppressedVulnerabilities.</span></pre></td></tr>
<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getDescription() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param suppressedVulnerabilities new value of suppressedVulnerabilities</span></pre></td></tr>
<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> description;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setSuppressedVulnerabilities(SortedSet<Vulnerability> suppressedVulnerabilities) {</pre></td></tr>
<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.suppressedVulnerabilities = suppressedVulnerabilities;</pre></td></tr>
<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of description.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param description new value of description</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds a vulnerability to the set of suppressed vulnerabilities.</span></pre></td></tr>
<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDescription(String description) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vulnerability the vulnerability that was suppressed</span></pre></td></tr>
<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.description = description;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The license that this dependency uses.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addSuppressedVulnerability(Vulnerability vulnerability) {</pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.suppressedVulnerabilities.add(vulnerability);</pre></td></tr>
+<tr> <td class="numLineCover"> 361</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String license;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the evidence used to identify this dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of license.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of license</span></pre></td></tr>
-<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getEvidence() {</pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EvidenceCollection.merge(<span class="keyword">this</span>.productEvidence, <span class="keyword">this</span>.vendorEvidence, <span class="keyword">this</span>.versionEvidence);</pre></td></tr>
<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getLicense() {</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> license;</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the evidence used to identify this dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of license.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param license new value of license</span></pre></td></tr>
-<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getEvidenceUsed() {</pre></td></tr>
+<tr> <td class="numLineCover"> 378</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EvidenceCollection.mergeUsed(<span class="keyword">this</span>.productEvidence, <span class="keyword">this</span>.vendorEvidence, <span class="keyword">this</span>.versionEvidence);</pre></td></tr>
<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setLicense(String license) {</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.license = license;</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the Vendor Evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A list of vulnerabilities for this dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> SortedSet<Vulnerability> vulnerabilities;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getVendorEvidence() {</pre></td></tr>
<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.vendorEvidence;</pre></td></tr>
<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the list of vulnerabilities.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the list of vulnerabilities</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the Product Evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> SortedSet<Vulnerability> getVulnerabilities() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> vulnerabilities;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of vulnerabilities.</span></pre></td></tr>
-<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vulnerabilities new value of vulnerabilities</span></pre></td></tr>
-<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 401</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setVulnerabilities(SortedSet<Vulnerability> vulnerabilities) {</pre></td></tr>
-<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.vulnerabilities = vulnerabilities;</pre></td></tr>
-<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getProductEvidence() {</pre></td></tr>
+<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.productEvidence;</pre></td></tr>
+<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines the sha1 and md5 sum for the given file.</span></pre></td></tr>
-<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the Version Evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 401</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an EvidenceCollection.</span></pre></td></tr>
+<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection getVersionEvidence() {</pre></td></tr>
+<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.versionEvidence;</pre></td></tr>
+<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the file to create checksums for</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The description of the JAR file.</span></pre></td></tr>
<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> determineHashes(File file) {</pre></td></tr>
-<tr> <td class="numLineCover"> 411</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String md5 = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 412</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String sha1 = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 414</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> md5 = Checksum.getMD5Checksum(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sha1 = Checksum.getSHA1Checksum(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 416</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 417</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to read '%s' to determine hashes."</span>, file.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 418</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Dependency.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 419</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Dependency.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 420</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 421</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"Unable to use MD5 of SHA1 checksums."</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 422</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Dependency.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 423</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Dependency.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 424</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 425</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.setMd5sum(md5);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 426</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.setSha1sum(sha1);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 427</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String description;</pre></td></tr>
+<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of description.</span></pre></td></tr>
+<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of description</span></pre></td></tr>
+<tr> <td class="numLine"> 416</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getDescription() {</pre></td></tr>
+<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> description;</pre></td></tr>
+<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of description.</span></pre></td></tr>
+<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param description new value of description</span></pre></td></tr>
+<tr> <td class="numLine"> 425</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 426</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setDescription(String description) {</pre></td></tr>
+<tr> <td class="numLine"> 427</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.description = description;</pre></td></tr>
+<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Adds a vulnerability to the dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The license that this dependency uses.</span></pre></td></tr>
<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vulnerability a vulnerability outlining a vulnerability.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String license;</pre></td></tr>
<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addVulnerability(Vulnerability vulnerability) {</pre></td></tr>
-<tr> <td class="numLineCover"> 435</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.vulnerabilities.add(vulnerability);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 436</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of related dependencies.</span></pre></td></tr>
-<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 440</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> Set<Dependency> relatedDependencies = <span class="keyword">new</span> TreeSet<Dependency>();</span></pre></td></tr>
-<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of relatedDependencies.</span></pre></td></tr>
-<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of license.</span></pre></td></tr>
+<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of relatedDependencies</span></pre></td></tr>
-<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of license</span></pre></td></tr>
+<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Dependency> getRelatedDependencies() {</pre></td></tr>
-<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> relatedDependencies;</pre></td></tr>
-<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getLicense() {</pre></td></tr>
+<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> license;</pre></td></tr>
+<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 450</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of license.</span></pre></td></tr>
+<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param license new value of license</span></pre></td></tr>
+<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setLicense(String license) {</pre></td></tr>
+<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.license = license;</pre></td></tr>
+<tr> <td class="numLine"> 450</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 451</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of relatedDependencies.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A list of vulnerabilities for this dependency.</span></pre></td></tr>
<tr> <td class="numLine"> 453</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param relatedDependencies new value of relatedDependencies</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> SortedSet<Vulnerability> vulnerabilities;</pre></td></tr>
<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 456</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setRelatedDependencies(Set<Dependency> relatedDependencies) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.relatedDependencies = relatedDependencies;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the list of vulnerabilities.</span></pre></td></tr>
<tr> <td class="numLine"> 458</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 459</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the list of vulnerabilities</span></pre></td></tr>
<tr> <td class="numLine"> 460</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Adds a related dependency.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> SortedSet<Vulnerability> getVulnerabilities() {</pre></td></tr>
<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> vulnerabilities;</pre></td></tr>
<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependency a reference to the related dependency</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 464</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addRelatedDependency(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 466</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> relatedDependencies.add(dependency);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 467</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of vulnerabilities.</span></pre></td></tr>
+<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 468</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vulnerabilities new value of vulnerabilities</span></pre></td></tr>
<tr> <td class="numLine"> 469</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 470</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Implementation of the Comparable<Dependency> interface. The comparison is solely based on the file name.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setVulnerabilities(SortedSet<Vulnerability> vulnerabilities) {</pre></td></tr>
<tr> <td class="numLine"> 471</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.vulnerabilities = vulnerabilities;</pre></td></tr>
<tr> <td class="numLine"> 472</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param o a dependency to compare</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an integer representing the natural ordering</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(Dependency o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 476</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.getFileName().compareToIgnoreCase(o.getFileName());</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines the sha1 and md5 sum for the given file.</span></pre></td></tr>
+<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the file to create checksums for</span></pre></td></tr>
<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Implementation of the equals method.</span></pre></td></tr>
-<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> determineHashes(File file) {</pre></td></tr>
+<tr> <td class="numLineCover"> 480</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> String md5 = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 481</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> String sha1 = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the objects are equal, otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
-<tr> <td class="numLineCover"> 487</td> <td class="nbHitsUncovered"><a title="Line 487: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 487: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 488</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 489</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"><a title="Line 490: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 490: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 491</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 492</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 493</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Dependency other = (Dependency) obj;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 494</td> <td class="nbHitsUncovered"><a title="Line 494: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 494: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.actualFilePath == <span class="keyword">null</span>) ? (other.actualFilePath != <span class="keyword">null</span>) : !<span class="keyword">this</span>.actualFilePath.equals(other.actualFilePath)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 495</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 496</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 497</td> <td class="nbHitsUncovered"><a title="Line 497: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 497: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.filePath == <span class="keyword">null</span>) ? (other.filePath != <span class="keyword">null</span>) : !<span class="keyword">this</span>.filePath.equals(other.filePath)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 498</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 483</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> md5 = Checksum.getMD5Checksum(file);</pre></td></tr>
+<tr> <td class="numLineCover"> 484</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> sha1 = Checksum.getSHA1Checksum(file);</pre></td></tr>
+<tr> <td class="numLineCover"> 485</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 486</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to read '%s' to determine hashes."</span>, file.getName());</pre></td></tr>
+<tr> <td class="numLineCover"> 487</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> LOGGER.log(Level.WARNING, msg);</pre></td></tr>
+<tr> <td class="numLineCover"> 488</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 489</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"Unable to use MD5 of SHA1 checksums."</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 491</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 492</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 493</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.setMd5sum(md5);</pre></td></tr>
+<tr> <td class="numLineCover"> 495</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.setSha1sum(sha1);</pre></td></tr>
+<tr> <td class="numLineCover"> 496</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 500</td> <td class="nbHitsUncovered"><a title="Line 500: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 500: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.fileName == <span class="keyword">null</span>) ? (other.fileName != <span class="keyword">null</span>) : !<span class="keyword">this</span>.fileName.equals(other.fileName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 501</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds a vulnerability to the dependency.</span></pre></td></tr>
+<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vulnerability a vulnerability outlining a vulnerability.</span></pre></td></tr>
<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 503</td> <td class="nbHitsUncovered"><a title="Line 503: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 503: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.fileExtension == <span class="keyword">null</span>) ? (other.fileExtension != <span class="keyword">null</span>) : !<span class="keyword">this</span>.fileExtension.equals(other.fileExtension)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 504</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 506</td> <td class="nbHitsUncovered"><a title="Line 506: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 506: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.md5sum == <span class="keyword">null</span>) ? (other.md5sum != <span class="keyword">null</span>) : !<span class="keyword">this</span>.md5sum.equals(other.md5sum)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 507</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addVulnerability(Vulnerability vulnerability) {</pre></td></tr>
+<tr> <td class="numLineCover"> 504</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.vulnerabilities.add(vulnerability);</pre></td></tr>
+<tr> <td class="numLineCover"> 505</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 506</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 507</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of related dependencies.</span></pre></td></tr>
<tr> <td class="numLine"> 508</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 509</td> <td class="nbHitsUncovered"><a title="Line 509: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 509: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.sha1sum == <span class="keyword">null</span>) ? (other.sha1sum != <span class="keyword">null</span>) : !<span class="keyword">this</span>.sha1sum.equals(other.sha1sum)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 510</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 509</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<Dependency> relatedDependencies = <span class="keyword">new</span> TreeSet<Dependency>();</pre></td></tr>
+<tr> <td class="numLine"> 510</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 511</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 512</td> <td class="nbHitsUncovered"><a title="Line 512: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 512: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.identifiers != other.identifiers && (<span class="keyword">this</span>.identifiers == <span class="keyword">null</span> || !<span class="keyword">this</span>.identifiers.equals(other.identifiers))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 513</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 512</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of relatedDependencies.</span></pre></td></tr>
+<tr> <td class="numLine"> 513</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 514</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 515</td> <td class="nbHitsUncovered"><a title="Line 515: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 515: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.vendorEvidence != other.vendorEvidence && (<span class="keyword">this</span>.vendorEvidence == <span class="keyword">null</span> || !<span class="keyword">this</span>.vendorEvidence.equals(other.vendorEvidence))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 516</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of relatedDependencies</span></pre></td></tr>
+<tr> <td class="numLine"> 515</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 516</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Dependency> getRelatedDependencies() {</pre></td></tr>
<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 518</td> <td class="nbHitsUncovered"><a title="Line 518: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 518: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.productEvidence != other.productEvidence && (<span class="keyword">this</span>.productEvidence == <span class="keyword">null</span> || !<span class="keyword">this</span>.productEvidence.equals(other.productEvidence))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 519</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> relatedDependencies;</pre></td></tr>
+<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 521</td> <td class="nbHitsUncovered"><a title="Line 521: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 521: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.versionEvidence != other.versionEvidence && (<span class="keyword">this</span>.versionEvidence == <span class="keyword">null</span> || !<span class="keyword">this</span>.versionEvidence.equals(other.versionEvidence))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 522</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of relatedDependencies.</span></pre></td></tr>
+<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 524</td> <td class="nbHitsUncovered"><a title="Line 524: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 524: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.description == <span class="keyword">null</span>) ? (other.description != <span class="keyword">null</span>) : !<span class="keyword">this</span>.description.equals(other.description)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 525</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param relatedDependencies new value of relatedDependencies</span></pre></td></tr>
+<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 525</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setRelatedDependencies(Set<Dependency> relatedDependencies) {</pre></td></tr>
<tr> <td class="numLine"> 526</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 527</td> <td class="nbHitsUncovered"><a title="Line 527: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 527: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.license == <span class="keyword">null</span>) ? (other.license != <span class="keyword">null</span>) : !<span class="keyword">this</span>.license.equals(other.license)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 528</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.relatedDependencies = relatedDependencies;</pre></td></tr>
+<tr> <td class="numLine"> 527</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 528</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 529</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 530</td> <td class="nbHitsUncovered"><a title="Line 530: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 530: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.vulnerabilities != other.vulnerabilities && (<span class="keyword">this</span>.vulnerabilities == <span class="keyword">null</span> || !<span class="keyword">this</span>.vulnerabilities.equals(other.vulnerabilities))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 531</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds a related dependency.</span></pre></td></tr>
+<tr> <td class="numLine"> 531</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 532</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 533</td> <td class="nbHitsUncovered"><a title="Line 533: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 533: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.relatedDependencies != other.relatedDependencies</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependency a reference to the related dependency</span></pre></td></tr>
+<tr> <td class="numLine"> 533</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 534</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && (<span class="keyword">this</span>.relatedDependencies == <span class="keyword">null</span> || !<span class="keyword">this</span>.relatedDependencies.equals(other.relatedDependencies))) {</pre></td></tr>
-<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 537</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addRelatedDependency(Dependency dependency) {</pre></td></tr>
+<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> relatedDependencies.add(dependency);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 536</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 537</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 539</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Implementation of the Comparable<Dependency> interface. The comparison is solely based on the file name.</span></pre></td></tr>
<tr> <td class="numLine"> 540</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 541</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generates the HashCode.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param o a dependency to compare</span></pre></td></tr>
<tr> <td class="numLine"> 542</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an integer representing the natural ordering</span></pre></td></tr>
<tr> <td class="numLine"> 543</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the HashCode</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 544</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 545</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(Dependency o) {</pre></td></tr>
+<tr> <td class="numLineCover"> 545</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.getFileName().compareToIgnoreCase(o.getFileName());</pre></td></tr>
<tr> <td class="numLine"> 546</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 547</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 3;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 548</td> <td class="nbHitsUncovered"><a title="Line 548: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 548: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.actualFilePath != <span class="keyword">null</span> ? <span class="keyword">this</span>.actualFilePath.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 549</td> <td class="nbHitsUncovered"><a title="Line 549: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 549: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.filePath != <span class="keyword">null</span> ? <span class="keyword">this</span>.filePath.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 550</td> <td class="nbHitsUncovered"><a title="Line 550: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 550: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.fileName != <span class="keyword">null</span> ? <span class="keyword">this</span>.fileName.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 551</td> <td class="nbHitsUncovered"><a title="Line 551: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 551: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.fileExtension != <span class="keyword">null</span> ? <span class="keyword">this</span>.fileExtension.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 552</td> <td class="nbHitsUncovered"><a title="Line 552: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 552: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.md5sum != <span class="keyword">null</span> ? <span class="keyword">this</span>.md5sum.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 553</td> <td class="nbHitsUncovered"><a title="Line 553: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 553: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.sha1sum != <span class="keyword">null</span> ? <span class="keyword">this</span>.sha1sum.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"><a title="Line 554: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 554: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.identifiers != <span class="keyword">null</span> ? <span class="keyword">this</span>.identifiers.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 555</td> <td class="nbHitsUncovered"><a title="Line 555: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 555: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.vendorEvidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.vendorEvidence.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 556</td> <td class="nbHitsUncovered"><a title="Line 556: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 556: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.productEvidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.productEvidence.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 557</td> <td class="nbHitsUncovered"><a title="Line 557: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 557: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.versionEvidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.versionEvidence.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 558</td> <td class="nbHitsUncovered"><a title="Line 558: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 558: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.description != <span class="keyword">null</span> ? <span class="keyword">this</span>.description.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 559</td> <td class="nbHitsUncovered"><a title="Line 559: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 559: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.license != <span class="keyword">null</span> ? <span class="keyword">this</span>.license.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 560</td> <td class="nbHitsUncovered"><a title="Line 560: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 560: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.vulnerabilities != <span class="keyword">null</span> ? <span class="keyword">this</span>.vulnerabilities.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 561</td> <td class="nbHitsUncovered"><a title="Line 561: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 561: Conditional coverage 0% (0/2)."> hash = 47 * hash + (<span class="keyword">this</span>.relatedDependencies != <span class="keyword">null</span> ? <span class="keyword">this</span>.relatedDependencies.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 562</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
-<tr> <td class="numLine"> 563</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 564</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 548</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 566</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard toString() implementation showing the filename, actualFilePath, and filePath.</span></pre></td></tr>
-<tr> <td class="numLine"> 567</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 549</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Implementation of the equals method.</span></pre></td></tr>
+<tr> <td class="numLine"> 550</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 568</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the string representation of the file</span></pre></td></tr>
-<tr> <td class="numLine"> 569</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 552</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the objects are equal, otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 553</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 570</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 554</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
+<tr> <td class="numLineCover"> 556</td> <td class="nbHitsUncovered"><a title="Line 556: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 556: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 557</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 558</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 559</td> <td class="nbHitsUncovered"><a title="Line 559: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 559: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 560</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 561</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 562</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Dependency other = (Dependency) obj;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 563</td> <td class="nbHitsUncovered"><a title="Line 563: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 563: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.actualFilePath == <span class="keyword">null</span>) ? (other.actualFilePath != <span class="keyword">null</span>) : !<span class="keyword">this</span>.actualFilePath.equals(other.actualFilePath)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 564</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 566</td> <td class="nbHitsUncovered"><a title="Line 566: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 566: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.filePath == <span class="keyword">null</span>) ? (other.filePath != <span class="keyword">null</span>) : !<span class="keyword">this</span>.filePath.equals(other.filePath)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 567</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 568</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 569</td> <td class="nbHitsUncovered"><a title="Line 569: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 569: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.fileName == <span class="keyword">null</span>) ? (other.fileName != <span class="keyword">null</span>) : !<span class="keyword">this</span>.fileName.equals(other.fileName)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 570</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 571</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 572</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"Dependency{ fileName='"</span> + fileName + <span class="string">"', actualFilePath='"</span> + actualFilePath + <span class="string">"', filePath='"</span> + filePath + <span class="string">"'}"</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 573</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 572</td> <td class="nbHitsUncovered"><a title="Line 572: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 572: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.fileExtension == <span class="keyword">null</span>) ? (other.fileExtension != <span class="keyword">null</span>) : !<span class="keyword">this</span>.fileExtension.equals(other.fileExtension)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 573</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 574</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 575</td> <td class="nbHitsUncovered"><a title="Line 575: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 575: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.md5sum == <span class="keyword">null</span>) ? (other.md5sum != <span class="keyword">null</span>) : !<span class="keyword">this</span>.md5sum.equals(other.md5sum)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 576</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 577</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 578</td> <td class="nbHitsUncovered"><a title="Line 578: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 578: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.sha1sum == <span class="keyword">null</span>) ? (other.sha1sum != <span class="keyword">null</span>) : !<span class="keyword">this</span>.sha1sum.equals(other.sha1sum)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 579</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 580</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 581</td> <td class="nbHitsUncovered"><a title="Line 581: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 581: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.identifiers != other.identifiers && (<span class="keyword">this</span>.identifiers == <span class="keyword">null</span> || !<span class="keyword">this</span>.identifiers.equals(other.identifiers))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 582</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 583</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 584</td> <td class="nbHitsUncovered"><a title="Line 584: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 584: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.vendorEvidence != other.vendorEvidence && (<span class="keyword">this</span>.vendorEvidence == <span class="keyword">null</span> || !<span class="keyword">this</span>.vendorEvidence.equals(other.vendorEvidence))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 585</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 586</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 587</td> <td class="nbHitsUncovered"><a title="Line 587: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 587: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.productEvidence != other.productEvidence && (<span class="keyword">this</span>.productEvidence == <span class="keyword">null</span> || !<span class="keyword">this</span>.productEvidence.equals(other.productEvidence))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 588</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 589</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 590</td> <td class="nbHitsUncovered"><a title="Line 590: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 590: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.versionEvidence != other.versionEvidence && (<span class="keyword">this</span>.versionEvidence == <span class="keyword">null</span> || !<span class="keyword">this</span>.versionEvidence.equals(other.versionEvidence))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 591</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 593</td> <td class="nbHitsUncovered"><a title="Line 593: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 593: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.description == <span class="keyword">null</span>) ? (other.description != <span class="keyword">null</span>) : !<span class="keyword">this</span>.description.equals(other.description)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 594</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 595</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 596</td> <td class="nbHitsUncovered"><a title="Line 596: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 596: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.license == <span class="keyword">null</span>) ? (other.license != <span class="keyword">null</span>) : !<span class="keyword">this</span>.license.equals(other.license)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 597</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 598</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 599</td> <td class="nbHitsUncovered"><a title="Line 599: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 599: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.vulnerabilities != other.vulnerabilities && (<span class="keyword">this</span>.vulnerabilities == <span class="keyword">null</span> || !<span class="keyword">this</span>.vulnerabilities.equals(other.vulnerabilities))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 600</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 601</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 602</td> <td class="nbHitsUncovered"><a title="Line 602: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 602: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.relatedDependencies != other.relatedDependencies</a></span></pre></td></tr>
+<tr> <td class="numLine"> 603</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && (<span class="keyword">this</span>.relatedDependencies == <span class="keyword">null</span> || !<span class="keyword">this</span>.relatedDependencies.equals(other.relatedDependencies))) {</pre></td></tr>
+<tr> <td class="numLineCover"> 604</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 605</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 606</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 607</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 608</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 609</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 610</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Generates the HashCode.</span></pre></td></tr>
+<tr> <td class="numLine"> 611</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 612</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the HashCode</span></pre></td></tr>
+<tr> <td class="numLine"> 613</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 614</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 615</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 616</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">int</span> hash = 3;</pre></td></tr>
+<tr> <td class="numLineCover"> 617</td> <td class="nbHitsUncovered"><a title="Line 617: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 617: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.actualFilePath != <span class="keyword">null</span> ? <span class="keyword">this</span>.actualFilePath.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 618</td> <td class="nbHitsUncovered"><a title="Line 618: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 618: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.filePath != <span class="keyword">null</span> ? <span class="keyword">this</span>.filePath.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 619</td> <td class="nbHitsUncovered"><a title="Line 619: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 619: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.fileName != <span class="keyword">null</span> ? <span class="keyword">this</span>.fileName.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 620</td> <td class="nbHitsUncovered"><a title="Line 620: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 620: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.fileExtension != <span class="keyword">null</span> ? <span class="keyword">this</span>.fileExtension.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 621</td> <td class="nbHitsUncovered"><a title="Line 621: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 621: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.md5sum != <span class="keyword">null</span> ? <span class="keyword">this</span>.md5sum.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 622</td> <td class="nbHitsUncovered"><a title="Line 622: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 622: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.sha1sum != <span class="keyword">null</span> ? <span class="keyword">this</span>.sha1sum.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 623</td> <td class="nbHitsUncovered"><a title="Line 623: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 623: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.identifiers != <span class="keyword">null</span> ? <span class="keyword">this</span>.identifiers.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 624</td> <td class="nbHitsUncovered"><a title="Line 624: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 624: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.vendorEvidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.vendorEvidence.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 625</td> <td class="nbHitsUncovered"><a title="Line 625: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 625: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.productEvidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.productEvidence.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 626</td> <td class="nbHitsUncovered"><a title="Line 626: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 626: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.versionEvidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.versionEvidence.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 627</td> <td class="nbHitsCovered"><a title="Line 627: Conditional coverage 100% (2/2)."> 26</a></td> <td class="src"><pre class="src"> <a title="Line 627: Conditional coverage 100% (2/2)."> hash = 47 * hash + (<span class="keyword">this</span>.description != <span class="keyword">null</span> ? <span class="keyword">this</span>.description.hashCode() : 0);</a></pre></td></tr>
+<tr> <td class="numLineCover"> 628</td> <td class="nbHitsCovered"><a title="Line 628: Conditional coverage 100% (2/2)."> 26</a></td> <td class="src"><pre class="src"> <a title="Line 628: Conditional coverage 100% (2/2)."> hash = 47 * hash + (<span class="keyword">this</span>.license != <span class="keyword">null</span> ? <span class="keyword">this</span>.license.hashCode() : 0);</a></pre></td></tr>
+<tr> <td class="numLineCover"> 629</td> <td class="nbHitsUncovered"><a title="Line 629: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 629: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.vulnerabilities != <span class="keyword">null</span> ? <span class="keyword">this</span>.vulnerabilities.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 630</td> <td class="nbHitsUncovered"><a title="Line 630: Conditional coverage 50% (1/2)."> 26</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 630: Conditional coverage 50% (1/2)."> hash = 47 * hash + (<span class="keyword">this</span>.relatedDependencies != <span class="keyword">null</span> ? <span class="keyword">this</span>.relatedDependencies.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 631</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hash;</pre></td></tr>
+<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 634</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 635</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard toString() implementation showing the filename, actualFilePath, and filePath.</span></pre></td></tr>
+<tr> <td class="numLine"> 636</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 637</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the string representation of the file</span></pre></td></tr>
+<tr> <td class="numLine"> 638</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 639</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 640</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 641</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"Dependency{ fileName='"</span> + fileName + <span class="string">"', actualFilePath='"</span> + actualFilePath + <span class="string">"', filePath='"</span> + filePath + <span class="string">"'}"</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 642</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 643</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 1fb19bc33..e46677a8e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/27</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2941176470588234;</span>2.294</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Evidence.html">Evidence</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">74%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:74px"><span class="text">20/27</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">35%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:35px"><span class="text">14/40</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.2941176470588234;</span>2.294</td></tr>
</table>
<div class="separator"> </div>
@@ -65,7 +65,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 25</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> Evidence <span class="keyword">implements</span> Comparable<Evidence> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 35743</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> Evidence <span class="keyword">implements</span> Comparable<Evidence> {</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
@@ -218,8 +218,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getValue() {</pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> used = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 863</td> <td class="src"><pre class="src"> used = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 863</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
@@ -238,8 +238,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getValue(Boolean setUsed) {</pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"><a title="Line 113: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 113: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> used = used || setUsed;</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"><a title="Line 113: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 50</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 113: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> used = used || setUsed;</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 50</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
@@ -364,12 +364,12 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 3;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"><a title="Line 178: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 178: Conditional coverage 0% (0/2)."> hash = 67 * hash + (<span class="keyword">this</span>.name != <span class="keyword">null</span> ? <span class="keyword">this</span>.name.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 0% (0/2)."> hash = 67 * hash + (<span class="keyword">this</span>.source != <span class="keyword">null</span> ? <span class="keyword">this</span>.source.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"><a title="Line 180: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 180: Conditional coverage 0% (0/2)."> hash = 67 * hash + (<span class="keyword">this</span>.value != <span class="keyword">null</span> ? <span class="keyword">this</span>.value.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 0% (0/2)."> hash = 67 * hash + (<span class="keyword">this</span>.confidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.confidence.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">int</span> hash = 3;</pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"><a title="Line 178: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 178: Conditional coverage 50% (1/2)."> hash = 67 * hash + (<span class="keyword">this</span>.name != <span class="keyword">null</span> ? <span class="keyword">this</span>.name.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 50% (1/2)."> hash = 67 * hash + (<span class="keyword">this</span>.source != <span class="keyword">null</span> ? <span class="keyword">this</span>.source.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"><a title="Line 180: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 180: Conditional coverage 50% (1/2)."> hash = 67 * hash + (<span class="keyword">this</span>.value != <span class="keyword">null</span> ? <span class="keyword">this</span>.value.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 50% (1/2)."> hash = 67 * hash + (<span class="keyword">this</span>.confidence != <span class="keyword">null</span> ? <span class="keyword">this</span>.confidence.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hash;</pre></td></tr>
<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
@@ -443,29 +443,29 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(Evidence o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (source.equals(o.source)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"><a title="Line 224: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 224: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (name.equals(o.name)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"><a title="Line 225: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 225: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value.equals(o.value)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"><a title="Line 226: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 226: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (confidence.equals(o.confidence)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> 0; <span class="comment">//they are equal</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"><a title="Line 223: Conditional coverage 100% (2/2)."> 35743</a></td> <td class="src"><pre class="src"> <a title="Line 223: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (source.equals(o.source)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"><a title="Line 224: Conditional coverage 100% (2/2)."> 22863</a></td> <td class="src"><pre class="src"> <a title="Line 224: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (name.equals(o.name)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"><a title="Line 225: Conditional coverage 100% (2/2)."> 22756</a></td> <td class="src"><pre class="src"> <a title="Line 225: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (value.equals(o.value)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"><a title="Line 226: Conditional coverage 100% (2/2)."> 13850</a></td> <td class="src"><pre class="src"> <a title="Line 226: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (confidence.equals(o.confidence)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 13848</td> <td class="src"><pre class="src"> <span class="keyword">return</span> 0; <span class="comment">//they are equal</span></pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> confidence.compareTo(o.confidence);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> confidence.compareTo(o.confidence);</pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value.compareToIgnoreCase(o.value);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 8906</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value.compareToIgnoreCase(o.value);</pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> name.compareToIgnoreCase(o.name);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsCovered"> 107</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name.compareToIgnoreCase(o.name);</pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> source.compareToIgnoreCase(o.source);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsCovered"> 12880</td> <td class="src"><pre class="src"> <span class="keyword">return</span> source.compareToIgnoreCase(o.source);</pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
@@ -474,6 +474,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 83159456f..c341d6a8f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
@@ -12,12 +12,12 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/94</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$2</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$3</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$4</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$5</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">76%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">73/95</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">63%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:63px"><span class="text">37/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$2</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$3</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$4</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.EvidenceCollection.html">EvidenceCollection$5</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.782608695652174;</span>2.783</td></tr>
</table>
<div class="separator"> </div>
@@ -105,570 +105,577 @@
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over highest confidence evidence contained in the collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> HIGHEST_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(EvidenceCollection.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"><a title="Line 46: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 46: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.HIGHEST;</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over highest confidence evidence contained in the collection.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> };</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 73</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> HIGHEST_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over high confidence evidence contained in the collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"><a title="Line 50: Conditional coverage 100% (2/2)."> 73</a></td> <td class="src"><pre class="src"> <a title="Line 50: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.HIGHEST;</a></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> HIGH_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> };</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"><a title="Line 54: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 54: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.HIGH;</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over high confidence evidence contained in the collection.</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> };</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 63</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> HIGH_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over medium confidence evidence contained in the collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"><a title="Line 58: Conditional coverage 100% (2/2)."> 63</a></td> <td class="src"><pre class="src"> <a title="Line 58: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.HIGH;</a></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> MEDIUM_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> };</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"><a title="Line 62: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 62: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.MEDIUM;</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over medium confidence evidence contained in the collection.</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> };</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> MEDIUM_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over low confidence evidence contained in the collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"><a title="Line 66: Conditional coverage 100% (2/2)."> 73</a></td> <td class="src"><pre class="src"> <a title="Line 66: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.MEDIUM;</a></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> LOW_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> };</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"><a title="Line 70: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 70: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.LOW;</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over low confidence evidence contained in the collection.</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> };</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> LOW_CONFIDENCE = <span class="keyword">new</span> Filter<Evidence>() {</pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over evidence that has was used (aka read) from the collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> EVIDENCE_USED = <span class="keyword">new</span> Filter<Evidence>() {</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> evidence.isUsed();</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"><a title="Line 74: Conditional coverage 100% (2/2)."> 122</a></td> <td class="src"><pre class="src"> <a title="Line 74: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> evidence.getConfidence() == Confidence.LOW;</a></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> };</pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over evidence that has was used (aka read) from the collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Filter<Evidence> EVIDENCE_USED = <span class="keyword">new</span> Filter<Evidence>() {</pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> passes(Evidence evidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 995</td> <td class="src"><pre class="src"> <span class="keyword">return</span> evidence.isUsed();</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over evidence of the specified confidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param confidence the confidence level for the evidence to be iterated over.</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return Iterable<Evidence> an iterable collection of evidence</span></pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> Iterable<Evidence> iterator(Confidence confidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"><a title="Line 89: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 89: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (confidence == Confidence.HIGHEST) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EvidenceCollection.HIGHEST_CONFIDENCE.filter(<span class="keyword">this</span>.list);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"><a title="Line 91: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 91: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (confidence == Confidence.HIGH) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EvidenceCollection.HIGH_CONFIDENCE.filter(<span class="keyword">this</span>.list);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"><a title="Line 93: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 93: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (confidence == Confidence.MEDIUM) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EvidenceCollection.MEDIUM_CONFIDENCE.filter(<span class="keyword">this</span>.list);</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> EvidenceCollection.LOW_CONFIDENCE.filter(<span class="keyword">this</span>.list);</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> };</pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of evidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to iterate over evidence of the specified confidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param confidence the confidence level for the evidence to be iterated over.</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return Iterable<Evidence> an iterable collection of evidence</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> Iterable<Evidence> iterator(Confidence confidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"><a title="Line 93: Conditional coverage 100% (2/2)."> 44</a></td> <td class="src"><pre class="src"> <a title="Line 93: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (confidence == Confidence.HIGHEST) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EvidenceCollection.HIGHEST_CONFIDENCE.filter(<span class="keyword">this</span>.list);</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"><a title="Line 95: Conditional coverage 100% (2/2)."> 34</a></td> <td class="src"><pre class="src"> <a title="Line 95: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (confidence == Confidence.HIGH) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EvidenceCollection.HIGH_CONFIDENCE.filter(<span class="keyword">this</span>.list);</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"><a title="Line 97: Conditional coverage 100% (2/2)."> 24</a></td> <td class="src"><pre class="src"> <a title="Line 97: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (confidence == Confidence.MEDIUM) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EvidenceCollection.MEDIUM_CONFIDENCE.filter(<span class="keyword">this</span>.list);</pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">return</span> EvidenceCollection.LOW_CONFIDENCE.filter(<span class="keyword">this</span>.list);</pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Set<Evidence> list;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * A collection of strings used to adjust Lucene's term weighting.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Set<String> weightedStrings;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Set<Evidence> list;</pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * A collection of strings used to adjust Lucene's term weighting.</span></pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates a new EvidenceCollection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> EvidenceCollection() {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> list = <span class="keyword">new</span> TreeSet<Evidence>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> weightedStrings = <span class="keyword">new</span> HashSet<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Set<String> weightedStrings;</pre></td></tr>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Adds evidence to the collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates a new EvidenceCollection.</span></pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 115</td> <td class="src"><pre class="src"> <span class="keyword">public</span> EvidenceCollection() {</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 115</td> <td class="src"><pre class="src"> list = <span class="keyword">new</span> TreeSet<Evidence>();</pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 115</td> <td class="src"><pre class="src"> weightedStrings = <span class="keyword">new</span> HashSet<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 115</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param e Evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addEvidence(Evidence e) {</pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> list.add(e);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds evidence to the collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param e Evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates an Evidence object from the parameters and adds the resulting object to the collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addEvidence(Evidence e) {</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 13904</td> <td class="src"><pre class="src"> list.add(e);</pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"> 13904</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param source the source of the Evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param name the name of the Evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param value the value of the Evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates an Evidence object from the parameters and adds the resulting object to the collection.</span></pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param confidence the confidence of the Evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param source the source of the Evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addEvidence(String source, String name, String value, Confidence confidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Evidence e = <span class="keyword">new</span> Evidence(source, name, value, confidence);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addEvidence(e);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param name the name of the Evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param value the value of the Evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param confidence the confidence of the Evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Adds term to the weighting collection. The terms added here are used later to boost the score of other terms.</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This is a way of combining evidence from multiple sources to boost the confidence of the given evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addEvidence(String source, String name, String value, Confidence confidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 13897</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Evidence e = <span class="keyword">new</span> Evidence(source, name, value, confidence);</pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsCovered"> 13897</td> <td class="src"><pre class="src"> addEvidence(e);</pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsCovered"> 13897</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Example: The term 'Apache' is found in the manifest of a JAR and is added to the Collection. When we parse the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * package names within the JAR file we may add these package names to the "weighted" strings collection to boost</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds term to the weighting collection. The terms added here are used later to boost the score of other terms.</span></pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the score in the Lucene query. That way when we construct the Lucene query we find the term Apache in the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * This is a way of combining evidence from multiple sources to boost the confidence of the given evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * collection AND in the weighted strings; as such, we will boost the confidence of the term Apache.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Example: The term 'Apache' is found in the manifest of a JAR and is added to the Collection. When we parse the</span></pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param str to add to the weighting collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * package names within the JAR file we may add these package names to the "weighted" strings collection to boost</span></pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the score in the Lucene query. That way when we construct the Lucene query we find the term Apache in the</span></pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addWeighting(String str) {</pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> weightedStrings.add(str);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * collection AND in the weighted strings; as such, we will boost the confidence of the term Apache.</span></pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param str to add to the weighting collection.</span></pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a set of Weightings - a list of terms that are believed to be of higher confidence when also found in</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * another location.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addWeighting(String str) {</pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> weightedStrings.add(str);</pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return Set<String></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a set of Weightings - a list of terms that are believed to be of higher confidence when also found in</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getWeighting() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * another location.</span></pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> weightedStrings;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return Set<String></span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<String> getWeighting() {</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the set of evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> weightedStrings;</pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the set of evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Evidence> getEvidence() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the set of evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> list;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the set of evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Evidence> getEvidence() {</pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the set of evidence from a given source.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> list;</pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param source the source of the evidence</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the set of evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the set of evidence from a given source.</span></pre></td></tr>
<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Evidence> getEvidence(String source) {</pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (source == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Evidence> ret = <span class="keyword">new</span> HashSet<Evidence>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"><a title="Line 183: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 183: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : list) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"><a title="Line 184: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 184: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (source.equals(e.getSource())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.add(e);</span></pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the set of evidence from a given source and name.</span></pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param source the source of the evidence</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param name the name of the evidence to return</span></pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the set of evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Evidence> getEvidence(String source) {</pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"><a title="Line 183: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 183: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (source == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Evidence> ret = <span class="keyword">new</span> HashSet<Evidence>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"><a title="Line 187: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 187: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : list) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"><a title="Line 188: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 188: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (source.equals(e.getSource())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.add(e);</span></pre></td></tr>
+<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the set of evidence from a given source and name.</span></pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Evidence> getEvidence(String source, String name) {</pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"><a title="Line 199: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 199: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (source == <span class="keyword">null</span> || name == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param source the source of the evidence</span></pre></td></tr>
+<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param name the name of the evidence to return</span></pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the set of evidence.</span></pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Set<Evidence> getEvidence(String source, String name) {</pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"><a title="Line 203: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 203: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (source == <span class="keyword">null</span> || name == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Set<Evidence> ret = <span class="keyword">new</span> HashSet<Evidence>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"><a title="Line 203: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 203: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : list) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"><a title="Line 204: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 204: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (source.equals(e.getSource()) && name.equals(e.getName())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.add(e);</span></pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Set<Evidence> ret = <span class="keyword">new</span> HashSet<Evidence>();</pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"><a title="Line 207: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 207: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Evidence e : list) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"><a title="Line 208: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 208: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (source.equals(e.getSource()) && name.equals(e.getName())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> ret.add(e);</pre></td></tr>
<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Implements the iterator interface for the Evidence Collection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ret;</pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an Iterator<Evidence>.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Iterator<Evidence> iterator() {</pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> list.iterator();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Implements the iterator interface for the Evidence Collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an Iterator<Evidence>.</span></pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to determine if a given string was used (aka read).</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Iterator<Evidence> iterator() {</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 117</td> <td class="src"><pre class="src"> <span class="keyword">return</span> list.iterator();</pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param text the string to search for.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the string was used.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to determine if a given string was used (aka read).</span></pre></td></tr>
<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> containsUsedString(String text) {</pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"><a title="Line 227: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 227: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String textToTest = text.toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"><a title="Line 232: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 232: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(<span class="keyword">this</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//TODO consider changing the regex to only compare alpha-numeric (i.e. strip everything else)</span></pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String value = urlCorrection(e.getValue().toLowerCase()).replaceAll(<span class="string">"[\\s_-]"</span>, <span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"><a title="Line 235: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 235: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value.contains(textToTest)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Used to determine if a given version was used (aka read) from the EvidenceCollection.</span></pre></td></tr>
-<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param version the version to search for within the collected evidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param text the string to search for.</span></pre></td></tr>
+<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return whether or not the string was used.</span></pre></td></tr>
+<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> containsUsedString(String text) {</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 50% (1/2)."> 112</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 112</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String textToTest = text.toLowerCase();</pre></td></tr>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"><a title="Line 236: Conditional coverage 100% (2/2)."> 112</a></td> <td class="src"><pre class="src"> <a title="Line 236: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(<span class="keyword">this</span>)) {</a></pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//TODO consider changing the regex to only compare alpha-numeric (i.e. strip everything else)</span></pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsCovered"> 754</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String value = urlCorrection(e.getValue().toLowerCase()).replaceAll(<span class="string">"[\\s_-]"</span>, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"><a title="Line 239: Conditional coverage 100% (2/2)."> 754</a></td> <td class="src"><pre class="src"> <a title="Line 239: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (value.contains(textToTest)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 710</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"> 68</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Used to determine if a given version was used (aka read) from the EvidenceCollection.</span></pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> containsUsedVersion(DependencyVersion version) {</pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"><a title="Line 249: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 249: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param version the version to search for within the collected evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the string was used.</span></pre></td></tr>
<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> containsUsedVersion(DependencyVersion version) {</pre></td></tr>
+<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"><a title="Line 253: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 253: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"><a title="Line 253: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 253: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(<span class="keyword">this</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion value = DependencyVersionUtil.parseVersion(e.getValue());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"><a title="Line 255: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 255: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (value != <span class="keyword">null</span> && value.matchesAtLeastThreeLevels(version)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"><a title="Line 257: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 257: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(<span class="keyword">this</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion value = DependencyVersionUtil.parseVersion(e.getValue());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"><a title="Line 259: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 259: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (value != <span class="keyword">null</span> && value.matchesAtLeastThreeLevels(version)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns whether or not the collection contains evidence of a specified Confidence.</span></pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param confidence A Confidence value.</span></pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return boolean.</span></pre></td></tr>
-<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> contains(Confidence confidence) {</pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"><a title="Line 269: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 269: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : list) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"><a title="Line 270: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 270: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (e.getConfidence().equals(confidence)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns whether or not the collection contains evidence of a specified Confidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param confidence A Confidence value.</span></pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return boolean.</span></pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> contains(Confidence confidence) {</pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"><a title="Line 273: Conditional coverage 100% (2/2)."> 24</a></td> <td class="src"><pre class="src"> <a title="Line 273: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Evidence e : list) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"><a title="Line 274: Conditional coverage 100% (2/2)."> 114</a></td> <td class="src"><pre class="src"> <a title="Line 274: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (e.getConfidence().equals(confidence)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Merges multiple EvidenceCollections together, only merging evidence that was used, into a new EvidenceCollection.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsCovered"> 93</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ec One or more EvidenceCollections.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a new EvidenceCollection containing the used evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Merges multiple EvidenceCollections together, only merging evidence that was used, into a new EvidenceCollection.</span></pre></td></tr>
<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> EvidenceCollection mergeUsed(EvidenceCollection... ec) {</pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EvidenceCollection ret = <span class="keyword">new</span> EvidenceCollection();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"><a title="Line 285: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 285: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (EvidenceCollection col : ec) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"><a title="Line 286: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 286: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : col.list) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"><a title="Line 287: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 287: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (e.isUsed()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.addEvidence(e);</span></pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Merges multiple EvidenceCollections together.</span></pre></td></tr>
-<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param ec One or more EvidenceCollections.</span></pre></td></tr>
-<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a new EvidenceCollection.</span></pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a new EvidenceCollection containing the used evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> EvidenceCollection merge(EvidenceCollection... ec) {</pre></td></tr>
-<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EvidenceCollection ret = <span class="keyword">new</span> EvidenceCollection();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 303</td> <td class="nbHitsUncovered"><a title="Line 303: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 303: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (EvidenceCollection col : ec) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.list.addAll(col.list);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret.weightedStrings.addAll(col.weightedStrings);</span></pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> EvidenceCollection mergeUsed(EvidenceCollection... ec) {</pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> EvidenceCollection ret = <span class="keyword">new</span> EvidenceCollection();</pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsCovered"><a title="Line 289: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 289: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (EvidenceCollection col : ec) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsCovered"><a title="Line 290: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 290: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Evidence e : col.list) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"><a title="Line 291: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 291: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (e.isUsed()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ret.addEvidence(e);</pre></td></tr>
+<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 307</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
-<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ret;</pre></td></tr>
+<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Merges multiple EvidenceCollections together.</span></pre></td></tr>
+<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ec One or more EvidenceCollections.</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a new EvidenceCollection.</span></pre></td></tr>
+<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> EvidenceCollection merge(EvidenceCollection... ec) {</pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> EvidenceCollection ret = <span class="keyword">new</span> EvidenceCollection();</pre></td></tr>
+<tr> <td class="numLineCover"> 307</td> <td class="nbHitsCovered"><a title="Line 307: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 307: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (EvidenceCollection col : ec) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> ret.list.addAll(col.list);</pre></td></tr>
+<tr> <td class="numLineCover"> 309</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> ret.weightedStrings.addAll(col.weightedStrings);</pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a string of evidence 'values'.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 311</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ret;</pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a string containing the evidence.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a string of evidence 'values'.</span></pre></td></tr>
<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 317</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 318</td> <td class="nbHitsUncovered"><a title="Line 318: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 318: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (Evidence e : <span class="keyword">this</span>.list) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 319</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(e.getValue()).append(<span class="string">' '</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 321</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> sb.toString();</span></pre></td></tr>
-<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the number of elements in the EvidenceCollection.</span></pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the number of elements in the collection.</span></pre></td></tr>
-<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a string containing the evidence.</span></pre></td></tr>
+<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> size() {</pre></td></tr>
-<tr> <td class="numLineCover"> 330</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> list.size();</span></pre></td></tr>
-<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder();</pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsCovered"><a title="Line 322: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 322: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Evidence e : <span class="keyword">this</span>.list) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> sb.append(e.getValue()).append(<span class="string">' '</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 324</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> sb.toString();</pre></td></tr>
+<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Takes a string that may contain a fully qualified domain and it will return the string having removed the query</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * string, the protocol, the sub-domain of 'www', and the file extension of the path.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This is useful for checking if the evidence contains a specific string. The presence of the protocol, file</span></pre></td></tr>
-<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * extension, etc. may produce false positives.</span></pre></td></tr>
-<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the number of elements in the EvidenceCollection.</span></pre></td></tr>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the number of elements in the collection.</span></pre></td></tr>
+<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> size() {</pre></td></tr>
+<tr> <td class="numLineCover"> 334</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> <span class="keyword">return</span> list.size();</pre></td></tr>
+<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Takes a string that may contain a fully qualified domain and it will return the string having removed the query</span></pre></td></tr>
+<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * string, the protocol, the sub-domain of 'www', and the file extension of the path.</p></span></pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Example, given the following input:</p></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * This is useful for checking if the evidence contains a specific string. The presence of the protocol, file</span></pre></td></tr>
<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <code>'Please visit https://www.somedomain.com/path1/path2/file.php?id=439'</code></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * extension, etc. may produce false positives.</span></pre></td></tr>
<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The function would return:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <code>'Please visit somedomain path1 path2 file'</code></span></pre></td></tr>
-<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Example, given the following input:</p></span></pre></td></tr>
+<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <code>'Please visit https://www.somedomain.com/path1/path2/file.php?id=439'</code></span></pre></td></tr>
<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param value the value that may contain a url</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the modified string</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The function would return:</p></span></pre></td></tr>
<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <code>'Please visit somedomain path1 path2 file'</code></span></pre></td></tr>
<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String urlCorrection(String value) {</pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"><a title="Line 352: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 352: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (value == <span class="keyword">null</span> || !UrlStringUtils.containsUrl(value)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 353</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param value the value that may contain a url</span></pre></td></tr>
+<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the modified string</span></pre></td></tr>
<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String urlCorrection(String value) {</pre></td></tr>
+<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"><a title="Line 356: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 754</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 356: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (value == <span class="keyword">null</span> || !UrlStringUtils.containsUrl(value)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 357</td> <td class="nbHitsCovered"> 749</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 355</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(value.length());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] parts = value.split(<span class="string">"\\s"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"><a title="Line 357: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 357: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String part : parts) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"><a title="Line 358: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 358: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (UrlStringUtils.isUrl(part)) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder(value.length());</pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] parts = value.split(<span class="string">"\\s"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 361</td> <td class="nbHitsCovered"><a title="Line 361: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 361: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String part : parts) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 362</td> <td class="nbHitsUncovered"><a title="Line 362: Conditional coverage 50% (1/2)."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 362: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (UrlStringUtils.isUrl(part)) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 360</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> data = UrlStringUtils.extractImportantUrlData(part);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">' '</span>).append(StringUtils.join(data, <span class="string">' '</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 362</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 363</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(EvidenceCollection.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"error parsing "</span> + part, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 364</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">' '</span>).append(part);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 365</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 364</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> data = UrlStringUtils.extractImportantUrlData(part);</pre></td></tr>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> sb.append(<span class="string">' '</span>).append(StringUtils.join(data, <span class="string">' '</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 367</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"error parsing "</span> + part, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">' '</span>).append(part);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 367</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">' '</span>).append(part);</span></pre></td></tr>
-<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> sb.toString().trim();</span></pre></td></tr>
-<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 371</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">' '</span>).append(part);</span></pre></td></tr>
<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> sb.toString().trim();</pre></td></tr>
+<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 e417ac949..5c1d7700d 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/22</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Identifier.html">Identifier</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">31%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:31px"><span class="text">7/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">13%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:13px"><span class="text">3/22</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.875;</span>1.875</td></tr>
</table>
<div class="separator"> </div>
@@ -63,7 +63,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 24</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> Identifier <span class="keyword">implements</span> Comparable<Identifier> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 24</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> Identifier <span class="keyword">implements</span> Comparable<Identifier> {</pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
@@ -373,10 +373,10 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 5;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"><a title="Line 187: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 187: Conditional coverage 0% (0/2)."> hash = 53 * hash + (<span class="keyword">this</span>.value != <span class="keyword">null</span> ? <span class="keyword">this</span>.value.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"><a title="Line 188: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 188: Conditional coverage 0% (0/2)."> hash = 53 * hash + (<span class="keyword">this</span>.type != <span class="keyword">null</span> ? <span class="keyword">this</span>.type.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">int</span> hash = 5;</pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"><a title="Line 187: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 187: Conditional coverage 50% (1/2)."> hash = 53 * hash + (<span class="keyword">this</span>.value != <span class="keyword">null</span> ? <span class="keyword">this</span>.value.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"><a title="Line 188: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 188: Conditional coverage 50% (1/2)."> hash = 53 * hash + (<span class="keyword">this</span>.type != <span class="keyword">null</span> ? <span class="keyword">this</span>.type.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hash;</pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
@@ -414,17 +414,17 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(Identifier o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (o == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 50% (1/2)."> 22</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (o == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> -1;</span></pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">this</span>.value.compareTo(o.value);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.value.compareTo(o.value);</pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 8666bbef1..53e01a713 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4444444444444446;</span>3.444</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Reference.html">Reference</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">7/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">14%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:14px"><span class="text">5/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4444444444444446;</span>3.444</td></tr>
</table>
<div class="separator"> </div>
@@ -69,7 +69,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 27</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> Reference <span class="keyword">implements</span> Serializable, Comparable<Reference> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 27</td> <td class="nbHitsCovered"> 276</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> Reference <span class="keyword">implements</span> Serializable, Comparable<Reference> {</pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
@@ -271,10 +271,10 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(Reference o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"><a title="Line 137: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 137: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (source.equals(o.source)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"><a title="Line 138: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 138: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (name.equals(o.name)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"><a title="Line 139: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 139: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (url.equals(o.url)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> 0; <span class="comment">//they are equal</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"><a title="Line 137: Conditional coverage 100% (2/2)."> 276</a></td> <td class="src"><pre class="src"> <a title="Line 137: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (source.equals(o.source)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"><a title="Line 138: Conditional coverage 100% (2/2)."> 83</a></td> <td class="src"><pre class="src"> <a title="Line 138: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (name.equals(o.name)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"><a title="Line 139: Conditional coverage 50% (1/2)."> 29</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 139: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (url.equals(o.url)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> <span class="keyword">return</span> 0; <span class="comment">//they are equal</span></pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> url.compareTo(o.url);</span></pre></td></tr>
@@ -282,12 +282,12 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> name.compareTo(o.name);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name.compareTo(o.name);</pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> source.compareTo(o.source);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 193</td> <td class="src"><pre class="src"> <span class="keyword">return</span> source.compareTo(o.source);</pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
@@ -296,6 +296,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 4d7dfe202..bdd5cd760 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/36</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/18</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.2777777777777777;</span>1.278</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.Vulnerability.html">Vulnerability</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">69%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:69px"><span class="text">25/36</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">22%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:22px"><span class="text">4/18</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.2777777777777777;</span>1.278</td></tr>
</table>
<div class="separator"> </div>
@@ -75,7 +75,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 30</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> Vulnerability <span class="keyword">implements</span> Serializable, Comparable<Vulnerability> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 31</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> Vulnerability <span class="keyword">implements</span> Serializable, Comparable<Vulnerability> {</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
@@ -180,7 +180,7 @@
<td class="src"><pre class="src"> <span class="comment"> * References for this vulnerability.</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> SortedSet<Reference> references = <span class="keyword">new</span> TreeSet<Reference>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 31</td> <td class="src"><pre class="src"> <span class="keyword">private</span> SortedSet<Reference> references = <span class="keyword">new</span> TreeSet<Reference>();</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
@@ -231,8 +231,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addReference(Reference ref) {</pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.references.add(ref);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.references.add(ref);</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 90</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
@@ -251,19 +251,19 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addReference(String referenceSource, String referenceName, String referenceUrl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Reference ref = <span class="keyword">new</span> Reference();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ref.setSource(referenceSource);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ref.setName(referenceName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ref.setUrl(referenceUrl);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.references.add(ref);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Reference ref = <span class="keyword">new</span> Reference();</pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> ref.setSource(referenceSource);</pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> ref.setName(referenceName);</pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> ref.setUrl(referenceUrl);</pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.references.add(ref);</pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * A set of vulnerable software.</span></pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> SortedSet<VulnerableSoftware> vulnerableSoftware = <span class="keyword">new</span> TreeSet<VulnerableSoftware>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 31</td> <td class="src"><pre class="src"> <span class="keyword">private</span> SortedSet<VulnerableSoftware> vulnerableSoftware = <span class="keyword">new</span> TreeSet<VulnerableSoftware>();</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
@@ -316,7 +316,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> addVulnerableSoftware(String cpe) {</pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> addVulnerableSoftware(cpe, <span class="keyword">null</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 666</td> <td class="src"><pre class="src"> <span class="keyword">return</span> addVulnerableSoftware(cpe, <span class="keyword">null</span>);</pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
@@ -337,13 +337,13 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> addVulnerableSoftware(String cpe, String previousVersion) {</pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VulnerableSoftware vs = <span class="keyword">new</span> VulnerableSoftware();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vs.setCpe(cpe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"><a title="Line 169: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 169: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (previousVersion != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vs.setPreviousVersion(previousVersion);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 668</td> <td class="src"><pre class="src"> <span class="keyword">final</span> VulnerableSoftware vs = <span class="keyword">new</span> VulnerableSoftware();</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 668</td> <td class="src"><pre class="src"> vs.setCpe(cpe);</pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"><a title="Line 169: Conditional coverage 100% (2/2)."> 668</a></td> <td class="src"><pre class="src"> <a title="Line 169: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (previousVersion != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> vs.setPreviousVersion(previousVersion);</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> updateVulnerableSoftware(vs);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"> 668</td> <td class="src"><pre class="src"> <span class="keyword">return</span> updateVulnerableSoftware(vs);</pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
@@ -362,11 +362,11 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> updateVulnerableSoftware(VulnerableSoftware vulnSoftware) {</pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"><a title="Line 182: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 182: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (vulnerableSoftware.contains(vulnSoftware)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"><a title="Line 182: Conditional coverage 50% (1/2)."> 668</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 182: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (vulnerableSoftware.contains(vulnSoftware)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> vulnerableSoftware.remove(vulnSoftware);</span></pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> vulnerableSoftware.add(vulnSoftware);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 668</td> <td class="src"><pre class="src"> <span class="keyword">return</span> vulnerableSoftware.add(vulnSoftware);</pre></td></tr>
<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
@@ -749,9 +749,9 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 381</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 5;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 382</td> <td class="nbHitsUncovered"><a title="Line 382: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 382: Conditional coverage 0% (0/2)."> hash = 41 * hash + (<span class="keyword">this</span>.name != <span class="keyword">null</span> ? <span class="keyword">this</span>.name.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 383</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 381</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">int</span> hash = 5;</pre></td></tr>
+<tr> <td class="numLineCover"> 382</td> <td class="nbHitsUncovered"><a title="Line 382: Conditional coverage 50% (1/2)."> 3</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 382: Conditional coverage 50% (1/2)."> hash = 41 * hash + (<span class="keyword">this</span>.name != <span class="keyword">null</span> ? <span class="keyword">this</span>.name.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hash;</pre></td></tr>
<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
@@ -811,9 +811,9 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setMatchedCPE(String cpeId, String previous) {</pre></td></tr>
-<tr> <td class="numLineCover"> 414</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> matchedCPE = cpeId;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> matchedAllPreviousCPE = previous;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 416</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 414</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> matchedCPE = cpeId;</pre></td></tr>
+<tr> <td class="numLineCover"> 415</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> matchedAllPreviousCPE = previous;</pre></td></tr>
+<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
@@ -871,6 +871,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 9ad0f90f6..e2ac63dca 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerabilityComparator.html">VulnerabilityComparator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator"> </div>
@@ -71,7 +71,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 28</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> VulnerabilityComparator <span class="keyword">implements</span> Comparator<Vulnerability>, Serializable {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 28</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> VulnerabilityComparator <span class="keyword">implements</span> Comparator<Vulnerability>, Serializable {</pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
@@ -100,13 +100,13 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compare(Vulnerability o1, Vulnerability o2) {</pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> o2.getName().compareTo(o1.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> o2.getName().compareTo(o1.getName());</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 075419c93..188cdecaa 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/74</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/72</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2777777777777777;</span>3.278</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.dependency.VulnerableSoftware.html">VulnerableSoftware</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">78%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">59/75</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">72%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:72px"><span class="text">52/72</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.2777777777777777;</span>3.278</td></tr>
</table>
<div class="separator"> </div>
@@ -79,552 +79,559 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 32</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> VulnerableSoftware <span class="keyword">extends</span> IndexEntry <span class="keyword">implements</span> Serializable, Comparable<VulnerableSoftware> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 7937</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> VulnerableSoftware <span class="keyword">extends</span> IndexEntry <span class="keyword">implements</span> Serializable, Comparable<VulnerableSoftware> {</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The serial version UID.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">long</span> serialVersionUID = 307319490326651052L;</pre></td></tr>
+<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(VulnerableSoftware.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The serial version UID.</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Parse a CPE entry from the cpe string representation.</span></pre></td></tr>
-<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cpe a cpe entry (e.g. cpe:/a:vendor:software:version)</span></pre></td></tr>
-<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCpe(String cpe) {</pre></td></tr>
-<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> parseName(cpe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Character encoding is unsupported for CPE '%s'."</span>, cpe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(VulnerableSoftware.<span class="keyword">class</span>.getName()).log(Level.WARNING, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(VulnerableSoftware.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> setName(cpe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">long</span> serialVersionUID = 307319490326651052L;</pre></td></tr>
+<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Parses a name attribute value, from the cpe.xml, into its corresponding parts: vendor, product, version,</span></pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * revision.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Example:</p></span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <code> cpe:/a:apache:struts:1.1:rc2</code></span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Parse a CPE entry from the cpe string representation.</span></pre></td></tr>
+<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cpe a cpe entry (e.g. cpe:/a:vendor:software:version)</span></pre></td></tr>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setCpe(String cpe) {</pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 736</td> <td class="src"><pre class="src"> parseName(cpe);</pre></td></tr>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Character encoding is unsupported for CPE '%s'."</span>, cpe);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.WARNING, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> setName(cpe);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 736</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"> 736</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Parses a name attribute value, from the cpe.xml, into its corresponding parts: vendor, product, version,</span></pre></td></tr>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * revision.</p></span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Results in:</p> <ul> <li>Vendor: apache</li> <li>Product: struts</li></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Example:</p></span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <li>Version: 1.1</li> <li>Revision: rc2</li> </ul></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <code> cpe:/a:apache:struts:1.1:rc2</code></span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cpeName the cpe name</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws UnsupportedEncodingException should never be thrown...</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Results in:</p> <ul> <li>Vendor: apache</li> <li>Product: struts</li></span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <li>Version: 1.1</li> <li>Revision: rc2</li> </ul></span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> parseName(String cpeName) <span class="keyword">throws</span> UnsupportedEncodingException {</pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.name = cpeName;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"><a title="Line 73: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 73: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (cpeName != <span class="keyword">null</span> && cpeName.length() > 7) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] data = cpeName.substring(7).split(<span class="string">":"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"><a title="Line 75: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 75: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (data.length >= 1) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.setVendor(URLDecoder.decode(data[0].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>));</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"><a title="Line 78: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 78: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (data.length >= 2) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.setProduct(URLDecoder.decode(data[1].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>));</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"><a title="Line 81: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 81: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (data.length >= 3) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> version = URLDecoder.decode(data[2].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"><a title="Line 84: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 84: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (data.length >= 4) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> revision = URLDecoder.decode(data[3].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (data.length >= 5) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> edition = URLDecoder.decode(data[4].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * If present, indicates that previous version are vulnerable.</span></pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cpeName the cpe name</span></pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws UnsupportedEncodingException should never be thrown...</span></pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String previousVersion;</pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Indicates if previous versions of this software are vulnerable.</span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return if previous versions of this software are vulnerable</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasPreviousVersion() {</pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> previousVersion != <span class="keyword">null</span>;</a></span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of previousVersion.</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of previousVersion</span></pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getPreviousVersion() {</pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> previousVersion;</pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of previousVersion.</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param previousVersion new value of previousVersion</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPreviousVersion(String previousVersion) {</pre></td></tr>
-<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.previousVersion = previousVersion;</pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard equals implementation to compare this VulnerableSoftware to another object.</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the objects are equal</span></pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> parseName(String cpeName) <span class="keyword">throws</span> UnsupportedEncodingException {</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 760</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.name = cpeName;</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"><a title="Line 77: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 760</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 77: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (cpeName != <span class="keyword">null</span> && cpeName.length() > 7) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 760</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] data = cpeName.substring(7).split(<span class="string">":"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"><a title="Line 79: Conditional coverage 50% (1/2)."> 760</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 79: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (data.length >= 1) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 760</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.setVendor(URLDecoder.decode(data[0].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>));</pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"><a title="Line 82: Conditional coverage 50% (1/2)."> 760</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 82: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (data.length >= 2) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 760</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.setProduct(URLDecoder.decode(data[1].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>));</pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"><a title="Line 85: Conditional coverage 50% (1/2)."> 760</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 85: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (data.length >= 3) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 760</td> <td class="src"><pre class="src"> version = URLDecoder.decode(data[2].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"><a title="Line 88: Conditional coverage 100% (2/2)."> 760</a></td> <td class="src"><pre class="src"> <a title="Line 88: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (data.length >= 4) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> revision = URLDecoder.decode(data[3].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"><a title="Line 91: Conditional coverage 50% (1/2)."> 760</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 91: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (data.length >= 5) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> edition = URLDecoder.decode(data[4].replace(<span class="string">"+"</span>, <span class="string">"%2B"</span>), <span class="string">"UTF-8"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 760</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * If present, indicates that previous version are vulnerable.</span></pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String previousVersion;</pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Indicates if previous versions of this software are vulnerable.</span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return if previous versions of this software are vulnerable</span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasPreviousVersion() {</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> previousVersion != <span class="keyword">null</span>;</a></span></pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of previousVersion.</span></pre></td></tr>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of previousVersion</span></pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getPreviousVersion() {</pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> previousVersion;</pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of previousVersion.</span></pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param previousVersion new value of previousVersion</span></pre></td></tr>
+<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPreviousVersion(String previousVersion) {</pre></td></tr>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.previousVersion = previousVersion;</pre></td></tr>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard equals implementation to compare this VulnerableSoftware to another object.</span></pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"><a title="Line 132: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 132: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param obj the object to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return whether or not the objects are equal</span></pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"><a title="Line 136: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 136: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"><a title="Line 135: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 135: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VulnerableSoftware other = (VulnerableSoftware) obj;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"><a title="Line 139: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 139: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.getName() == <span class="keyword">null</span>) ? (other.getName() != <span class="keyword">null</span>) : !<span class="keyword">this</span>.getName().equals(other.getName())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"><a title="Line 139: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 139: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> VulnerableSoftware other = (VulnerableSoftware) obj;</pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"><a title="Line 143: Conditional coverage 33% (2/6) [each condition: 50%, 0%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 143: Conditional coverage 33% (2/6) [each condition: 50%, 0%, 50%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.getName() == <span class="keyword">null</span>) ? (other.getName() != <span class="keyword">null</span>) : !<span class="keyword">this</span>.getName().equals(other.getName())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 144</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of hashCode.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the hashCode for the object</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard implementation of hashCode.</span></pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 7;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"><a title="Line 153: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 153: Conditional coverage 0% (0/2)."> hash = 83 * hash + (<span class="keyword">this</span>.getName() != <span class="keyword">null</span> ? <span class="keyword">this</span>.getName().hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the hashCode for the object</span></pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Standard toString() implementation display the name and whether or not previous versions are also affected.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 63</td> <td class="src"><pre class="src"> <span class="keyword">int</span> hash = 7;</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"><a title="Line 157: Conditional coverage 50% (1/2)."> 63</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 157: Conditional coverage 50% (1/2)."> hash = 83 * hash + (<span class="keyword">this</span>.getName() != <span class="keyword">null</span> ? <span class="keyword">this</span>.getName().hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 63</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hash;</pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a string representation of the object</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Standard toString() implementation display the name and whether or not previous versions are also affected.</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"VulnerableSoftware{ name="</span> + name + <span class="string">", previousVersion="</span> + previousVersion + <span class="string">'}'</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a string representation of the object</span></pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Implementation of the comparable interface.</span></pre></td></tr>
-<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param vs the VulnerableSoftware to compare</span></pre></td></tr>
-<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an integer indicating the ordering of the two objects</span></pre></td></tr>
-<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="string">"VulnerableSoftware{ name="</span> + name + <span class="string">", previousVersion="</span> + previousVersion + <span class="string">'}'</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Implementation of the comparable interface.</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param vs the VulnerableSoftware to compare</span></pre></td></tr>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an integer indicating the ordering of the two objects</span></pre></td></tr>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(VulnerableSoftware vs) {</pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> result = 0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] left = <span class="keyword">this</span>.getName().split(<span class="string">":"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] right = vs.getName().split(<span class="string">":"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"><a title="Line 178: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 178: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">int</span> max = (left.length <= right.length) ? left.length : right.length;</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (max > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"><a title="Line 180: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 180: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; result == 0 && i < max; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] subLeft = left[i].split(<span class="string">"\\."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] subRight = right[i].split(<span class="string">"\\."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"><a title="Line 183: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 183: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">int</span> subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"><a title="Line 184: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 184: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (subMax > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"><a title="Line 185: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 185: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">for</span> (<span class="keyword">int</span> x = 0; result == 0 && x < subMax; x++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"><a title="Line 186: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 186: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = Long.valueOf(subLeft[x]).compareTo(Long.valueOf(subRight[x]));</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// final long iLeft = Long.parseLong(subLeft[x]);</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// final long iRight = Long.parseLong(subRight[x]);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 7939</td> <td class="src"><pre class="src"> <span class="keyword">int</span> result = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 7939</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] left = <span class="keyword">this</span>.getName().split(<span class="string">":"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 7939</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] right = vs.getName().split(<span class="string">":"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"><a title="Line 182: Conditional coverage 100% (2/2)."> 7939</a></td> <td class="src"><pre class="src"> <a title="Line 182: Conditional coverage 100% (2/2)."> <span class="keyword">final</span> <span class="keyword">int</span> max = (left.length <= right.length) ? left.length : right.length;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"><a title="Line 183: Conditional coverage 50% (1/2)."> 7939</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 183: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (max > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"><a title="Line 184: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 47603</a></td> <td class="src"><pre class="src"> <a title="Line 184: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; result == 0 && i < max; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 39664</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] subLeft = left[i].split(<span class="string">"\\."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 39664</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] subRight = right[i].split(<span class="string">"\\."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"><a title="Line 187: Conditional coverage 100% (2/2)."> 39664</a></td> <td class="src"><pre class="src"> <a title="Line 187: Conditional coverage 100% (2/2)."> <span class="keyword">final</span> <span class="keyword">int</span> subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"><a title="Line 188: Conditional coverage 50% (1/2)."> 39664</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 188: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (subMax > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"><a title="Line 189: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 90802</a></td> <td class="src"><pre class="src"> <a title="Line 189: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">for</span> (<span class="keyword">int</span> x = 0; result == 0 && x < subMax; x++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"><a title="Line 190: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 51138</a></td> <td class="src"><pre class="src"> <a title="Line 190: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {</a></pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// if (iLeft != iRight) {</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// if (iLeft > iRight) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 18719</td> <td class="src"><pre class="src"> result = Long.valueOf(subLeft[x]).compareTo(Long.valueOf(subRight[x]));</pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// result = 2;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// final long iLeft = Long.parseLong(subLeft[x]);</span></pre></td></tr>
<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// } else {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// final long iRight = Long.parseLong(subRight[x]);</span></pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// result = -2;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// if (iLeft != iRight) {</span></pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// if (iLeft > iRight) {</span></pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// result = 2;</span></pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// } else {</span></pre></td></tr>
<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// result = -2;</span></pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//ignore the exception - they obviously aren't numbers</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"><a title="Line 200: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 200: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!subLeft[x].equalsIgnoreCase(subRight[x])) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = subLeft[x].compareToIgnoreCase(subRight[x]);</span></pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = subLeft[x].compareToIgnoreCase(subRight[x]);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"><a title="Line 204: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 204: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!subLeft[x].equalsIgnoreCase(subRight[x])) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = subLeft[x].compareToIgnoreCase(subRight[x]);</span></pre></td></tr>
<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"> 18719</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 32419</td> <td class="src"><pre class="src"> result = subLeft[x].compareToIgnoreCase(subRight[x]);</pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"><a title="Line 208: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 208: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (result == 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsUncovered"><a title="Line 209: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 209: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (subLeft.length > subRight.length) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = 2;</span></pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"><a title="Line 212: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 212: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (subRight.length > subLeft.length) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = -2;</span></pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = left[i].compareToIgnoreCase(right[i]);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"><a title="Line 212: Conditional coverage 100% (2/2)."> 39664</a></td> <td class="src"><pre class="src"> <a title="Line 212: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (result == 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"><a title="Line 213: Conditional coverage 100% (2/2)."> 31803</a></td> <td class="src"><pre class="src"> <a title="Line 213: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (subLeft.length > subRight.length) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> result = 2;</pre></td></tr>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"><a title="Line 216: Conditional coverage 100% (2/2)."> 31803</a></td> <td class="src"><pre class="src"> <a title="Line 216: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (subRight.length > subLeft.length) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> result = -2;</pre></td></tr>
<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"><a title="Line 220: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 220: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (result == 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"><a title="Line 221: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 221: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left.length > right.length) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = 2;</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = left[i].compareToIgnoreCase(right[i]);</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"><a title="Line 224: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 224: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (right.length > left.length) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = -2;</span></pre></td></tr>
-<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"><a title="Line 224: Conditional coverage 100% (2/2)."> 7939</a></td> <td class="src"><pre class="src"> <a title="Line 224: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (result == 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"><a title="Line 225: Conditional coverage 100% (2/2)."> 53</a></td> <td class="src"><pre class="src"> <a title="Line 225: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (left.length > right.length) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> result = 2;</pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = <span class="keyword">this</span>.getName().compareToIgnoreCase(vs.getName());</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"><a title="Line 228: Conditional coverage 100% (2/2)."> 53</a></td> <td class="src"><pre class="src"> <a title="Line 228: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (right.length > left.length) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> result = -2;</pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> result;</span></pre></td></tr>
-<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines if the string passed in is a positive integer.</span></pre></td></tr>
-<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param str the string to test</span></pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the string only contains 0-9, otherwise false.</span></pre></td></tr>
-<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">boolean</span> isPositiveInteger(<span class="keyword">final</span> String str) {</pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"><a title="Line 241: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 241: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (str == <span class="keyword">null</span> || str.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"><a title="Line 244: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 244: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < str.length(); i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">char</span> c = str.charAt(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"><a title="Line 246: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 246: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (c < <span class="string">'0'</span> || c > <span class="string">'9'</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> result = <span class="keyword">this</span>.getName().compareToIgnoreCase(vs.getName());</span></pre></td></tr>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsCovered"> 7939</td> <td class="src"><pre class="src"> <span class="keyword">return</span> result;</pre></td></tr>
+<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines if the string passed in is a positive integer.</span></pre></td></tr>
+<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param str the string to test</span></pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the string only contains 0-9, otherwise false.</span></pre></td></tr>
+<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">boolean</span> isPositiveInteger(<span class="keyword">final</span> String str) {</pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"><a title="Line 245: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 69929</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 245: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (str == <span class="keyword">null</span> || str.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"><a title="Line 248: Conditional coverage 100% (2/2)."> 115424</a></td> <td class="src"><pre class="src"> <a title="Line 248: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < str.length(); i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsCovered"> 77914</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">char</span> c = str.charAt(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsCovered"><a title="Line 250: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 77914</a></td> <td class="src"><pre class="src"> <a title="Line 250: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (c < <span class="string">'0'</span> || c > <span class="string">'9'</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsCovered"> 32405</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The name of the cpe.</span></pre></td></tr>
-<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 254</td> <td class="nbHitsCovered"> 37510</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String name;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The name of the cpe.</span></pre></td></tr>
<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of name.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String name;</pre></td></tr>
<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of name</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of name.</span></pre></td></tr>
<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> name;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of name</span></pre></td></tr>
<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of name.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> name;</pre></td></tr>
<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param name new value of name</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setName(String name) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of name.</span></pre></td></tr>
<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.name = name;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param name new value of name</span></pre></td></tr>
<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The product version number.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setName(String name) {</pre></td></tr>
<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.name = name;</pre></td></tr>
<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String version;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The product version number.</span></pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of version.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String version;</pre></td></tr>
<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of version</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getVersion() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of version.</span></pre></td></tr>
<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> version;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of version</span></pre></td></tr>
<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getVersion() {</pre></td></tr>
<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of version.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> version;</pre></td></tr>
<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param version new value of version</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setVersion(String version) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of version.</span></pre></td></tr>
<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.version = version;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param version new value of version</span></pre></td></tr>
<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The product revision version.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setVersion(String version) {</pre></td></tr>
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.version = version;</pre></td></tr>
<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String revision;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The product revision version.</span></pre></td></tr>
<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of revision.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String revision;</pre></td></tr>
<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of revision</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getRevision() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of revision.</span></pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> revision;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of revision</span></pre></td></tr>
<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getRevision() {</pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of revision.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> revision;</pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param revision new value of revision</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setRevision(String revision) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of revision.</span></pre></td></tr>
<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.revision = revision;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param revision new value of revision</span></pre></td></tr>
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The product edition.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setRevision(String revision) {</pre></td></tr>
<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.revision = revision;</pre></td></tr>
<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String edition;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The product edition.</span></pre></td></tr>
<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of edition.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String edition;</pre></td></tr>
<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of edition</span></pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getEdition() {</pre></td></tr>
-<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">return</span> edition;</pre></td></tr>
-<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Set the value of edition.</span></pre></td></tr>
-<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of edition.</span></pre></td></tr>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param edition new value of edition</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of edition</span></pre></td></tr>
+<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setEdition(String edition) {</pre></td></tr>
-<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">this</span>.edition = edition;</pre></td></tr>
-<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getEdition() {</pre></td></tr>
+<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">return</span> edition;</pre></td></tr>
+<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Set the value of edition.</span></pre></td></tr>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param edition new value of edition</span></pre></td></tr>
<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setEdition(String edition) {</pre></td></tr>
+<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">this</span>.edition = edition;</pre></td></tr>
+<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 8ff897d21..1a8a09cd6 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f2243b3a8..e80d58b65 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 88a7c8cdf..07d95bc26 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
@@ -131,7 +131,7 @@
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param qName the qualified name</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param atts the attributes</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param attributes the attributes</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws SAXException thrown if there is a SAXException</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
@@ -139,15 +139,15 @@
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> startElement(String uri, String localName, String qName, Attributes atts) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">super</span>.startElement(NAMESPACE, localName, qName, atts);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> startElement(String uri, String localName, String qName, Attributes attributes) <span class="keyword">throws</span> SAXException {</pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">super</span>.startElement(NAMESPACE, localName, qName, attributes);</span></pre></td></tr>
<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Indicatees the start of the document.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Indicates the start of the document.</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
@@ -198,6 +198,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 164b1871f..dc96cb24c 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 fc6a84d43..bb67b55c2 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 e822869a8..0d5bb8141 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f1e1ab7ac..9410f0aaf 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 8a6465ec0..40fd40ab4 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 979716d59..e11162b58 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 ee5b21c09..d20aae474 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 dfc3ce948..297cd6294 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 710e04457..0343a57b7 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 0df0082c7..e2b9966c9 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f1c8395ce..d5a245bc4 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 93567a57d..01115165a 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 b0ed9c2e3..ac96a18db 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7b8d1247f..cd5c0b691 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 354f25ae5..d851052bf 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 0fad6af19..ab2a89a3b 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 3bf644364..c3da2fc60 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 79419e53e..7b3c01a1a 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 9ce968ae0..254136e75 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
@@ -3433,6 +3433,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 a25697860..19d808be1 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 d0f6e6847..e6aa6deda 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 afac1330b..d061cff85 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 dbf295c99..ace998694 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 67dab1c78..f24a19f0e 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 325238e81..b1bb67a1b 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 1e93521a2..418c93b0e 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 89bb6b30d..4734b60ad 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 af7107758..db5db9ce7 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 36de2880f..d6cf68611 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 57e1c3ccd..3faa9e7b7 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 178909c6c..9ad6d7a31 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f2637950f..6c39f089a 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 402de4c36..aaf5d609f 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 e5191b395..4930b85c0 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 0b0637c70..8cbd612c2 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 b729bb840..60364ced6 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 e53284c38..cd2363786 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 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 3ec17e540..49476451a 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 @@
<td class="src"><pre class="src"> <span class="keyword">package</span> org.owasp.dependencycheck.jaxb.pom.generated;</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 1bad32c4b..c27b43308 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.reporting.ReportGenerator.html">ReportGenerator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/84</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/38</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.333333333333333;</span>5.333</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.reporting.ReportGenerator.html">ReportGenerator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/86</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/38</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.333333333333333;</span>5.333</td></tr>
<tr><td><a href="org.owasp.dependencycheck.reporting.ReportGenerator.html">ReportGenerator$Format</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.333333333333333;</span>5.333</td></tr>
</table>
@@ -75,366 +75,378 @@
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.io.OutputStreamWriter;</pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.List;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.text.DateFormat;</pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.text.SimpleDateFormat;</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Date;</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.app.VelocityEngine;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.List;</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.context.Context;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.runtime.RuntimeConstants;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.VelocityContext;</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.tools.ToolManager;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.app.VelocityEngine;</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.tools.config.EasyFactoryConfiguration;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.context.Context;</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.analyzer.Analyzer;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.runtime.RuntimeConstants;</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.analyzer.Analyzer;</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.dependency.Dependency;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.dependency.Dependency;</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.utils.Settings;</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The ReportGenerator is used to, as the name implies, generate reports. Internally the generator uses the Velocity</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Templating Engine. The ReportGenerator exposes a list of Dependencies to the template when generating the report.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The ReportGenerator is used to, as the name implies, generate reports. Internally the generator uses the Velocity</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Templating Engine. The ReportGenerator exposes a list of Dependencies to the template when generating the report.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> ReportGenerator {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> ReportGenerator {</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * An enumeration of the report formats.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> enum Format {</span></pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(ReportGenerator.<span class="keyword">class</span>.getName());</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generate all reports.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ALL,</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * An enumeration of the report formats.</span></pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> enum Format {</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generate XML report.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> XML,</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Generate all reports.</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generate HTML report.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ALL,</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HTML,</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generate HTML Vulnerability report.</span></pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Generate XML report.</span></pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> VULN</span></pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> XML,</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Generate HTML report.</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HTML,</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Velocity Engine.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Generate HTML Vulnerability report.</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> VelocityEngine engine;</pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> VULN</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The Velocity Engine Context.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Context context;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Velocity Engine.</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> VelocityEngine engine;</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Constructs a new ReportGenerator.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Velocity Engine Context.</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param applicationName the application name being analyzed</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param dependencies the list of dependencies</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Context context;</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param analyzers the list of analyzers used</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param properties the database properties (containing timestamps of the NVD CVE data)</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> ReportGenerator(String applicationName, List<Dependency> dependencies, List<Analyzer> analyzers, DatabaseProperties properties) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine = createVelocityEngine();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context = createContext();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Constructs a new ReportGenerator.</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param applicationName the application name being analyzed</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param dependencies the list of dependencies</span></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.init();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param analyzers the list of analyzers used</span></pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param properties the database properties (containing timestamps of the NVD CVE data)</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"applicationName"</span>, applicationName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"dependencies"</span>, dependencies);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"analyzers"</span>, analyzers);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"properties"</span>, properties);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"version"</span>, Settings.getString(<span class="string">"application.version"</span>, <span class="string">"Unknown"</span>));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates a new Velocity Engine.</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a velocity engine.</span></pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> ReportGenerator(String applicationName, List<Dependency> dependencies, List<Analyzer> analyzers, DatabaseProperties properties) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine = createVelocityEngine();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context = createContext();</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.init();</span></pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DateFormat dateFormat = <span class="keyword">new</span> SimpleDateFormat(<span class="string">"MMM d, yyyy 'at' HH:mm:ss z"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DateFormat dateFormatXML = <span class="keyword">new</span> SimpleDateFormat(<span class="string">"yyyy-MM-dd'T'HH:mm:ss.SSSZ"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Date d = <span class="keyword">new</span> Date();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String scanDate = dateFormat.format(d);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String scanDateXML = dateFormatXML.format(d);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EscapeTool enc = <span class="keyword">new</span> EscapeTool();</span></pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> VelocityEngine createVelocityEngine() {</pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VelocityEngine ve = <span class="keyword">new</span> VelocityEngine();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ve.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, VelocityLoggerRedirect.<span class="keyword">class</span>.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ve.setProperty(RuntimeConstants.RESOURCE_LOADER, <span class="string">"classpath"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ve.setProperty(<span class="string">"classpath.resource.loader.class"</span>, ClasspathResourceLoader.<span class="keyword">class</span>.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ve;</span></pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Creates a new Velocity Context initialized with escape and date tools.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"applicationName"</span>, applicationName);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"dependencies"</span>, dependencies);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"analyzers"</span>, analyzers);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"properties"</span>, properties);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"scanDate"</span>, scanDate);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"scanDateXML"</span>, scanDateXML);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"enc"</span>, enc);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> context.put(<span class="string">"version"</span>, Settings.getString(<span class="string">"application.version"</span>, <span class="string">"Unknown"</span>));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a Velocity Context.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates a new Velocity Engine.</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = <span class="string">"RV_RETURN_VALUE_IGNORED_INFERRED"</span>,</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> justification = <span class="string">"No plan to fix this style issue"</span>)</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a velocity engine.</span></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Context createContext() {</pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ToolManager manager = <span class="keyword">new</span> ToolManager();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Context c = manager.createContext();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> EasyFactoryConfiguration config = <span class="keyword">new</span> EasyFactoryConfiguration();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.addDefaultTools();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.toolbox(<span class="string">"application"</span>).tool(<span class="string">"esc"</span>, <span class="string">"org.apache.velocity.tools.generic.EscapeTool"</span>).tool(<span class="string">"org.apache.velocity.tools.generic.DateTool"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> manager.configure(config);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> c;</span></pre></td></tr>
-<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> VelocityEngine createVelocityEngine() {</pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> VelocityEngine engine = <span class="keyword">new</span> VelocityEngine();</span></pre></td></tr>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Logging redirection for Velocity - Required by Jenkins and other server applications</span></pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, VelocityLoggerRedirect.<span class="keyword">class</span>.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> engine;</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Creates a new Velocity Context.</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generates the Dependency Reports for the identified dependencies.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a Velocity Context.</span></pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param outputDir the path where the reports should be written</span></pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param format the format the report should be written in</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Context createContext() {</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> VelocityContext();</span></pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when the template file does not exist</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an error writing out the reports.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> generateReports(String outputDir, Format format) <span class="keyword">throws</span> IOException, Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"><a title="Line 142: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 142: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (format == Format.XML || format == Format.ALL) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReport(<span class="string">"XmlReport"</span>, outputDir + File.separator + <span class="string">"dependency-check-report.xml"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 145: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (format == Format.HTML || format == Format.ALL) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReport(<span class="string">"HtmlReport"</span>, outputDir + File.separator + <span class="string">"dependency-check-report.html"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"><a title="Line 148: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 148: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (format == Format.VULN || format == Format.ALL) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReport(<span class="string">"VulnerabilityReport"</span>, outputDir + File.separator + <span class="string">"dependency-check-vulnerability.html"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Generates the Dependency Reports for the identified dependencies.</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param outputDir the path where the reports should be written</span></pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param outputFormat the format the report should be written in (XML, HTML, ALL)</span></pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param format the format the report should be written in</span></pre></td></tr>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when the template file does not exist</span></pre></td></tr>
-<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an error writing out the reports.</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> generateReports(String outputDir, Format format) <span class="keyword">throws</span> IOException, Exception {</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"><a title="Line 149: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 149: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (format == Format.XML || format == Format.ALL) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReport(<span class="string">"XmlReport"</span>, outputDir + File.separator + <span class="string">"dependency-check-report.xml"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"><a title="Line 152: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 152: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (format == Format.HTML || format == Format.ALL) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReport(<span class="string">"HtmlReport"</span>, outputDir + File.separator + <span class="string">"dependency-check-report.html"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"><a title="Line 155: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 155: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (format == Format.VULN || format == Format.ALL) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReport(<span class="string">"VulnerabilityReport"</span>, outputDir + File.separator + <span class="string">"dependency-check-vulnerability.html"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> generateReports(String outputDir, String outputFormat) <span class="keyword">throws</span> IOException, Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String format = outputFormat.toUpperCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"><a title="Line 163: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 163: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (format.matches(<span class="string">"^(XML|HTML|VULN|ALL)$"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"><a title="Line 164: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 164: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"XML"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.XML);</span></pre></td></tr>
-<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"><a title="Line 167: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 167: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"HTML"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.HTML);</span></pre></td></tr>
-<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"><a title="Line 170: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 170: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"VULN"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.VULN);</span></pre></td></tr>
-<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"><a title="Line 173: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 173: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"ALL"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.ALL);</span></pre></td></tr>
-<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generates a report from a given Velocity Template. The template name provided can be the name of a template</span></pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * contained in the jar file, such as 'XmlReport' or 'HtmlReport', or the template name can be the path to a</span></pre></td></tr>
-<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * template file.</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Generates the Dependency Reports for the identified dependencies.</span></pre></td></tr>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param templateName the name of the template to load.</span></pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param outFileName the filename and path to write the report to.</span></pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when the template file does not exist.</span></pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown when an exception occurs.</span></pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param outputDir the path where the reports should be written</span></pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param outputFormat the format the report should be written in (XML, HTML, ALL)</span></pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when the template file does not exist</span></pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown if there is an error writing out the reports.</span></pre></td></tr>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> generateReport(String templateName, String outFileName) <span class="keyword">throws</span> IOException, Exception {</pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> InputStream input = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String templatePath = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File f = <span class="keyword">new</span> File(templateName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"><a title="Line 193: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 193: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (f.exists() && f.isFile()) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> templatePath = templateName;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> input = <span class="keyword">new</span> FileInputStream(f);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"Unable to generate the report, the report template file could not be found."</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ReportGenerator.<span class="keyword">class</span>.getName()).log(Level.SEVERE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ReportGenerator.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> templatePath = <span class="string">"templates/"</span> + templateName + <span class="string">".vsl"</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> input = <span class="keyword">this</span>.getClass().getClassLoader().getResourceAsStream(templatePath);</span></pre></td></tr>
-<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"><a title="Line 206: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 206: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (input == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(<span class="string">"Template file doesn't exist"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputStreamReader reader = <span class="keyword">new</span> InputStreamReader(input, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> OutputStreamWriter writer = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> OutputStream outputStream = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File outDir = <span class="keyword">new</span> File(outFileName).getParentFile();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"><a title="Line 216: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 216: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!outDir.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> created = outDir.mkdirs();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"><a title="Line 218: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 218: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!created) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> Exception(<span class="string">"Unable to create directory '"</span> + outDir.getAbsolutePath() + <span class="string">"'."</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> generateReports(String outputDir, String outputFormat) <span class="keyword">throws</span> IOException, Exception {</pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String format = outputFormat.toUpperCase();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"><a title="Line 170: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 170: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (format.matches(<span class="string">"^(XML|HTML|VULN|ALL)$"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"><a title="Line 171: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 171: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"XML"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.XML);</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"><a title="Line 174: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 174: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"HTML"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.HTML);</span></pre></td></tr>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"><a title="Line 177: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 177: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"VULN"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.VULN);</span></pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"><a title="Line 180: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 180: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"ALL"</span>.equalsIgnoreCase(format)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> generateReports(outputDir, Format.ALL);</span></pre></td></tr>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> outputStream = <span class="keyword">new</span> FileOutputStream(outFileName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer = <span class="keyword">new</span> OutputStreamWriter(outputStream, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Generates a report from a given Velocity Template. The template name provided can be the name of a template</span></pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * contained in the jar file, such as 'XmlReport' or 'HtmlReport', or the template name can be the path to a</span></pre></td></tr>
+<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * template file.</span></pre></td></tr>
+<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param templateName the name of the template to load.</span></pre></td></tr>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param outFileName the filename and path to write the report to.</span></pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when the template file does not exist.</span></pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws Exception is thrown when an exception occurs.</span></pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">protected</span> <span class="keyword">void</span> generateReport(String templateName, String outFileName) <span class="keyword">throws</span> IOException, Exception {</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> InputStream input = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String templatePath = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File f = <span class="keyword">new</span> File(templateName);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"><a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (f.exists() && f.isFile()) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> templatePath = templateName;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> input = <span class="keyword">new</span> FileInputStream(f);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = <span class="string">"Unable to generate the report, the report template file could not be found."</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> templatePath = <span class="string">"templates/"</span> + templateName + <span class="string">".vsl"</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> input = <span class="keyword">this</span>.getClass().getClassLoader().getResourceAsStream(templatePath);</span></pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"><a title="Line 213: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 213: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (input == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(<span class="string">"Template file doesn't exist"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"><a title="Line 226: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 226: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!engine.evaluate(context, writer, templatePath, reader)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> Exception(<span class="string">"Failed to convert the template into html."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputStreamReader reader = <span class="keyword">new</span> InputStreamReader(input, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> OutputStreamWriter writer = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> OutputStream outputStream = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File outDir = <span class="keyword">new</span> File(outFileName).getParentFile();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!outDir.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">boolean</span> created = outDir.mkdirs();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"><a title="Line 225: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 225: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!created) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> Exception(<span class="string">"Unable to create directory '"</span> + outDir.getAbsolutePath() + <span class="string">"'."</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.flush();</span></pre></td></tr>
-<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (writer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> outputStream = <span class="keyword">new</span> FileOutputStream(outFileName);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer = <span class="keyword">new</span> OutputStreamWriter(outputStream, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ReportGenerator.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"><a title="Line 233: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 233: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!engine.evaluate(context, writer, templatePath, reader)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> Exception(<span class="string">"Failed to convert the template into html."</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"><a title="Line 238: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 238: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (outputStream != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.flush();</span></pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"><a title="Line 238: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 238: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (writer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> outputStream.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.close();</span></pre></td></tr>
<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ReportGenerator.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(ReportGenerator.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"><a title="Line 245: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 245: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (outputStream != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> outputStream.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 630b3bb97..a97ce5041 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html">VelocityLoggerRedirect</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/13</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html">VelocityLoggerRedirect</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/6</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
</table>
<div class="separator"> </div>
@@ -60,160 +60,167 @@
<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
<tr> <td class="numLine"> 22</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.app.Velocity;</pre></td></tr>
-<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.runtime.RuntimeServices;</pre></td></tr>
-<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.apache.velocity.runtime.log.LogChute;</pre></td></tr>
+<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * <p></span></pre></td></tr>
-<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * DependencyCheck uses {@link java.util.logging.Logger} as a logging framework, and Apache Velocity uses a custom</span></pre></td></tr>
-<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * logging implementation that outputs to a file named velocity.log by default. This class is an implementation of a</span></pre></td></tr>
-<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * custom Velocity logger that redirects all velocity logging to the Java Logger class.</span></pre></td></tr>
-<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * </p><p></span></pre></td></tr>
-<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * This class was written to address permission issues when using Dependency-Check in a server environment (such as the</span></pre></td></tr>
-<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Jenkins plugin). In some circumstances, Velocity would attempt to create velocity.log in an un-writable</span></pre></td></tr>
-<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * directory.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @author Steve Springett <steve.springett@owasp.org></span></pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> VelocityLoggerRedirect <span class="keyword">implements</span> LogChute {</pre></td></tr>
+<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The Logger.</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This will be invoked once by the LogManager.</span></pre></td></tr>
-<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(VelocityLoggerRedirect.<span class="keyword">class</span>.getName());</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param rsvc the RuntimeServices</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> init(RuntimeServices rsvc) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * This will be invoked once by the LogManager.</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// do nothing</span></pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param rsvc the RuntimeServices</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> init(RuntimeServices rsvc) {</pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Given a Velocity log level and message, this method will call the appropriate Logger level and log the specified</span></pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * values.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// do nothing</span></pre></td></tr>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param level the logging level</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param message the message to be logged</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Given a Velocity log level and message, this method will call the appropriate Logger level and log the specified</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * values.</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> log(<span class="keyword">int</span> level, String message) {</pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Velocity.<span class="keyword">class</span>.getName()).log(getLevel(level), message);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Given a Velocity log level, message and Throwable, this method will call the appropriate Logger level and log the</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * specified values.</span></pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param level the logging level</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param message the message to be logged</span></pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> log(<span class="keyword">int</span> level, String message) {</pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(getLevel(level), message);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Given a Velocity log level, message and Throwable, this method will call the appropriate Logger level and log the</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param t a throwable to log</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * specified values.</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> log(<span class="keyword">int</span> level, String message, Throwable t) {</pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Velocity.<span class="keyword">class</span>.getName()).log(getLevel(level), message, t);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Will always return true. The property file will decide what level to log.</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param level the logging level</span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param message the message to be logged</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param t a throwable to log</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isLevelEnabled(<span class="keyword">int</span> level) {</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> log(<span class="keyword">int</span> level, String message, Throwable t) {</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(getLevel(level), message, t);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Maps Velocity log levels to {@link Logger} values.</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Will always return true. The property file will decide what level to log.</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param velocityLevel the logging level</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the logging level</span></pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param level the logging level</span></pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true</span></pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Level getLevel(<span class="keyword">int</span> velocityLevel) {</pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"><a title="Line 89: Conditional coverage 0% (0/6)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 89: Conditional coverage 0% (0/6)."> <span class="keyword">switch</span> (velocityLevel) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">case</span> TRACE_ID:</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.ALL;</span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">case</span> DEBUG_ID:</pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.FINE;</span></pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">case</span> INFO_ID:</pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.INFO;</span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">case</span> WARN_ID:</pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.WARNING;</span></pre></td></tr>
-<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">case</span> ERROR_ID:</pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.SEVERE;</span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">default</span>:</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.INFO;</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isLevelEnabled(<span class="keyword">int</span> level) {</pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Maps Velocity log levels to {@link Logger} values.</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param velocityLevel the logging level</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the logging level</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Level getLevel(<span class="keyword">int</span> velocityLevel) {</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"><a title="Line 93: Conditional coverage 0% (0/6)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 93: Conditional coverage 0% (0/6)."> <span class="keyword">switch</span> (velocityLevel) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">case</span> TRACE_ID:</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.ALL;</span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">case</span> DEBUG_ID:</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.FINE;</span></pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">case</span> INFO_ID:</pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.INFO;</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">case</span> WARN_ID:</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.WARNING;</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">case</span> ERROR_ID:</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.SEVERE;</span></pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">default</span>:</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> Level.INFO;</span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 7dcc40ab1..fa8d3dbdd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1;</span>3.1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.PropertyType.html">PropertyType</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:57px"><span class="text">16/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">46%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:46px"><span class="text">13/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1;</span>3.1</td></tr>
</table>
<div class="separator"> </div>
@@ -237,28 +237,28 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> matches(String text) {</pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"><a title="Line 111: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 111: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"><a title="Line 111: Conditional coverage 50% (1/2)."> 22</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 111: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"><a title="Line 114: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 114: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.regex) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"><a title="Line 114: Conditional coverage 100% (2/2)."> 22</a></td> <td class="src"><pre class="src"> <a title="Line 114: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.regex) {</a></pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Pattern rx;</pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"><a title="Line 116: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 116: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.caseSensitive) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rx = Pattern.compile(<span class="keyword">this</span>.value);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"><a title="Line 116: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 116: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.caseSensitive) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> rx = Pattern.compile(<span class="keyword">this</span>.value);</pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rx = Pattern.compile(<span class="keyword">this</span>.value, Pattern.CASE_INSENSITIVE);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> rx = Pattern.compile(<span class="keyword">this</span>.value, Pattern.CASE_INSENSITIVE);</pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> rx.matcher(text).matches();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> rx.matcher(text).matches();</pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"><a title="Line 123: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 123: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.caseSensitive) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value.equals(text);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"><a title="Line 123: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 123: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.caseSensitive) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value.equals(text);</pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value.equalsIgnoreCase(text);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value.equalsIgnoreCase(text);</pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
@@ -308,28 +308,28 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"><a title="Line 154: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 154: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"><a title="Line 154: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 154: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"><a title="Line 157: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 157: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"><a title="Line 157: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 157: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 158</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> PropertyType other = (PropertyType) obj;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.value == <span class="keyword">null</span>) ? (other.value != <span class="keyword">null</span>) : !<span class="keyword">this</span>.value.equals(other.value)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> PropertyType other = (PropertyType) obj;</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 33% (2/6) [each condition: 50%, 0%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 33% (2/6) [each condition: 50%, 0%, 50%]."> <span class="keyword">if</span> ((<span class="keyword">this</span>.value == <span class="keyword">null</span>) ? (other.value != <span class="keyword">null</span>) : !<span class="keyword">this</span>.value.equals(other.value)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"><a title="Line 164: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 164: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.regex != other.regex) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"><a title="Line 164: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 164: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.regex != other.regex) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"><a title="Line 167: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 167: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.caseSensitive != other.caseSensitive) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"><a title="Line 167: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 167: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.caseSensitive != other.caseSensitive) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
@@ -357,6 +357,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 6fecf18ec..0f0e2acff 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html">SuppressionErrorHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">6%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:6px"><span class="text">1/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
</table>
<div class="separator"> </div>
@@ -84,110 +84,119 @@
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Builds a prettier exception message.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ex the SAXParseException</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(SuppressionErrorHandler.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an easier to read exception message</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String getPrettyParseExceptionInfo(SAXParseException ex) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Builds a prettier exception message.</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ex the SAXParseException</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"><a title="Line 43: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 43: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getSystemId() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"systemId="</span>).append(ex.getSystemId()).append(<span class="string">", "</span>);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an easier to read exception message</span></pre></td></tr>
+<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String getPrettyParseExceptionInfo(SAXParseException ex) {</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder sb = <span class="keyword">new</span> StringBuilder();</span></pre></td></tr>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"><a title="Line 48: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 48: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getSystemId() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"systemId="</span>).append(ex.getSystemId()).append(<span class="string">", "</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"><a title="Line 46: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 46: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getPublicId() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"publicId="</span>).append(ex.getPublicId()).append(<span class="string">", "</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"><a title="Line 51: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 51: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getPublicId() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"publicId="</span>).append(ex.getPublicId()).append(<span class="string">", "</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"><a title="Line 49: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 49: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getLineNumber() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"Line="</span>).append(ex.getLineNumber());</span></pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"><a title="Line 52: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 52: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getColumnNumber() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">", Column="</span>).append(ex.getColumnNumber());</span></pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">": "</span>).append(ex.getMessage());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"><a title="Line 54: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 54: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getLineNumber() > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">"Line="</span>).append(ex.getLineNumber());</span></pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> sb.toString();</span></pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"><a title="Line 57: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 57: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (ex.getColumnNumber() > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">", Column="</span>).append(ex.getColumnNumber());</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> sb.append(<span class="string">": "</span>).append(ex.getMessage());</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Logs warnings.</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> sb.toString();</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ex the warning to log</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is never thrown</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Logs warnings.</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> warning(SAXParseException ex) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(SuppressionErrorHandler.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ex the warning to log</span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is never thrown</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Handles errors.</span></pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ex the error to handle</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> warning(SAXParseException ex) <span class="keyword">throws</span> SAXException {</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is always thrown</span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> error(SAXParseException ex) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(getPrettyParseExceptionInfo(ex));</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Handles fatal exceptions.</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Handles errors.</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param ex a fatal exception</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is always</span></pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ex the error to handle</span></pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is always thrown</span></pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> fatalError(SAXParseException ex) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(getPrettyParseExceptionInfo(ex));</span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> error(SAXParseException ex) <span class="keyword">throws</span> SAXException {</pre></td></tr>
+<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(getPrettyParseExceptionInfo(ex));</span></pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Handles fatal exceptions.</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param ex a fatal exception</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SAXException is always</span></pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> fatalError(SAXParseException ex) <span class="keyword">throws</span> SAXException {</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SAXException(getPrettyParseExceptionInfo(ex));</span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 9d01a85cc..982216826 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/40</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/26</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.6;</span>3.6</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionHandler.html">SuppressionHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">97%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:97px"><span class="text">39/40</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">84%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:84px"><span class="text">22/26</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.6;</span>3.6</td></tr>
</table>
<div class="separator"> </div>
@@ -77,7 +77,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 31</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> SuppressionHandler <span class="keyword">extends</span> DefaultHandler {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 31</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> SuppressionHandler <span class="keyword">extends</span> DefaultHandler {</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
@@ -142,7 +142,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A list of suppression rules.</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> List<SuppressionRule> suppressionRules = <span class="keyword">new</span> ArrayList<SuppressionRule>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">private</span> List<SuppressionRule> suppressionRules = <span class="keyword">new</span> ArrayList<SuppressionRule>();</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
@@ -209,17 +209,17 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> startElement(String uri, String localName, String qName, Attributes attributes) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> currentAttributes = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> currentText = <span class="keyword">new</span> StringBuffer();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 80</td> <td class="src"><pre class="src"> currentAttributes = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 80</td> <td class="src"><pre class="src"> currentText = <span class="keyword">new</span> StringBuffer();</pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"><a title="Line 101: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 101: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (SUPPRESS.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule = <span class="keyword">new</span> SuppressionRule();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"><a title="Line 103: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 103: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (FILE_PATH.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> currentAttributes = attributes;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (2/2)."> 80</a></td> <td class="src"><pre class="src"> <a title="Line 101: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (SUPPRESS.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> rule = <span class="keyword">new</span> SuppressionRule();</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"><a title="Line 103: Conditional coverage 100% (2/2)."> 60</a></td> <td class="src"><pre class="src"> <a title="Line 103: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (FILE_PATH.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> currentAttributes = attributes;</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 80</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
@@ -242,27 +242,27 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> endElement(String uri, String localName, String qName) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"><a title="Line 118: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 118: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (SUPPRESS.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> suppressionRules.add(rule);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"><a title="Line 121: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 121: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (FILE_PATH.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> PropertyType pt = processPropertyType();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule.setFilePath(pt);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsUncovered"><a title="Line 124: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 124: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (SHA1.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule.setSha1(currentText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"><a title="Line 126: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 126: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CPE.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> PropertyType pt = processPropertyType();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule.addCpe(pt);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"><a title="Line 129: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 129: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CWE.equals(qName)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"><a title="Line 118: Conditional coverage 100% (2/2)."> 80</a></td> <td class="src"><pre class="src"> <a title="Line 118: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (SUPPRESS.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> suppressionRules.add(rule);</pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> rule = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"><a title="Line 121: Conditional coverage 100% (2/2)."> 60</a></td> <td class="src"><pre class="src"> <a title="Line 121: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (FILE_PATH.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">final</span> PropertyType pt = processPropertyType();</pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> rule.setFilePath(pt);</pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"><a title="Line 124: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 124: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (SHA1.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> rule.setSha1(currentText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"><a title="Line 126: Conditional coverage 100% (2/2)."> 44</a></td> <td class="src"><pre class="src"> <a title="Line 126: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CPE.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">final</span> PropertyType pt = processPropertyType();</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> rule.addCpe(pt);</pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"><a title="Line 129: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 129: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CWE.equals(qName)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule.addCwe(currentText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"><a title="Line 131: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 131: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CVE.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule.addCve(currentText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"><a title="Line 133: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 133: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CVSS_BELOW.equals(qName)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">float</span> cvss = Float.parseFloat(currentText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rule.addCvssBelow(cvss);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"><a title="Line 131: Conditional coverage 100% (2/2)."> 36</a></td> <td class="src"><pre class="src"> <a title="Line 131: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CVE.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> rule.addCve(currentText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsCovered"><a title="Line 133: Conditional coverage 100% (2/2)."> 28</a></td> <td class="src"><pre class="src"> <a title="Line 133: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (CVSS_BELOW.equals(qName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">float</span> cvss = Float.parseFloat(currentText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> rule.addCvssBelow(cvss);</pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 80</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
@@ -285,8 +285,8 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> characters(<span class="keyword">char</span>[] ch, <span class="keyword">int</span> start, <span class="keyword">int</span> length) <span class="keyword">throws</span> SAXException {</pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> currentText.append(ch, start, length);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 176</td> <td class="src"><pre class="src"> currentText.append(ch, start, length);</pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 176</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
@@ -303,28 +303,28 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> PropertyType processPropertyType() {</pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> PropertyType pt = <span class="keyword">new</span> PropertyType();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pt.setValue(currentText.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (currentAttributes != <span class="keyword">null</span> && currentAttributes.getLength() > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String regex = currentAttributes.getValue(<span class="string">"regex"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"><a title="Line 163: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 163: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (regex != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pt.setRegex(Boolean.parseBoolean(regex));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">final</span> PropertyType pt = <span class="keyword">new</span> PropertyType();</pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> pt.setValue(currentText.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsUncovered"><a title="Line 161: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 20</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 161: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (currentAttributes != <span class="keyword">null</span> && currentAttributes.getLength() > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String regex = currentAttributes.getValue(<span class="string">"regex"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"><a title="Line 163: Conditional coverage 50% (1/2)."> 12</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 163: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (regex != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> pt.setRegex(Boolean.parseBoolean(regex));</pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String caseSensitive = currentAttributes.getValue(<span class="string">"caseSensitive"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"><a title="Line 167: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 167: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (regex != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pt.setCaseSensitive(Boolean.parseBoolean(caseSensitive));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String caseSensitive = currentAttributes.getValue(<span class="string">"caseSensitive"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"><a title="Line 167: Conditional coverage 50% (1/2)."> 12</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 167: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (caseSensitive != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> pt.setCaseSensitive(Boolean.parseBoolean(caseSensitive));</pre></td></tr>
<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> pt;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">return</span> pt;</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 cf71e72b8..f79040358 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html
@@ -155,6 +155,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 6403e6f60..96e709abf 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">10.0;</span>10</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionParser.html">SuppressionParser</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">58%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:58px"><span class="text">17/29</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">10.0;</span>10</td></tr>
</table>
<div class="separator"> </div>
@@ -106,93 +106,100 @@
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * JAXP Schema Language. Source: http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String JAXP_SCHEMA_LANGUAGE = <span class="string">"http://java.sun.com/xml/jaxp/properties/schemaLanguage"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(SuppressionParser.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * W3C XML Schema. Source: http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * JAXP Schema Language. Source: http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String W3C_XML_SCHEMA = <span class="string">"http://www.w3.org/2001/XMLSchema"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String JAXP_SCHEMA_LANGUAGE = <span class="string">"http://java.sun.com/xml/jaxp/properties/schemaLanguage"</span>;</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * JAXP Schema Source. Source: http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * W3C XML Schema. Source: http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String JAXP_SCHEMA_SOURCE = <span class="string">"http://java.sun.com/xml/jaxp/properties/schemaSource"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String W3C_XML_SCHEMA = <span class="string">"http://www.w3.org/2001/XMLSchema"</span>;</pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * JAXP Schema Source. Source: http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Parses the given xml file and returns a list of the suppression rules contained.</span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file an xml file containing suppression rules</span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a list of suppression rules</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws SuppressionParseException thrown if the xml file cannot be parsed</span></pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String JAXP_SCHEMA_SOURCE = <span class="string">"http://java.sun.com/xml/jaxp/properties/schemaSource"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Parses the given xml file and returns a list of the suppression rules contained.</span></pre></td></tr>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> List<SuppressionRule> parseSuppressionRules(File file) <span class="keyword">throws</span> SuppressionParseException {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file an xml file containing suppression rules</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputStream schemaStream = <span class="keyword">this</span>.getClass().getClassLoader().getResourceAsStream(<span class="string">"schema/suppression.xsd"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SuppressionHandler handler = <span class="keyword">new</span> SuppressionHandler();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a list of suppression rules</span></pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws SuppressionParseException thrown if the xml file cannot be parsed</span></pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> List<SuppressionRule> parseSuppressionRules(File file) <span class="keyword">throws</span> SuppressionParseException {</pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> InputStream schemaStream = <span class="keyword">this</span>.getClass().getClassLoader().getResourceAsStream(<span class="string">"schema/suppression.xsd"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> SuppressionHandler handler = <span class="keyword">new</span> SuppressionHandler();</pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParserFactory factory = SAXParserFactory.newInstance();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> factory.setNamespaceAware(<span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> factory.setValidating(<span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SAXParser saxParser = factory.newSAXParser();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_LANGUAGE, SuppressionParser.W3C_XML_SCHEMA);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_SOURCE, <span class="keyword">new</span> InputSource(schemaStream));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> XMLReader xmlReader = saxParser.getXMLReader();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> xmlReader.setErrorHandler(<span class="keyword">new</span> SuppressionErrorHandler());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> xmlReader.setContentHandler(handler);</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputStream inputStream = <span class="keyword">new</span> FileInputStream(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Reader reader = <span class="keyword">new</span> InputStreamReader(inputStream, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> InputSource in = <span class="keyword">new</span> InputSource(reader);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> SAXParserFactory factory = SAXParserFactory.newInstance();</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> factory.setNamespaceAware(<span class="keyword">true</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> factory.setValidating(<span class="keyword">true</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> SAXParser saxParser = factory.newSAXParser();</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_LANGUAGE, SuppressionParser.W3C_XML_SCHEMA);</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_SOURCE, <span class="keyword">new</span> InputSource(schemaStream));</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> XMLReader xmlReader = saxParser.getXMLReader();</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> xmlReader.setErrorHandler(<span class="keyword">new</span> SuppressionErrorHandler());</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> xmlReader.setContentHandler(handler);</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> InputStream inputStream = <span class="keyword">new</span> FileInputStream(file);</pre></td></tr>
+<tr> <td class="numLineCover"> 84</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Reader reader = <span class="keyword">new</span> InputStreamReader(inputStream, <span class="string">"UTF-8"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> InputSource in = <span class="keyword">new</span> InputSource(reader);</pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//in.setEncoding("UTF-8");</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> xmlReader.parse(in);</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> xmlReader.parse(in);</pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> handler.getSuppressionRules();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(SuppressionParser.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SAXException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(SuppressionParser.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(SuppressionParser.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(SuppressionParser.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> handler.getSuppressionRules();</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SAXException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> SuppressionParseException(ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 4f252c418..8bd249aa2 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 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/82</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/68</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.suppression.SuppressionRule.html">SuppressionRule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">80/84</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">89%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:89px"><span class="text">61/68</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
</table>
<div class="separator"> </div>
@@ -77,7 +77,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 31</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> SuppressionRule {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 31</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> SuppressionRule {</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
@@ -174,7 +174,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A list of CPEs to suppression</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> List<PropertyType> cpe = <span class="keyword">new</span> ArrayList<PropertyType>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">private</span> List<PropertyType> cpe = <span class="keyword">new</span> ArrayList<PropertyType>();</pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
@@ -225,8 +225,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addCpe(PropertyType cpe) {</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cpe.add(cpe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.cpe.add(cpe);</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
@@ -241,7 +241,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasCpe() {</pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"><a title="Line 115: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 115: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> cpe.size() > 0;</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"><a title="Line 115: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 115: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> cpe.size() > 0;</a></pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
@@ -250,7 +250,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The list of cvssBelow scores.</span></pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> List<Float> cvssBelow = <span class="keyword">new</span> ArrayList<Float>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">private</span> List<Float> cvssBelow = <span class="keyword">new</span> ArrayList<Float>();</pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
@@ -301,8 +301,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addCvssBelow(Float cvss) {</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cvssBelow.add(cvss);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.cvssBelow.add(cvss);</pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
@@ -317,7 +317,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasCvssBelow() {</pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"><a title="Line 155: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 155: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> cvssBelow.size() > 0;</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"><a title="Line 155: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 155: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> cvssBelow.size() > 0;</a></pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
@@ -326,7 +326,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The list of cwe entries to suppress.</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> List<String> cwe = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">private</span> List<String> cwe = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
@@ -377,8 +377,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addCwe(String cwe) {</pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cwe.add(cwe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.cwe.add(cwe);</pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
@@ -393,7 +393,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasCwe() {</pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsUncovered"><a title="Line 195: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 195: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> cwe.size() > 0;</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"><a title="Line 195: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 195: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> cwe.size() > 0;</a></pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
@@ -402,7 +402,7 @@
<td class="src"><pre class="src"> <span class="comment"> * The list of cve entries to suppress.</span></pre></td></tr>
<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> List<String> cve = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">private</span> List<String> cve = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
@@ -453,8 +453,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addCve(String cve) {</pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.cve.add(cve);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.cve.add(cve);</pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
@@ -469,7 +469,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasCve() {</pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"><a title="Line 235: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 235: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> cve.size() > 0;</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsCovered"><a title="Line 235: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 235: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> cve.size() > 0;</a></pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
@@ -488,173 +488,175 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> process(Dependency dependency) {</pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"><a title="Line 245: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 245: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (filePath != <span class="keyword">null</span> && !filePath.matches(dependency.getFilePath())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"><a title="Line 245: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 9</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 245: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (filePath != <span class="keyword">null</span> && !filePath.matches(dependency.getFilePath())) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"><a title="Line 248: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 248: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (sha1 != <span class="keyword">null</span> && !sha1.equalsIgnoreCase(dependency.getSha1sum())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"><a title="Line 248: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 248: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (sha1 != <span class="keyword">null</span> && !sha1.equalsIgnoreCase(dependency.getSha1sum())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"><a title="Line 251: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 251: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.hasCpe()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Identifier> itr = dependency.getIdentifiers().iterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"><a title="Line 253: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 253: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Identifier i = itr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"><a title="Line 255: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 255: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (PropertyType c : <span class="keyword">this</span>.cpe) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"><a title="Line 256: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 256: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cpeMatches(c, i)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsCovered"><a title="Line 251: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 251: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.hasCpe()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Identifier> itr = dependency.getIdentifiers().iterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 253</td> <td class="nbHitsCovered"><a title="Line 253: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 253: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 254</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Identifier i = itr.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 255</td> <td class="nbHitsCovered"><a title="Line 255: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 255: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (PropertyType c : <span class="keyword">this</span>.cpe) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"><a title="Line 256: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 256: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (cpeMatches(c, i)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> dependency.addSuppressedIdentifier(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> itr.remove();</pre></td></tr>
+<tr> <td class="numLineCover"> 259</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 261</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"><a title="Line 263: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 263: Conditional coverage 0% (0/6) [each condition: 0%, 0%, 0%]."> <span class="keyword">if</span> (hasCve() || hasCwe() || hasCvssBelow()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Iterator<Vulnerability> itr = dependency.getVulnerabilities().iterator();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"><a title="Line 265: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 265: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> remove = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Vulnerability v = itr.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"><a title="Line 268: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 268: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String entry : <span class="keyword">this</span>.cve) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsUncovered"><a title="Line 269: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 269: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (entry.equalsIgnoreCase(v.getName())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> remove = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsCovered"><a title="Line 264: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 264: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> <span class="keyword">if</span> (hasCve() || hasCwe() || hasCvssBelow()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Iterator<Vulnerability> itr = dependency.getVulnerabilities().iterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 266</td> <td class="nbHitsCovered"><a title="Line 266: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 266: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (itr.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 267</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> remove = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Vulnerability v = itr.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 269</td> <td class="nbHitsCovered"><a title="Line 269: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 269: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String entry : <span class="keyword">this</span>.cve) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 270</td> <td class="nbHitsCovered"><a title="Line 270: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 270: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (entry.equalsIgnoreCase(v.getName())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 271</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> remove = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 272</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"><a title="Line 274: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 274: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!remove) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"><a title="Line 275: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 275: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (String entry : <span class="keyword">this</span>.cwe) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"><a title="Line 276: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 276: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (v.getCwe() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String toMatch = String.format(<span class="string">"CWE-%s "</span>, entry);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String toTest = v.getCwe().substring(0, toMatch.length()).toUpperCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"><a title="Line 279: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 279: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (toTest.equals(toMatch)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> remove = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"><a title="Line 275: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 275: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!remove) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsCovered"><a title="Line 276: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 276: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String entry : <span class="keyword">this</span>.cwe) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"><a title="Line 277: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 277: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (v.getCwe() != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String toMatch = String.format(<span class="string">"CWE-%s "</span>, entry);</pre></td></tr>
+<tr> <td class="numLineCover"> 279</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String toTest = v.getCwe().substring(0, toMatch.length()).toUpperCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"><a title="Line 280: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 280: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (toTest.equals(toMatch)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 281</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> remove = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 282</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"><a title="Line 286: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 286: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!remove) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"><a title="Line 287: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 287: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">float</span> cvss : <span class="keyword">this</span>.cvssBelow) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"><a title="Line 288: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 288: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (v.getCvssScore() < cvss) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> remove = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 287</td> <td class="nbHitsCovered"><a title="Line 287: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 287: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!remove) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"><a title="Line 288: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 288: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">float</span> cvss : <span class="keyword">this</span>.cvssBelow) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsCovered"><a title="Line 289: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 289: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (v.getCvssScore() < cvss) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> remove = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"><a title="Line 294: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 294: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (remove) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> itr.remove();</span></pre></td></tr>
-<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsCovered"><a title="Line 295: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 295: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (remove) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> dependency.addSuppressedVulnerability(v);</pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> itr.remove();</pre></td></tr>
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Identifies if the cpe specified by the cpe suppression rule does not specify a version.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param c a suppression rule identifier</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Identifies if the cpe specified by the cpe suppression rule does not specify a version.</span></pre></td></tr>
<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the property type does not specify a version; otherwise false</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param c a suppression rule identifier</span></pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the property type does not specify a version; otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">boolean</span> cpeHasNoVersion(PropertyType c) {</pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"><a title="Line 308: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 308: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (c.isRegex()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 310</td> <td class="nbHitsCovered"><a title="Line 310: Conditional coverage 100% (2/2)."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 310: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (c.isRegex()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 311</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="comment">// cpe:/a:jboss:jboss:1.0.0:</span></pre></td></tr>
-<tr> <td class="numLineCover"> 311</td> <td class="nbHitsUncovered"><a title="Line 311: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 311: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (countCharacter(c.getValue(), <span class="string">':'</span>) == 3) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 312</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 313</td> <td class="nbHitsCovered"><a title="Line 313: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 313: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (countCharacter(c.getValue(), <span class="string">':'</span>) == 3) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 314</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 316</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Counts the number of occurrences of the character found within the string.</span></pre></td></tr>
-<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param str the string to check</span></pre></td></tr>
-<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param c the character to count</span></pre></td></tr>
-<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the number of times the character is found in the string</span></pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">int</span> countCharacter(String str, <span class="keyword">char</span> c) {</pre></td></tr>
-<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> count = 0;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> pos = str.indexOf(c) + 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"><a title="Line 327: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 327: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (pos > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> count += 1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pos = str.indexOf(c, pos) + 1;</span></pre></td></tr>
-<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> count;</span></pre></td></tr>
-<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Determines if the cpeEntry specified as a PropertyType matches the given Identifier.</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Counts the number of occurrences of the character found within the string.</span></pre></td></tr>
+<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param cpeEntry a suppression rule entry</span></pre></td></tr>
-<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param identifier a CPE identifier to check</span></pre></td></tr>
-<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the entry matches; otherwise false</span></pre></td></tr>
-<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param str the string to check</span></pre></td></tr>
+<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param c the character to count</span></pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the number of times the character is found in the string</span></pre></td></tr>
+<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> cpeMatches(PropertyType cpeEntry, Identifier identifier) {</pre></td></tr>
-<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"><a title="Line 342: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 342: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cpeEntry.matches(identifier.getValue())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 344</td> <td class="nbHitsUncovered"><a title="Line 344: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 344: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (cpeHasNoVersion(cpeEntry)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 345</td> <td class="nbHitsUncovered"><a title="Line 345: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 345: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cpeEntry.isCaseSensitive()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 346</td> <td class="nbHitsUncovered"><a title="Line 346: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 346: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (identifier.getValue().startsWith(cpeEntry.getValue())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 347</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 350</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String id = identifier.getValue().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 351</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String check = cpeEntry.getValue().toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"><a title="Line 352: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 352: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (id.startsWith(check)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 353</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">int</span> countCharacter(String str, <span class="keyword">char</span> c) {</pre></td></tr>
+<tr> <td class="numLineCover"> 327</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">int</span> count = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">int</span> pos = str.indexOf(c) + 1;</pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsCovered"><a title="Line 329: Conditional coverage 100% (2/2)."> 66</a></td> <td class="src"><pre class="src"> <a title="Line 329: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (pos > 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 330</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> count += 1;</pre></td></tr>
+<tr> <td class="numLineCover"> 331</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> pos = str.indexOf(c, pos) + 1;</pre></td></tr>
+<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 333</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">return</span> count;</pre></td></tr>
+<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Determines if the cpeEntry specified as a PropertyType matches the given Identifier.</span></pre></td></tr>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param cpeEntry a suppression rule entry</span></pre></td></tr>
+<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param identifier a CPE identifier to check</span></pre></td></tr>
+<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the entry matches; otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> cpeMatches(PropertyType cpeEntry, Identifier identifier) {</pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsCovered"><a title="Line 344: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 344: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (cpeEntry.matches(identifier.getValue())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 345</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 346</td> <td class="nbHitsCovered"><a title="Line 346: Conditional coverage 100% (2/2)."> 11</a></td> <td class="src"><pre class="src"> <a title="Line 346: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (cpeHasNoVersion(cpeEntry)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 347</td> <td class="nbHitsUncovered"><a title="Line 347: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 347: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (cpeEntry.isCaseSensitive()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 348</td> <td class="nbHitsUncovered"><a title="Line 348: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 348: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (identifier.getValue().startsWith(cpeEntry.getValue())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 349</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 352</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String id = identifier.getValue().toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String check = cpeEntry.getValue().toLowerCase();</pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"><a title="Line 354: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 354: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (id.startsWith(check)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 355</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 4903c8256..e48177e09 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4;</span>2.4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Checksum.html">Checksum</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">88%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:88px"><span class="text">22/25</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">75%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">9/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4;</span>2.4</td></tr>
</table>
<div class="separator"> </div>
@@ -62,165 +62,172 @@
<tr> <td class="numLine"> 22</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> Checksum {</pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Checksum() {</pre></td></tr>
+<tr> <td class="numLineCover"> 27</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(Checksum.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p>Creates the cryptographic checksum of a given file using the specified</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Checksum() {</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * algorithm.</p> <p>This algorithm was copied and heavily modified from</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Real's How To: http://www.rgagnon.com/javadetails/java-0416.html</p></span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param algorithm the algorithm to use to calculate the checksum</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <p>Creates the cryptographic checksum of a given file using the specified</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the file to calculate the checksum for</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * algorithm.</p> <p>This algorithm was copied and heavily modified from</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the checksum</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Real's How To: http://www.rgagnon.com/javadetails/java-0416.html</p></span></pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the file does not exist</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws NoSuchAlgorithmException when an algorithm is specified that does</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param algorithm the algorithm to use to calculate the checksum</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * not exist</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the file to calculate the checksum for</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the checksum</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">byte</span>[] getChecksum(String algorithm, File file) <span class="keyword">throws</span> NoSuchAlgorithmException, IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> InputStream fis = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[1024];</span></pre></td></tr>
-<tr> <td class="numLineCover"> 45</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> MessageDigest complete = MessageDigest.getInstance(algorithm);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the file does not exist</span></pre></td></tr>
+<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws NoSuchAlgorithmException when an algorithm is specified that does</span></pre></td></tr>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * not exist</span></pre></td></tr>
+<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">byte</span>[] getChecksum(String algorithm, File file) <span class="keyword">throws</span> NoSuchAlgorithmException, IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> InputStream fis = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[1024];</pre></td></tr>
+<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> MessageDigest complete = MessageDigest.getInstance(algorithm);</pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">int</span> numRead;</pre></td></tr>
-<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fis = <span class="keyword">new</span> FileInputStream(file);</span></pre></td></tr>
-<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">do</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> numRead = fis.read(buffer);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"><a title="Line 51: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 51: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (numRead > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> complete.update(buffer, 0, numRead);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> fis = <span class="keyword">new</span> FileInputStream(file);</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"><a title="Line 54: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 54: Conditional coverage 0% (0/2)."> } <span class="keyword">while</span> (numRead != -1);</a></span></pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"><a title="Line 56: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 56: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (fis != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">do</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 13356</td> <td class="src"><pre class="src"> numRead = fis.read(buffer);</pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"><a title="Line 55: Conditional coverage 100% (2/2)."> 13356</a></td> <td class="src"><pre class="src"> <a title="Line 55: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (numRead > 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 13323</td> <td class="src"><pre class="src"> complete.update(buffer, 0, numRead);</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"><a title="Line 58: Conditional coverage 100% (2/2)."> 13356</a></td> <td class="src"><pre class="src"> <a title="Line 58: Conditional coverage 100% (2/2)."> } <span class="keyword">while</span> (numRead != -1);</a></pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"><a title="Line 60: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 37</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 60: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (fis != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fis.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Checksum.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="string">"Error closing file '"</span> + file.getName() + <span class="string">"'."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> complete.digest();</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> fis.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="string">"Error closing file '"</span> + file.getName() + <span class="string">"'."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Calculates the MD5 checksum of a specified file.</span></pre></td></tr>
-<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the file to generate the MD5 checksum</span></pre></td></tr>
-<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the hex representation of the MD5 hash</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the file passed in does not exist</span></pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws NoSuchAlgorithmException when the MD5 algorithm is not available</span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getMD5Checksum(File file) <span class="keyword">throws</span> IOException, NoSuchAlgorithmException {</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">byte</span>[] b = getChecksum(<span class="string">"MD5"</span>, file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getHex(b);</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Calculates the SHA1 checksum of a specified file.</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the file to generate the MD5 checksum</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the hex representation of the SHA1 hash</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the file passed in does not exist</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws NoSuchAlgorithmException when the SHA1 algorithm is not available</span></pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getSHA1Checksum(File file) <span class="keyword">throws</span> IOException, NoSuchAlgorithmException {</pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">byte</span>[] b = getChecksum(<span class="string">"SHA1"</span>, file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getHex(b);</span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String HEXES = <span class="string">"0123456789ABCDEF"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p>Converts a byte array into a hex string.</p></span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p>This method was copied from <a</span></pre></td></tr>
-<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * href="http://www.rgagnon.com/javadetails/java-0596.html">http://www.rgagnon.com/javadetails/java-0596.html</a></p></span></pre></td></tr>
-<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param raw a byte array</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the hex representation of the byte array</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getHex(<span class="keyword">byte</span>[] raw) {</pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"><a title="Line 104: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 104: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (raw == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringBuilder hex = <span class="keyword">new</span> StringBuilder(2 * raw.length);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"><a title="Line 108: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 108: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">final</span> <span class="keyword">byte</span> b : raw) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">return</span> complete.digest();</pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Calculates the MD5 checksum of a specified file.</span></pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the file to generate the MD5 checksum</span></pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the hex representation of the MD5 hash</span></pre></td></tr>
+<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the file passed in does not exist</span></pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws NoSuchAlgorithmException when the MD5 algorithm is not available</span></pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getMD5Checksum(File file) <span class="keyword">throws</span> IOException, NoSuchAlgorithmException {</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] b = getChecksum(<span class="string">"MD5"</span>, file);</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">return</span> getHex(b);</pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Calculates the SHA1 checksum of a specified file.</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the file to generate the MD5 checksum</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the hex representation of the SHA1 hash</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException when the file passed in does not exist</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws NoSuchAlgorithmException when the SHA1 algorithm is not available</span></pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getSHA1Checksum(File file) <span class="keyword">throws</span> IOException, NoSuchAlgorithmException {</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] b = getChecksum(<span class="string">"SHA1"</span>, file);</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">return</span> getHex(b);</pre></td></tr>
+<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String HEXES = <span class="string">"0123456789ABCDEF"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p>Converts a byte array into a hex string.</p></span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p>This method was copied from <a</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * href="http://www.rgagnon.com/javadetails/java-0596.html">http://www.rgagnon.com/javadetails/java-0596.html</a></p></span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param raw a byte array</span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the hex representation of the byte array</span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getHex(<span class="keyword">byte</span>[] raw) {</pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"><a title="Line 108: Conditional coverage 50% (1/2)."> 33</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 108: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (raw == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hex.toString();</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">final</span> StringBuilder hex = <span class="keyword">new</span> StringBuilder(2 * raw.length);</pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"><a title="Line 112: Conditional coverage 100% (2/2)."> 626</a></td> <td class="src"><pre class="src"> <a title="Line 112: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">final</span> <span class="keyword">byte</span> b : raw) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"> 593</td> <td class="src"><pre class="src"> hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));</pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 33</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hex.toString();</pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 3a1d5d1f1..31ed27467 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/22</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.DBUtils.html">DBUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">39%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:39px"><span class="text">9/23</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">50%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">2/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
</table>
<div class="separator"> </div>
@@ -68,123 +68,126 @@
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.nvdcve.CveDB;</pre></td></tr>
-<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> org.owasp.dependencycheck.data.nvdcve.DatabaseException;</pre></td></tr>
+<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
-<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> DBUtils {</pre></td></tr>
+<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
-<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(DBUtils.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> DBUtils() {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the generated integer primary key for a newly inserted row.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> DBUtils() {</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param statement a prepared statement that just executed an insert</span></pre></td></tr>
-<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a primary key</span></pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an exception obtaining the key</span></pre></td></tr>
-<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">int</span> getGeneratedKey(PreparedStatement statement) <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ResultSet rs = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> id = 0;</span></pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rs = statement.getGeneratedKeys();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rs.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> id = rs.getInt(1);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to get primary key for inserted row"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> closeResultSet(rs);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> id;</span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Closes the given statement object ignoring any exceptions that occur.</span></pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the generated integer primary key for a newly inserted row.</span></pre></td></tr>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param statement a prepared statement that just executed an insert</span></pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a primary key</span></pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DatabaseException thrown if there is an exception obtaining the key</span></pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">int</span> getGeneratedKey(PreparedStatement statement) <span class="keyword">throws</span> DatabaseException {</pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ResultSet rs = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> id = 0;</span></pre></td></tr>
+<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rs = statement.getGeneratedKeys();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rs.next();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> id = rs.getInt(1);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DatabaseException(<span class="string">"Unable to get primary key for inserted row"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> closeResultSet(rs);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> id;</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param statement a Statement object</span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> closeStatement(Statement statement) {</pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"><a title="Line 69: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 69: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (statement != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> statement.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINEST, statement.toString(), ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Closes the result set capturing and ignoring any SQLExceptions that occur.</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Closes the given statement object ignoring any exceptions that occur.</span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param rs a ResultSet to close</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param statement a Statement object</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> closeResultSet(ResultSet rs) {</pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"><a title="Line 85: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 85: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (rs != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> closeStatement(Statement statement) {</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"><a title="Line 73: Conditional coverage 50% (1/2)."> 20</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 73: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (statement != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> rs.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(CveDB.<span class="keyword">class</span></span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getName()).log(Level.FINEST, rs.toString(), ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> statement.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, statement.toString(), ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Closes the result set capturing and ignoring any SQLExceptions that occur.</span></pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param rs a ResultSet to close</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> closeResultSet(ResultSet rs) {</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"><a title="Line 88: Conditional coverage 50% (1/2)."> 22</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 88: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (rs != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> rs.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SQLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, rs.toString(), ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 84df40056..fbc605838 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/77</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.090909090909091;</span>5.091</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersion.html">DependencyVersion</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">87%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:87px"><span class="text">67/77</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">70%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">44/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">5.090909090909091;</span>5.091</td></tr>
</table>
<div class="separator"> </div>
@@ -95,7 +95,7 @@
<td class="src"><pre class="src"> <span class="comment"> * @author Jeremy Long <jeremy.long@owasp.org></span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 40</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> <span class="keyword">class</span> DependencyVersion <span class="keyword">implements</span> Iterable, Comparable<DependencyVersion> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> DependencyVersion <span class="keyword">implements</span> Iterable, Comparable<DependencyVersion> {</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
@@ -115,18 +115,18 @@
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Constructor for a DependencyVersion that will parse a version string.</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <b>Note</b>, this should only be used when the version passed in is already known to be a well formated version</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * <b>Note</b>, this should only be used when the version passed in is already known to be a well formatted version</span></pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * number. Otherwise, DependencyVersionUtil.parseVersion() should be used instead.</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param version the well formated version number to parse</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param version the well formatted version number to parse</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">public</span> DependencyVersion(String version) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> parseVersion(version);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 327</td> <td class="src"><pre class="src"> <span class="keyword">public</span> DependencyVersion(String version) {</pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 327</td> <td class="src"><pre class="src"> parseVersion(version);</pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"> 327</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
@@ -143,21 +143,21 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">void</span> parseVersion(String version) {</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionParts = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Pattern rx = Pattern.compile(<span class="string">"(\\d+|[a-z]+\\d+|(release|beta|alpha)$)"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Matcher matcher = rx.matcher(version.toLowerCase());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"><a title="Line 70: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 70: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (matcher.find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionParts.add(matcher.group());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 329</td> <td class="src"><pre class="src"> versionParts = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 50% (1/2)."> 329</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (version != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 329</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Pattern rx = Pattern.compile(<span class="string">"(\\d+|[a-z]+\\d+|(release|beta|alpha)$)"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 329</td> <td class="src"><pre class="src"> <span class="keyword">final</span> Matcher matcher = rx.matcher(version.toLowerCase());</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"><a title="Line 70: Conditional coverage 100% (2/2)."> 1377</a></td> <td class="src"><pre class="src"> <a title="Line 70: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (matcher.find()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 1048</td> <td class="src"><pre class="src"> versionParts.add(matcher.group());</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"><a title="Line 73: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 73: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (versionParts.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> versionParts.add(version);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"><a title="Line 73: Conditional coverage 100% (2/2)."> 329</a></td> <td class="src"><pre class="src"> <a title="Line 73: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (versionParts.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> versionParts.add(version);</pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 329</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
@@ -216,7 +216,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Iterator iterator() {</pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> versionParts.iterator();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> versionParts.iterator();</pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
@@ -235,7 +235,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> StringUtils.join(versionParts.toArray(), <span class="string">"."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 40</td> <td class="src"><pre class="src"> <span class="keyword">return</span> StringUtils.join(versionParts.toArray(), <span class="string">"."</span>);</pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
@@ -256,30 +256,30 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object obj) {</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"><a title="Line 128: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 128: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"><a title="Line 128: Conditional coverage 50% (1/2)."> 268</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 128: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (obj == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"><a title="Line 131: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 131: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"><a title="Line 131: Conditional coverage 50% (1/2)."> 268</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 131: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (getClass() != obj.getClass()) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion other = (DependencyVersion) obj;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"><a title="Line 135: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 135: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">int</span> max = (<span class="keyword">this</span>.versionParts.size() < other.versionParts.size())</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 268</td> <td class="src"><pre class="src"> <span class="keyword">final</span> DependencyVersion other = (DependencyVersion) obj;</pre></td></tr>
+<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"><a title="Line 135: Conditional coverage 100% (2/2)."> 268</a></td> <td class="src"><pre class="src"> <a title="Line 135: Conditional coverage 100% (2/2)."> <span class="keyword">final</span> <span class="keyword">int</span> max = (<span class="keyword">this</span>.versionParts.size() < other.versionParts.size())</a></pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ? <span class="keyword">this</span>.versionParts.size() : other.versionParts.size();</pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//TODO steal better version of code from compareTo</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"><a title="Line 138: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 138: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < max; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String thisPart = <span class="keyword">this</span>.versionParts.get(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String otherPart = other.versionParts.get(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsUncovered"><a title="Line 141: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 141: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!thisPart.equals(otherPart)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"><a title="Line 138: Conditional coverage 100% (2/2)."> 679</a></td> <td class="src"><pre class="src"> <a title="Line 138: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < max; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsCovered"> 595</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String thisPart = <span class="keyword">this</span>.versionParts.get(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsCovered"> 595</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String otherPart = other.versionParts.get(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"><a title="Line 141: Conditional coverage 100% (2/2)."> 595</a></td> <td class="src"><pre class="src"> <a title="Line 141: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!thisPart.equals(otherPart)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsCovered"> 184</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 145: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.versionParts.size() > max) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 50% (1/2)."> 84</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 145: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.versionParts.size() > max) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"><a title="Line 146: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 146: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = max; i < <span class="keyword">this</span>.versionParts.size(); i++) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"><a title="Line 147: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 147: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!<span class="string">"0"</span>.equals(<span class="keyword">this</span>.versionParts.get(i))) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
@@ -291,10 +291,10 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"><a title="Line 153: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 153: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (other.versionParts.size() > max) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"><a title="Line 154: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 154: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = max; i < other.versionParts.size(); i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"><a title="Line 155: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 155: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!<span class="string">"0"</span>.equals(other.versionParts.get(i))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"><a title="Line 153: Conditional coverage 100% (2/2)."> 84</a></td> <td class="src"><pre class="src"> <a title="Line 153: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (other.versionParts.size() > max) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"><a title="Line 154: Conditional coverage 50% (1/2)."> 57</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 154: Conditional coverage 50% (1/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = max; i < other.versionParts.size(); i++) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"><a title="Line 155: Conditional coverage 50% (1/2)."> 57</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 155: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!<span class="string">"0"</span>.equals(other.versionParts.get(i))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 57</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
@@ -313,7 +313,7 @@
<td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
@@ -332,9 +332,9 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 5;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"><a title="Line 177: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 177: Conditional coverage 0% (0/2)."> hash = 71 * hash + (<span class="keyword">this</span>.versionParts != <span class="keyword">null</span> ? <span class="keyword">this</span>.versionParts.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">int</span> hash = 5;</pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"><a title="Line 177: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 177: Conditional coverage 50% (1/2)."> hash = 71 * hash + (<span class="keyword">this</span>.versionParts != <span class="keyword">null</span> ? <span class="keyword">this</span>.versionParts.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hash;</pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
@@ -355,35 +355,35 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> matchesAtLeastThreeLevels(DependencyVersion version) {</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"><a title="Line 189: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 189: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"><a title="Line 189: Conditional coverage 50% (1/2)."> 228</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 189: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> ret = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"><a title="Line 194: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 194: Conditional coverage 0% (0/2)."> <span class="keyword">int</span> max = (<span class="keyword">this</span>.versionParts.size() < version.versionParts.size())</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"> 228</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> ret = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"><a title="Line 194: Conditional coverage 100% (2/2)."> 228</a></td> <td class="src"><pre class="src"> <a title="Line 194: Conditional coverage 100% (2/2)."> <span class="keyword">int</span> max = (<span class="keyword">this</span>.versionParts.size() < version.versionParts.size())</a></pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ? <span class="keyword">this</span>.versionParts.size() : version.versionParts.size();</pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"><a title="Line 197: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 197: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (max > 3) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> max = 3;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"><a title="Line 197: Conditional coverage 100% (2/2)."> 228</a></td> <td class="src"><pre class="src"> <a title="Line 197: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (max > 3) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> max = 3;</pre></td></tr>
<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"><a title="Line 201: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 201: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < max; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"><a title="Line 202: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 202: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.versionParts.get(i) == <span class="keyword">null</span> || !<span class="keyword">this</span>.versionParts.get(i).equals(version.versionParts.get(i))) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"><a title="Line 201: Conditional coverage 100% (2/2)."> 563</a></td> <td class="src"><pre class="src"> <a title="Line 201: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < max; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"><a title="Line 202: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 505</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 202: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (<span class="keyword">this</span>.versionParts.get(i) == <span class="keyword">null</span> || !<span class="keyword">this</span>.versionParts.get(i).equals(version.versionParts.get(i))) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 170</td> <td class="src"><pre class="src"> ret = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 170</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 228</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ret;</pre></td></tr>
<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
@@ -392,36 +392,36 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(DependencyVersion version) {</pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"><a title="Line 213: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 213: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"><a title="Line 213: Conditional coverage 50% (1/2)."> 19</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 213: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> 1;</span></pre></td></tr>
<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> left = <span class="keyword">this</span>.getVersionParts();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> List<String> right = version.getVersionParts();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"><a title="Line 218: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 218: Conditional coverage 0% (0/2)."> <span class="keyword">final</span> <span class="keyword">int</span> max = left.size() < right.size() ? left.size() : right.size();</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> left = <span class="keyword">this</span>.getVersionParts();</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">final</span> List<String> right = version.getVersionParts();</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"><a title="Line 218: Conditional coverage 100% (2/2)."> 19</a></td> <td class="src"><pre class="src"> <a title="Line 218: Conditional coverage 100% (2/2)."> <span class="keyword">final</span> <span class="keyword">int</span> max = left.size() < right.size() ? left.size() : right.size();</a></pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"><a title="Line 220: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 220: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < max; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String lStr = left.get(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String rStr = right.get(i);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (lStr.equals(rStr)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">continue</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsCovered"><a title="Line 220: Conditional coverage 100% (2/2)."> 45</a></td> <td class="src"><pre class="src"> <a title="Line 220: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < max; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String lStr = left.get(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String rStr = right.get(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"><a title="Line 223: Conditional coverage 100% (2/2)."> 38</a></td> <td class="src"><pre class="src"> <a title="Line 223: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (lStr.equals(rStr)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> l = Integer.parseInt(lStr);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> r = Integer.parseInt(rStr);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"><a title="Line 229: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 229: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (l < r) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> -1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (l > r) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> 1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> l = Integer.parseInt(lStr);</pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> r = Integer.parseInt(rStr);</pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"><a title="Line 229: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 229: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (l < r) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> -1;</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"><a title="Line 231: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 231: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (l > r) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> 1;</pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> comp = left.get(i).compareTo(right.get(i));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"><a title="Line 236: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 236: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (comp < 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> -1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (NumberFormatException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> comp = left.get(i).compareTo(right.get(i));</pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"><a title="Line 236: Conditional coverage 50% (1/2)."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 236: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (comp < 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> -1;</pre></td></tr>
<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"><a title="Line 238: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 238: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (comp > 0) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> 1;</span></pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
@@ -429,13 +429,13 @@
<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"><a title="Line 243: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 243: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (left.size() < right.size()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> -1;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"><a title="Line 245: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 245: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (left.size() > right.size()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> 1;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"><a title="Line 243: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 243: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (left.size() < right.size()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> -1;</pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"><a title="Line 245: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 245: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (left.size() > right.size()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> 1;</pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> 0;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> 0;</pre></td></tr>
<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
@@ -444,6 +444,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 f7fc0472b..09cb8295d 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.0;</span>7</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.DependencyVersionUtil.html">DependencyVersionUtil</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">23/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">92%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:92px"><span class="text">13/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">7.0;</span>7</td></tr>
</table>
<div class="separator"> </div>
@@ -85,7 +85,7 @@
<td class="src"><pre class="src"> <span class="comment"> * Regular expression to extract version numbers from file names.</span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 35</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern RX_VERSION = Pattern.compile(<span class="string">"\\d+(\\.\\d{1,6})+(\\.?([_-](release|beta|alpha)|[a-zA-Z_-]{1,3}\\d{1,8}))?"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern RX_VERSION = Pattern.compile(<span class="string">"\\d+(\\.\\d{1,6})+(\\.?([_-](release|beta|alpha)|[a-zA-Z_-]{1,3}\\d{1,8}))?"</span>);</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
@@ -94,7 +94,7 @@
<td class="src"><pre class="src"> <span class="comment"> * in case we are missing a version number using the previous regex.</span></pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 40</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern RX_SINGLE_VERSION = Pattern.compile(<span class="string">"\\d+(\\.?([_-](release|beta|alpha)|[a-zA-Z_-]{1,3}\\d{1,8}))?"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern RX_SINGLE_VERSION = Pattern.compile(<span class="string">"\\d+(\\.?([_-](release|beta|alpha)|[a-zA-Z_-]{1,3}\\d{1,8}))?"</span>);</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
@@ -131,56 +131,56 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> DependencyVersion parseVersion(String text) {</pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"><a title="Line 59: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 59: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"><a title="Line 59: Conditional coverage 50% (1/2)."> 298</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 59: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (text == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//'-' is a special case used within the CVE entries, just include it as the version.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"><a title="Line 63: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 63: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"-"</span>.equals(text)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> DependencyVersion dv = <span class="keyword">new</span> DependencyVersion();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<String> list = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> list.add(text);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> dv.setVersionParts(list);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> dv;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"><a title="Line 63: Conditional coverage 100% (2/2)."> 298</a></td> <td class="src"><pre class="src"> <a title="Line 63: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="string">"-"</span>.equals(text)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> DependencyVersion dv = <span class="keyword">new</span> DependencyVersion();</pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<String> list = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> list.add(text);</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dv.setVersionParts(list);</pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dv;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String version = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Matcher matcher = RX_VERSION.matcher(text);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"><a title="Line 72: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 72: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (matcher.find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> version = matcher.group();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 297</td> <td class="src"><pre class="src"> String version = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 297</td> <td class="src"><pre class="src"> Matcher matcher = RX_VERSION.matcher(text);</pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"><a title="Line 72: Conditional coverage 100% (2/2)."> 297</a></td> <td class="src"><pre class="src"> <a title="Line 72: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (matcher.find()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 293</td> <td class="src"><pre class="src"> version = matcher.group();</pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//throw away the results if there are two things that look like version numbers</span></pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"><a title="Line 76: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 76: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (matcher.find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"><a title="Line 76: Conditional coverage 100% (2/2)."> 297</a></td> <td class="src"><pre class="src"> <a title="Line 76: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (matcher.find()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"><a title="Line 79: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 79: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> matcher = RX_SINGLE_VERSION.matcher(text);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsUncovered"><a title="Line 81: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 81: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (matcher.find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> version = matcher.group();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"><a title="Line 79: Conditional coverage 100% (2/2)."> 295</a></td> <td class="src"><pre class="src"> <a title="Line 79: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (version == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> matcher = RX_SINGLE_VERSION.matcher(text);</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"><a title="Line 81: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 81: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (matcher.find()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> version = matcher.group();</pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 84</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//throw away the results if there are two things that look like version numbers</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (matcher.find()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"><a title="Line 87: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 87: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (matcher.find()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> DependencyVersion(version);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 292</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> DependencyVersion(version);</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 50238f8ce..f3c2fc99c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
@@ -155,6 +155,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 2c0ec39e3..986cbb85b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/80</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.25;</span>8.25</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Downloader.html">Downloader</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">19%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:19px"><span class="text">16/81</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">3/30</span></div></div></td></tr></table></td><td class="value"><span class="hidden">8.25;</span>8.25</td></tr>
</table>
<div class="separator"> </div>
@@ -98,229 +98,238 @@
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for utility class.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Downloader() {</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(Downloader.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for utility class.</span></pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieves a file from a given URL and saves it to the outputPath.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Downloader() {</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the file to download</span></pre></td></tr>
-<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param outputPath the path to the save the file to</span></pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if there is an error downloading the file</span></pre></td></tr>
-<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> fetchFile(URL url, File outputPath) <span class="keyword">throws</span> DownloadFailedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fetchFile(url, outputPath, <span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieves a file from a given URL and saves it to the outputPath.</span></pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the file to download</span></pre></td></tr>
-<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param outputPath the path to the save the file to</span></pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param useProxy whether to use the configured proxy when downloading files</span></pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if there is an error downloading the file</span></pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> fetchFile(URL url, File outputPath, <span class="keyword">boolean</span> useProxy) <span class="keyword">throws</span> DownloadFailedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"><a title="Line 66: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 66: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"file"</span>.equalsIgnoreCase(url.getProtocol())) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> File file;</pre></td></tr>
-<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file = <span class="keyword">new</span> File(url.toURI());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Download failed, unable to locate '%s'"</span>, url.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"><a title="Line 74: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 74: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> org.apache.commons.io.FileUtils.copyFile(file, outputPath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Download failed, unable to copy '%s'"</span>, url.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Download failed, file does not exist '%s'"</span>, url.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpURLConnection conn = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.setRequestProperty(<span class="string">"Accept-Encoding"</span>, <span class="string">"gzip, deflate"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.connect();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"><a title="Line 93: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 93: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (conn != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.disconnect();</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error downloading file."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String encoding = conn.getContentEncoding();</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedOutputStream writer = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> InputStream reader = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"><a title="Line 106: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 106: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (encoding != <span class="keyword">null</span> && <span class="string">"gzip"</span>.equalsIgnoreCase(encoding)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = <span class="keyword">new</span> GZIPInputStream(conn.getInputStream());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"><a title="Line 108: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 108: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (encoding != <span class="keyword">null</span> && <span class="string">"deflate"</span>.equalsIgnoreCase(encoding)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = <span class="keyword">new</span> InflaterInputStream(conn.getInputStream());</span></pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = conn.getInputStream();</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer = <span class="keyword">new</span> BufferedOutputStream(<span class="keyword">new</span> FileOutputStream(outputPath));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[4096];</span></pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">int</span> bytesRead;</pre></td></tr>
-<tr> <td class="numLineCover"> 117</td> <td class="nbHitsUncovered"><a title="Line 117: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 117: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((bytesRead = reader.read(buffer)) > 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 118</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.write(buffer, 0, bytesRead);</span></pre></td></tr>
-<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error saving downloaded file."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"><a title="Line 123: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 123: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (writer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Downloader.<span class="keyword">class</span>.getName()).log(Level.FINEST,</span></pre></td></tr>
-<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Error closing the writer in Downloader."</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"><a title="Line 131: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 131: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (reader != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Downloader.<span class="keyword">class</span>.getName()).log(Level.FINEST,</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Error closing the reader in Downloader."</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.disconnect();</span></pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Makes an HTTP Head request to retrieve the last modified date of the given URL. If the file:// protocol is</span></pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * specified, then the lastTimestamp of the file is returned.</span></pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param url the URL to retrieve the timestamp from</span></pre></td></tr>
-<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return an epoch timestamp</span></pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if an exception occurs making the HTTP request</span></pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">long</span> getLastModified(URL url) <span class="keyword">throws</span> DownloadFailedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">long</span> timestamp = 0;</span></pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">//TODO add the FTP protocol?</span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"><a title="Line 159: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 159: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (<span class="string">"file"</span>.equalsIgnoreCase(url.getProtocol())) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> File lastModifiedFile;</pre></td></tr>
-<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> lastModifiedFile = <span class="keyword">new</span> File(url.toURI());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to locate '%s'; is the cve.url-2.0.modified property set correctly?"</span>, url.toString());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> timestamp = lastModifiedFile.lastModified();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpURLConnection conn = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = URLConnectionFactory.createHttpURLConnection(url);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 172</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.setRequestMethod(<span class="string">"HEAD"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.connect();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> timestamp = conn.getLastModified();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URLConnectionFailureException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error creating URL Connection for HTTP HEAD request."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error making HTTP HEAD request."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"><a title="Line 180: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 180: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (conn != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.disconnect();</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> timestamp;</span></pre></td></tr>
-<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Retrieves a file from a given URL and saves it to the outputPath.</span></pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the file to download</span></pre></td></tr>
+<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param outputPath the path to the save the file to</span></pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if there is an error downloading the file</span></pre></td></tr>
+<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> fetchFile(URL url, File outputPath) <span class="keyword">throws</span> DownloadFailedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fetchFile(url, outputPath, <span class="keyword">true</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Retrieves a file from a given URL and saves it to the outputPath.</span></pre></td></tr>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param url the URL of the file to download</span></pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param outputPath the path to the save the file to</span></pre></td></tr>
+<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param useProxy whether to use the configured proxy when downloading files</span></pre></td></tr>
+<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if there is an error downloading the file</span></pre></td></tr>
+<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> fetchFile(URL url, File outputPath, <span class="keyword">boolean</span> useProxy) <span class="keyword">throws</span> DownloadFailedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"><a title="Line 71: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 71: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"file"</span>.equalsIgnoreCase(url.getProtocol())) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> File file;</pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> file = <span class="keyword">new</span> File(url.toURI());</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Download failed, unable to locate '%s'"</span>, url.toString());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"><a title="Line 79: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 79: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (file.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> org.apache.commons.io.FileUtils.copyFile(file, outputPath);</pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Download failed, unable to copy '%s'"</span>, url.toString());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 84</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Download failed, file does not exist '%s'"</span>, url.toString());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpURLConnection conn = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.setRequestProperty(<span class="string">"Accept-Encoding"</span>, <span class="string">"gzip, deflate"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.connect();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"><a title="Line 98: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 98: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (conn != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.disconnect();</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error downloading file."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String encoding = conn.getContentEncoding();</span></pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedOutputStream writer = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> InputStream reader = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"><a title="Line 111: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 111: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (encoding != <span class="keyword">null</span> && <span class="string">"gzip"</span>.equalsIgnoreCase(encoding)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = <span class="keyword">new</span> GZIPInputStream(conn.getInputStream());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"><a title="Line 113: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 113: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> } <span class="keyword">else</span> <span class="keyword">if</span> (encoding != <span class="keyword">null</span> && <span class="string">"deflate"</span>.equalsIgnoreCase(encoding)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = <span class="keyword">new</span> InflaterInputStream(conn.getInputStream());</span></pre></td></tr>
+<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader = conn.getInputStream();</span></pre></td></tr>
+<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 119</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer = <span class="keyword">new</span> BufferedOutputStream(<span class="keyword">new</span> FileOutputStream(outputPath));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 120</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[4096];</span></pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">int</span> bytesRead;</pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsUncovered"><a title="Line 122: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 122: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((bytesRead = reader.read(buffer)) > 0) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.write(buffer, 0, bytesRead);</span></pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error saving downloaded file."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsUncovered"><a title="Line 128: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 128: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (writer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 130</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> writer.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST,</span></pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"Error closing the writer in Downloader."</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"><a title="Line 136: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 136: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (reader != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> reader.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 140</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST,</span></pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"Error closing the reader in Downloader."</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.disconnect();</span></pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Makes an HTTP Head request to retrieve the last modified date of the given URL. If the file:// protocol is</span></pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * specified, then the lastTimestamp of the file is returned.</span></pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param url the URL to retrieve the timestamp from</span></pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return an epoch timestamp</span></pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws DownloadFailedException is thrown if an exception occurs making the HTTP request</span></pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">long</span> getLastModified(URL url) <span class="keyword">throws</span> DownloadFailedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">long</span> timestamp = 0;</pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//TODO add the FTP protocol?</span></pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsUncovered"><a title="Line 164: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 164: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"file"</span>.equalsIgnoreCase(url.getProtocol())) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> File lastModifiedFile;</pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> lastModifiedFile = <span class="keyword">new</span> File(url.toURI());</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to locate '%s'; is the cve.url-2.0.modified property set correctly?"</span>, url.toString());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> timestamp = lastModifiedFile.lastModified();</pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpURLConnection conn = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = URLConnectionFactory.createHttpURLConnection(url);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.setRequestMethod(<span class="string">"HEAD"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.connect();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> timestamp = conn.getLastModified();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URLConnectionFailureException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error creating URL Connection for HTTP HEAD request."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> DownloadFailedException(<span class="string">"Error making HTTP HEAD request."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"><a title="Line 185: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 185: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (conn != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.disconnect();</span></pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> timestamp;</pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 6fb0770ca..4ea3e1ec7 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
@@ -155,6 +155,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 b6f65b15a..2b0e1990e 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 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/87</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/38</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.777777777777778;</span>4.778</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.FileUtils.html">FileUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:16px"><span class="text">14/85</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">11%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:11px"><span class="text">4/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.444444444444445;</span>4.444</td></tr>
</table>
<div class="separator"> </div>
@@ -104,362 +104,362 @@
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Bit bucket for non-Windows systems</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String BIT_BUCKET_UNIX = <span class="string">"/dev/null"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Bit bucket for non-Windows systems</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Bit bucket for Windows systems (yes, only one 'L')</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String BIT_BUCKET_UNIX = <span class="string">"/dev/null"</span>;</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String BIT_BUCKET_WIN = <span class="string">"NUL"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Bit bucket for Windows systems (yes, only one 'L')</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The buffer size to use when extracting files from the archive.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String BIT_BUCKET_WIN = <span class="string">"NUL"</span>;</pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> BUFFER_SIZE = 4096;</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The buffer size to use when extracting files from the archive.</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> BUFFER_SIZE = 4096;</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> FileUtils() {</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the (lowercase) file extension for a specified file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> FileUtils() {</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param fileName the file name to retrieve the file extension from.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the file extension.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the (lowercase) file extension for a specified file.</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param fileName the file name to retrieve the file extension from.</span></pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the file extension.</span></pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getFileExtension(String fileName) {</pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String ret = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> pos = fileName.lastIndexOf(<span class="string">"."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"><a title="Line 73: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 73: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pos >= 0) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ret;</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 871</td> <td class="src"><pre class="src"> String ret = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 871</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> pos = fileName.lastIndexOf(<span class="string">"."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"><a title="Line 77: Conditional coverage 100% (2/2)."> 871</a></td> <td class="src"><pre class="src"> <a title="Line 77: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (pos >= 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 868</td> <td class="src"><pre class="src"> ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Deletes a file. If the File is a directory it will recursively delete the contents.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 871</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ret;</pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param file the File to delete</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return true if the file was deleted successfully, otherwise false</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Deletes a file. If the File is a directory it will recursively delete the contents.</span></pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param file the File to delete</span></pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return true if the file was deleted successfully, otherwise false</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> delete(File file) {</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">boolean</span> success = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsUncovered"><a title="Line 87: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 87: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> success = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Failed to delete file: %s; attempting to delete on exit."</span>, file.getPath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName()).log(Level.FINE, msg);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file.deleteOnExit();</span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> success;</span></pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> success = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"><a title="Line 91: Conditional coverage 50% (1/2)."> 9</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 91: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> success = <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Failed to delete file: %s; attempting to delete on exit."</span>, file.getPath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> file.deleteOnExit();</span></pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Generates a new temporary file name that is guaranteed to be unique.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">return</span> success;</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param prefix the prefix for the file name to generate</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param extension the extension of the generated file name</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a temporary File</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Generates a new temporary file name that is guaranteed to be unique.</span></pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws java.io.IOException thrown if the temporary folder could not be created</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param prefix the prefix for the file name to generate</span></pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param extension the extension of the generated file name</span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a temporary File</span></pre></td></tr>
+<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws java.io.IOException thrown if the temporary folder could not be created</span></pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getTempFile(String prefix, String extension) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File dir = Settings.getTempDirectory();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"><a title="Line 106: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 106: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!dir.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"><a title="Line 107: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 107: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!dir.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(<span class="string">"Unable to create temporary folder"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File dir = Settings.getTempDirectory();</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String tempFileName = String.format(<span class="string">"%s%s.%s"</span>, prefix, UUID.randomUUID().toString(), extension);</pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File tempFile = <span class="keyword">new</span> File(dir, tempFileName);</pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"><a title="Line 112: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 112: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (tempFile.exists()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getTempFile(prefix, extension);</span></pre></td></tr>
+<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String tempFileName = String.format(<span class="string">"%s%s.%s"</span>, prefix, UUID.randomUUID().toString(), extension);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File tempFile = <span class="keyword">new</span> File(dir, tempFileName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"><a title="Line 113: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 113: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (tempFile.exists()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> getTempFile(prefix, extension);</span></pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> tempFile;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> tempFile;</pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Returns the data directory. If a path was specified in dependencycheck.properties or was specified using the</span></pre></td></tr>
-<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Settings object, and the path exists, that path will be returned as a File object. If it does not exist, then a</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * File object will be created based on the file location of the JAR containing the specified class.</span></pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param configuredFilePath the configured relative or absolute path</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param clazz the class to resolve the path</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return a File object</span></pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown if the path could not be decoded</span></pre></td></tr>
-<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @deprecated This method should no longer be used. See the implementation in dependency-check-cli/App.java to see</span></pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * how the data directory should be set.</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> @java.lang.Deprecated</pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @java.lang.Deprecated</pre></td></tr>
-<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getDataDirectory(String configuredFilePath, Class clazz) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(configuredFilePath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"><a title="Line 134: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 134: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (file.isDirectory() && file.canWrite()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(file.getCanonicalPath());</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(configuredFilePath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 133</td> <td class="nbHitsUncovered"><a title="Line 133: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 133: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (file.isDirectory() && file.canWrite()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(file.getCanonicalPath());</span></pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File exePath = getPathToJar(clazz);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(exePath, configuredFilePath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File exePath = getPathToJar(clazz);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(exePath, configuredFilePath);</span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Retrieves the physical path to the parent directory containing the provided class. For example, if a JAR file</span></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * contained a class org.something.clazz this method would return the parent directory of the JAR file.</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param clazz the class to determine the parent directory of</span></pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return the parent directory of the file containing the specified class.</span></pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws UnsupportedEncodingException thrown if UTF-8 is not supported.</span></pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @deprecated this should no longer be used.</span></pre></td></tr>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @java.lang.Deprecated</pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getPathToJar(Class clazz) <span class="keyword">throws</span> UnsupportedEncodingException {</pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String filePath = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String decodedPath = URLDecoder.decode(filePath, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File jarPath = <span class="keyword">new</span> File(decodedPath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> jarPath.getParentFile();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String filePath = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String decodedPath = URLDecoder.decode(filePath, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File jarPath = <span class="keyword">new</span> File(decodedPath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> jarPath.getParentFile();</span></pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Extracts the contents of an archive into the specified directory.</span></pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param archive an archive file such as a WAR or EAR</span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param archive an archive file such as a WAR or EAR</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param extractTo a directory to extract the contents to</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param extractTo a directory to extract the contents to</span></pre></td></tr>
-<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws ExtractionException thrown if an exception occurs while extracting the files</span></pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> extractFiles(File archive, File extractTo) <span class="keyword">throws</span> ExtractionException {</pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractFiles(archive, extractTo, <span class="keyword">null</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> extractFiles(archive, extractTo, <span class="keyword">null</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Extracts the contents of an archive into the specified directory. The files are only extracted if they are</span></pre></td></tr>
-<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * supported by the analyzers loaded into the specified engine. If the engine is specified as null then all files</span></pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * are extracted.</span></pre></td></tr>
+<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param archive an archive file such as a WAR or EAR</span></pre></td></tr>
-<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param extractTo a directory to extract the contents to</span></pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @param engine the scanning engine</span></pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @throws ExtractionException thrown if there is an error extracting the files</span></pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> extractFiles(File archive, File extractTo, Engine engine) <span class="keyword">throws</span> ExtractionException {</pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 181: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (archive == <span class="keyword">null</span> || extractTo == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsUncovered"><a title="Line 180: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 180: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (archive == <span class="keyword">null</span> || extractTo == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FileInputStream fis = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ZipInputStream zis = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> FileInputStream fis = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ZipInputStream zis = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fis = <span class="keyword">new</span> FileInputStream(archive);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(<span class="string">"Archive file was not found."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> zis = <span class="keyword">new</span> ZipInputStream(<span class="keyword">new</span> BufferedInputStream(fis));</span></pre></td></tr>
-<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fis = <span class="keyword">new</span> FileInputStream(archive);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(<span class="string">"Archive file was not found."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> zis = <span class="keyword">new</span> ZipInputStream(<span class="keyword">new</span> BufferedInputStream(fis));</span></pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ZipEntry entry;</pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"><a title="Line 197: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 197: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((entry = zis.getNextEntry()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"><a title="Line 198: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 198: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (entry.isDirectory()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File d = <span class="keyword">new</span> File(extractTo, entry.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"><a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 200: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (!d.exists() && !d.mkdirs()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create '%s'."</span>, d.getAbsolutePath());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg);</span></pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsUncovered"><a title="Line 196: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 196: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((entry = zis.getNextEntry()) != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsUncovered"><a title="Line 197: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 197: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (entry.isDirectory()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File d = <span class="keyword">new</span> File(extractTo, entry.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"><a title="Line 199: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 199: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (!d.exists() && !d.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to create '%s'."</span>, d.getAbsolutePath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg);</span></pre></td></tr>
+<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(extractTo, entry.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String ext = getFileExtension(file.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"><a title="Line 207: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 207: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (engine == <span class="keyword">null</span> || engine.supportsExtension(ext)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedOutputStream bos = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File file = <span class="keyword">new</span> File(extractTo, entry.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String ext = getFileExtension(file.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsUncovered"><a title="Line 206: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 206: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (engine == <span class="keyword">null</span> || engine.supportsExtension(ext)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> BufferedOutputStream bos = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> FileOutputStream fos;</pre></td></tr>
-<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fos = <span class="keyword">new</span> FileOutputStream(file);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos = <span class="keyword">new</span> BufferedOutputStream(fos, BUFFER_SIZE);</span></pre></td></tr>
-<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fos = <span class="keyword">new</span> FileOutputStream(file);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos = <span class="keyword">new</span> BufferedOutputStream(fos, BUFFER_SIZE);</span></pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">int</span> count;</pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span> data[] = <span class="keyword">new</span> <span class="keyword">byte</span>[BUFFER_SIZE];</span></pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"><a title="Line 215: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 215: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.write(data, 0, count);</span></pre></td></tr>
-<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">byte</span> data[] = <span class="keyword">new</span> <span class="keyword">byte</span>[BUFFER_SIZE];</span></pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"><a title="Line 214: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 214: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.write(data, 0, count);</span></pre></td></tr>
+<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.flush();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to find file '%s'."</span>, file.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IO Exception while parsing file '%s'."</span>, file.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.flush();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to find file '%s'."</span>, file.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"IO Exception while parsing file '%s'."</span>, file.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 228</td> <td class="nbHitsUncovered"><a title="Line 228: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 228: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (bos != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"><a title="Line 227: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 227: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (bos != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> bos.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception reading archive '%s'."</span>, archive.getName());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName()).log(Level.FINE, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Exception reading archive '%s'."</span>, archive.getName());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, msg, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 241</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> ExtractionException(msg, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">try</span> {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> zis.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(FileUtils.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">try</span> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 244</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> zis.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * Return the bit bucket for the OS. '/dev/null' for Unix and 'NUL' for Windows</span></pre></td></tr>
-<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * @return a String containing the bit bucket</span></pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getBitBucket() {</pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"><a title="Line 258: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 258: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (System.getProperty(<span class="string">"os.name"</span>).startsWith(<span class="string">"Windows"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> BIT_BUCKET_WIN;</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"><a title="Line 257: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 257: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (System.getProperty(<span class="string">"os.name"</span>).startsWith(<span class="string">"Windows"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> BIT_BUCKET_WIN;</span></pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> BIT_BUCKET_UNIX;</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> BIT_BUCKET_UNIX;</span></pre></td></tr>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 a0117cc18..fa98aba78 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
@@ -12,9 +12,9 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$FilterIterator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">1/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Filter.html">Filter$FilterIterator</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">90%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">18/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">80%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">8/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.6666666666666667;</span>1.667</td></tr>
</table>
<div class="separator"> </div>
@@ -57,19 +57,19 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 19</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Iterator<T> filter(Iterator<T> iterator) {</pre></td></tr>
-<tr> <td class="numLineCover"> 20</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> FilterIterator(iterator);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 20</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> FilterIterator(iterator);</pre></td></tr>
<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 22</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Iterable<T> filter(<span class="keyword">final</span> Iterable<T> iterable) {</pre></td></tr>
-<tr> <td class="numLineCover"> 24</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> Iterable<T>() {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 24</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> Iterable<T>() {</pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Iterator<T> iterator() {</pre></td></tr>
-<tr> <td class="numLineCover"> 27</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> filter(iterable.iterator());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 27</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> <span class="keyword">return</span> filter(iterable.iterator());</pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
@@ -78,7 +78,7 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 32</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">class</span> FilterIterator <span class="keyword">implements</span> Iterator<T> {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> FilterIterator <span class="keyword">implements</span> Iterator<T> {</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
@@ -87,28 +87,28 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> T next;</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 37</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> FilterIterator(Iterator<T> iterator) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.iterator = iterator;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> toNext();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 40</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> <span class="keyword">private</span> FilterIterator(Iterator<T> iterator) {</pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.iterator = iterator;</pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> toNext();</pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 157</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> hasNext() {</pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"><a title="Line 43: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 43: Conditional coverage 0% (0/2)."> <span class="keyword">return</span> next != <span class="keyword">null</span>;</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"><a title="Line 43: Conditional coverage 100% (2/2)."> 962</a></td> <td class="src"><pre class="src"> <a title="Line 43: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> next != <span class="keyword">null</span>;</a></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> T next() {</pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"><a title="Line 47: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 47: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (next == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 47</td> <td class="nbHitsUncovered"><a title="Line 47: Conditional coverage 50% (1/2)."> 849</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 47: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (next == <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NoSuchElementException();</span></pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> T returnValue = next;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> toNext();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> returnValue;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 849</td> <td class="src"><pre class="src"> T returnValue = next;</pre></td></tr>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 849</td> <td class="src"><pre class="src"> toNext();</pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 849</td> <td class="src"><pre class="src"> <span class="keyword">return</span> returnValue;</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
@@ -122,22 +122,22 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> toNext() {</pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> next = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"><a title="Line 61: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 61: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (iterator.hasNext()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> T item = iterator.next();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"><a title="Line 63: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 63: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (item != <span class="keyword">null</span> && passes(item)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> next = item;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 1006</td> <td class="src"><pre class="src"> next = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"><a title="Line 61: Conditional coverage 100% (2/2)."> 1444</a></td> <td class="src"><pre class="src"> <a title="Line 61: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (iterator.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 1329</td> <td class="src"><pre class="src"> T item = iterator.next();</pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"><a title="Line 63: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 1329</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 63: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (item != <span class="keyword">null</span> && passes(item)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 891</td> <td class="src"><pre class="src"> next = item;</pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 891</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 438</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 1006</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 0a9db20a7..5ac300a77 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
@@ -155,6 +155,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 17f4bc160..e35708ea8 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogFilter.html
@@ -101,6 +101,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 9bf5e3492..7744a350f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogUtils.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/23</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.LogUtils.html">LogUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">12%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:12px"><span class="text">3/24</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
</table>
<div class="separator"> </div>
@@ -88,90 +88,99 @@
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> LogUtils() {</pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(LogUtils.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for a utility class.</span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Configures the logger for use by the application.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> LogUtils() {</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param in the input stream to read the log settings from</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param verboseLogFile the file path for the verbose log</span></pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> prepareLogger(InputStream in, String verboseLogFile) {</pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LogManager.getLogManager().reset();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LogManager.getLogManager().readConfiguration(in);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsUncovered"><a title="Line 51: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 51: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (verboseLogFile != <span class="keyword">null</span> && !verboseLogFile.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> verboseLoggingEnabled = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Logger logger = Logger.getLogger(<span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> FileHandler handler = <span class="keyword">new</span> FileHandler(verboseLogFile, <span class="keyword">true</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> handler.setFormatter(<span class="keyword">new</span> SimpleFormatter());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> handler.setLevel(Level.FINE);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> handler.setFilter(<span class="keyword">new</span> LogFilter());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> logger.addHandler(handler);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> logger.setLevel(Level.FINE);</span></pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(LogUtils.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"IO Error preparing the logger"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SecurityException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(LogUtils.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Error preparing the logger"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"><a title="Line 66: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 66: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (in != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(LogUtils.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="string">"Error closing resource stream"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Whether or not verbose logging is enabled.</span></pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">boolean</span> verboseLoggingEnabled = <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Configures the logger for use by the application.</span></pre></td></tr>
+<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param in the input stream to read the log settings from</span></pre></td></tr>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param verboseLogFile the file path for the verbose log</span></pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> prepareLogger(InputStream in, String verboseLogFile) {</pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LogManager.getLogManager().reset();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LogManager.getLogManager().readConfiguration(in);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"><a title="Line 56: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 56: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (verboseLogFile != <span class="keyword">null</span> && !verboseLogFile.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> verboseLoggingEnabled = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Logger logger = Logger.getLogger(<span class="string">""</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> FileHandler handler = <span class="keyword">new</span> FileHandler(verboseLogFile, <span class="keyword">true</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> handler.setFormatter(<span class="keyword">new</span> SimpleFormatter());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> handler.setLevel(Level.FINE);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> handler.setFilter(<span class="keyword">new</span> LogFilter());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> logger.addHandler(handler);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> logger.setLevel(Level.FINE);</span></pre></td></tr>
+<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"IO Error preparing the logger"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (SecurityException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Error preparing the logger"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"><a title="Line 71: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 71: Conditional coverage 0% (0/8) [each condition: 0%, 0%, 0%, 0%]."> <span class="keyword">if</span> (in != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in.close();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="string">"Error closing resource stream"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Get the value of verboseLoggingEnabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Whether or not verbose logging is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the value of verboseLoggingEnabled</span></pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">boolean</span> verboseLoggingEnabled = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> isVerboseLoggingEnabled() {</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> verboseLoggingEnabled;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Get the value of verboseLoggingEnabled.</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the value of verboseLoggingEnabled</span></pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> isVerboseLoggingEnabled() {</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> verboseLoggingEnabled;</pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 4548512f3..ed873cb19 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.NonClosingStream.html">NonClosingStream</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">1/1</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator"> </div>
@@ -107,11 +107,11 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> close() {</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// don't close the stream.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 dd2a9dfcf..d7288fdce 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.Pair.html">Pair</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/14</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.75;</span>2.75</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Pair.html">Pair</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">28%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:28px"><span class="text">4/14</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">2/20</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.75;</span>2.75</td></tr>
</table>
<div class="separator"> </div>
@@ -211,10 +211,10 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">int</span> hash = 3;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"><a title="Line 99: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 99: Conditional coverage 0% (0/2)."> hash = 53 * hash + (<span class="keyword">this</span>.left != <span class="keyword">null</span> ? <span class="keyword">this</span>.left.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"><a title="Line 100: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 100: Conditional coverage 0% (0/2)."> hash = 53 * hash + (<span class="keyword">this</span>.right != <span class="keyword">null</span> ? <span class="keyword">this</span>.right.hashCode() : 0);</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> hash;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 21505</td> <td class="src"><pre class="src"> <span class="keyword">int</span> hash = 3;</pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"><a title="Line 99: Conditional coverage 50% (1/2)."> 21505</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 99: Conditional coverage 50% (1/2)."> hash = 53 * hash + (<span class="keyword">this</span>.left != <span class="keyword">null</span> ? <span class="keyword">this</span>.left.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"><a title="Line 100: Conditional coverage 50% (1/2)."> 21505</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 100: Conditional coverage 50% (1/2)."> hash = 53 * hash + (<span class="keyword">this</span>.right != <span class="keyword">null</span> ? <span class="keyword">this</span>.right.hashCode() : 0);</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 21505</td> <td class="src"><pre class="src"> <span class="keyword">return</span> hash;</pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
@@ -259,6 +259,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 c0e31b4fe..09ae83930 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
@@ -12,8 +12,8 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/118</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.55;</span>2.55</td></tr>
- <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings$KEYS</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.55;</span>2.55</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">52%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:52px"><span class="text">72/137</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">44%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:44px"><span class="text">16/36</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.Settings.html">Settings$KEYS</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5416666666666665;</span>2.542</td></tr>
</table>
<div class="separator"> </div>
@@ -99,44 +99,45 @@
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">//<editor-fold defaultstate="collapsed" desc="KEYS used to access settings"></span></pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
-<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(Settings.<span class="keyword">class</span>.getName());</span></pre></td></tr>
-<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The collection of keys used within the properties file.</span></pre></td></tr>
-<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">class</span> KEYS {</pre></td></tr>
-<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * private constructor because this is a "utility" class containing constants</span></pre></td></tr>
-<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> KEYS() {</pre></td></tr>
-<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//do nothing</span></pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key indicating whether or not the cached data sources should be updated.</span></pre></td></tr>
+<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String AUTO_UPDATE = <span class="string">"autoupdate"</span>;</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key indicating whether or not the cached data sources should be updated.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The database driver class name. If this is not in the properties file the embedded database is used.</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String AUTO_UPDATE = <span class="string">"autoupdate"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_DRIVER_NAME = <span class="string">"data.driver_name"</span>;</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
@@ -144,880 +145,974 @@
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_DRIVER_NAME = <span class="string">"data.driver_name"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_DRIVER_PATH = <span class="string">"data.driver_path"</span>;</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The database driver class name. If this is not in the properties file the embedded database is used.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The database connection string. If this is not in the properties file the embedded database is used.</span></pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_DRIVER_PATH = <span class="string">"data.driver_path"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_CONNECTION_STRING = <span class="string">"data.connection_string"</span>;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The database connection string. If this is not in the properties file the embedded database is used.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The username to use when connecting to the database.</span></pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_CONNECTION_STRING = <span class="string">"data.connection_string"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_USER = <span class="string">"data.user"</span>;</pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The username to use when connecting to the database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The password to authenticate to the database.</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_USER = <span class="string">"data.user"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_PASSWORD = <span class="string">"data.password"</span>;</pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The password to authenticate to the database.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The base path to use for the data directory (for embedded db).</span></pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DB_PASSWORD = <span class="string">"data.password"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DATA_DIRECTORY = <span class="string">"data.directory"</span>;</pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The base path to use for the data directory (for embedded db).</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the URL to retrieve the "meta" data from about the CVE entries.</span></pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DATA_DIRECTORY = <span class="string">"data.directory"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_META_URL = <span class="string">"cve.url.meta"</span>;</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the URL to retrieve the "meta" data from about the CVE entries.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_META_URL = <span class="string">"cve.url.meta"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using</span></pre></td></tr>
-<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * the 2.0 schema.</span></pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_MODIFIED_20_URL = <span class="string">"cve.url-2.0.modified"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using</span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * the 1.2 schema.</span></pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_MODIFIED_12_URL = <span class="string">"cve.url-1.2.modified"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days).</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_MODIFIED_12_URL = <span class="string">"cve.url-1.2.modified"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_MODIFIED_VALID_FOR_DAYS = <span class="string">"cve.url.modified.validfordays"</span>;</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days).</span></pre></td></tr>
-<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_MODIFIED_VALID_FOR_DAYS = <span class="string">"cve.url.modified.validfordays"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * The properties key for the telling us how many cvr.url.* URLs exists. This is used in combination with</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * CVE_BASE_URL to be able to retrieve the URLs for all of the files that make up the NVD CVE listing.</span></pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_START_YEAR = <span class="string">"cve.startyear"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the CVE schema version 1.2.</span></pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_START_YEAR = <span class="string">"cve.startyear"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_SCHEMA_1_2 = <span class="string">"cve.url-1.2.base"</span>;</pre></td></tr>
<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the CVE schema version 1.2.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the CVE schema version 2.0.</span></pre></td></tr>
<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_SCHEMA_1_2 = <span class="string">"cve.url-1.2.base"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_SCHEMA_2_0 = <span class="string">"cve.url-2.0.base"</span>;</pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the CVE schema version 2.0.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy url.</span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CVE_SCHEMA_2_0 = <span class="string">"cve.url-2.0.base"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_URL = <span class="string">"proxy.url"</span>;</pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy url.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy port - this must be an integer value.</span></pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_URL = <span class="string">"proxy.url"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_PORT = <span class="string">"proxy.port"</span>;</pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy port - this must be an integer value.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy username.</span></pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_PORT = <span class="string">"proxy.port"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_USERNAME = <span class="string">"proxy.username"</span>;</pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy username.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy password.</span></pre></td></tr>
<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_USERNAME = <span class="string">"proxy.username"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_PASSWORD = <span class="string">"proxy.password"</span>;</pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the proxy password.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the connection timeout.</span></pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROXY_PASSWORD = <span class="string">"proxy.password"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CONNECTION_TIMEOUT = <span class="string">"connection.timeout"</span>;</pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the connection timeout.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The location of the temporary directory.</span></pre></td></tr>
<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String CONNECTION_TIMEOUT = <span class="string">"connection.timeout"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String TEMP_DIRECTORY = <span class="string">"temp.directory"</span>;</pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The location of the temporary directory.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The maximum number of threads to allocate when downloading files.</span></pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String TEMP_DIRECTORY = <span class="string">"temp.directory"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String MAX_DOWNLOAD_THREAD_POOL_SIZE = <span class="string">"max.download.threads"</span>;</pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The maximum number of threads to allocate when downloading files.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The key for a list of suppression files.</span></pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String MAX_DOWNLOAD_THREAD_POOL_SIZE = <span class="string">"max.download.threads"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String SUPPRESSION_FILE = <span class="string">"suppression.file"</span>;</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The key for a list of suppression files.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the Jar Analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String SUPPRESSION_FILE = <span class="string">"suppression.file"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_JAR_ENABLED = <span class="string">"analyzer.jar.enabled"</span>;</pre></td></tr>
<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the Jar Analyzer is enabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the Archive analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_JAR_ENABLED = <span class="string">"analyzer.jar.enabled"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_ARCHIVE_ENABLED = <span class="string">"analyzer.archive.enabled"</span>;</pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the Archive analyzer is enabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the .NET Assembly analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_ARCHIVE_ENABLED = <span class="string">"analyzer.archive.enabled"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_ASSEMBLY_ENABLED = <span class="string">"analyzer.assembly.enabled"</span>;</pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the .NET Assembly analyzer is enabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the .NET Nuspec analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_ASSEMBLY_ENABLED = <span class="string">"analyzer.assembly.enabled"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NUSPEC_ENABLED = <span class="string">"analyzer.nuspec.enabled"</span>;</pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the .NET Nuspec analyzer is enabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the JavaScript analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NUSPEC_ENABLED = <span class="string">"analyzer.nuspec.enabled"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_JAVASCRIPT_ENABLED = <span class="string">"analyzer.javascript.enabled"</span>;</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the JavaScript analyzer is enabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the Nexus analyzer is enabled.</span></pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_JAVASCRIPT_ENABLED = <span class="string">"analyzer.javascript.enabled"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NEXUS_ENABLED = <span class="string">"analyzer.nexus.enabled"</span>;</pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether the Nexus analyzer is enabled.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for the Nexus search URL.</span></pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NEXUS_ENABLED = <span class="string">"analyzer.nexus.enabled"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NEXUS_URL = <span class="string">"analyzer.nexus.url"</span>;</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for the Nexus search URL.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for using the proxy to reach Nexus.</span></pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NEXUS_URL = <span class="string">"analyzer.nexus.url"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NEXUS_PROXY = <span class="string">"analyzer.nexus.proxy"</span>;</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for using the proxy to reach Nexus.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The path to mono, if available.</span></pre></td></tr>
<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_NEXUS_PROXY = <span class="string">"analyzer.nexus.proxy"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_ASSEMBLY_MONO_PATH = <span class="string">"analyzer.assembly.mono.path"</span>;</pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The path to mono, if available.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The additional configured zip file extensions, if available.</span></pre></td></tr>
<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ANALYZER_ASSEMBLY_MONO_PATH = <span class="string">"analyzer.assembly.mono.path"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ADDITIONAL_ZIP_EXTENSIONS = <span class="string">"extensions.zip"</span>;</pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The additional configured zip file extensions, if available.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether Test Scope dependencies should be skipped.</span></pre></td></tr>
<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String ADDITIONAL_ZIP_EXTENSIONS = <span class="string">"extensions.zip"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String SKIP_TEST_SCOPE = <span class="string">"skip.test.scope"</span>;</pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether Test Scope dependencies should be skipped.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether Runtime Scope dependencies should be skipped.</span></pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String SKIP_TEST_SCOPE = <span class="string">"skip.test.scope"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String SKIP_RUNTIME_SCOPE = <span class="string">"skip.runtime.scope"</span>;</pre></td></tr>
<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether Runtime Scope dependencies should be skipped.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether Provided Scope dependencies should be skipped.</span></pre></td></tr>
<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String SKIP_RUNTIME_SCOPE = <span class="string">"skip.runtime.scope"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties key for whether Provided Scope dependencies should be skipped.</span></pre></td></tr>
-<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String SKIP_PROVIDED_SCOPE = <span class="string">"skip.provided.scope"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">//</editor-fold></span></pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The logger.</span></pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties file location.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger LOGGER = Logger.getLogger(Settings.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROPERTIES_FILE = <span class="string">"dependencycheck.properties"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties file location.</span></pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The singleton instance variable.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String PROPERTIES_FILE = <span class="string">"dependencycheck.properties"</span>;</pre></td></tr>
<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Settings INSTANCE = <span class="keyword">new</span> Settings();</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Thread local settings.</span></pre></td></tr>
<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * The properties.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> ThreadLocal<Settings> localSettings = <span class="keyword">new</span> ThreadLocal();</pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> Properties props = <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * The properties.</span></pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Private constructor for the Settings class. This class loads the properties files.</span></pre></td></tr>
-<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> Settings() {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> InputStream in = <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> props = <span class="keyword">new</span> Properties();</span></pre></td></tr>
-<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in = <span class="keyword">this</span>.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> props.load(in);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.SEVERE, <span class="string">"Unable to load default settings."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"><a title="Line 227: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 227: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (in != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> in.close();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> logProperties(<span class="string">"Properties loaded"</span>, props);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Properties props = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Private constructor for the Settings class. This class loads the properties files.</span></pre></td></tr>
+<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Settings() {</pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> InputStream in = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> props = <span class="keyword">new</span> Properties();</pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> in = <span class="keyword">this</span>.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);</pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> props.load(in);</pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.SEVERE, <span class="string">"Unable to load default settings."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"><a title="Line 229: Conditional coverage 50% (1/2)."> 15</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 229: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (in != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> in.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 233</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> logProperties(<span class="string">"Properties loaded"</span>, props);</pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Logs the properties. This will not log any properties that contain 'password' in the key.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param header the header to print with the log message</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Initializes the thread local settings object. Note, to use the settings object you must call this method.</span></pre></td></tr>
<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param properties the properties to log</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * However, you must also call Settings.cleanup() to properly release resources.</span></pre></td></tr>
<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> logProperties(String header, Properties properties) {</pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsUncovered"><a title="Line 245: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 245: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (LOGGER.isLoggable(Level.FINE)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringWriter sw = <span class="keyword">new</span> StringWriter();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> PrintWriter pw = <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> initialize() {</pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> localSettings.set(<span class="keyword">new</span> Settings());</pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw = <span class="keyword">new</span> PrintWriter(sw);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.format(<span class="string">"%s:%n%n"</span>, header);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Enumeration e = properties.propertyNames();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsUncovered"><a title="Line 252: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 252: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (e.hasMoreElements()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String key = (String) e.nextElement();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"><a title="Line 254: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 254: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"password"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.format(<span class="string">"%s='*****'%n"</span>, key);</span></pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String value = properties.getProperty(key);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"><a title="Line 258: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 258: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.format(<span class="string">"%s='%s'%n"</span>, key, value);</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Cleans up resources to prevent memory leaks.</span></pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> cleanup() {</pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"><a title="Line 252: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 252: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (tempDirectory != <span class="keyword">null</span> && tempDirectory.exists()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 253</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> FileUtils.delete(tempDirectory);</pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> localSettings.remove();</pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Error cleaning up Settings"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 259</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.flush();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(sw.toString());</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Gets the underlying instance of the Settings object.</span></pre></td></tr>
+<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"><a title="Line 266: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 266: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pw != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.close();</span></pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the Settings object</span></pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Settings getInstance() {</pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> localSettings.get();</span></pre></td></tr>
<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets the instance of the Settings object to use in this thread.</span></pre></td></tr>
<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param instance the instance of the settings object to use in this thread</span></pre></td></tr>
<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets a property value.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key for the property</span></pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param value the value for the property</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> setInstance(Settings instance) {</pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> localSettings.set(instance);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> setString(String key, String value) {</pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> INSTANCE.props.setProperty(key, value);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"><a title="Line 282: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 282: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (LOGGER.isLoggable(Level.FINE)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(String.format(<span class="string">"Setting: %s='%s'"</span>, key, value));</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Logs the properties. This will not log any properties that contain 'password' in the key.</span></pre></td></tr>
+<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param header the header to print with the log message</span></pre></td></tr>
<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param properties the properties to log</span></pre></td></tr>
+<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Sets a property value.</span></pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> logProperties(String header, Properties properties) {</pre></td></tr>
+<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"><a title="Line 287: Conditional coverage 50% (1/2)."> 16</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 287: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (LOGGER.isLoggable(Level.FINE)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> StringWriter sw = <span class="keyword">new</span> StringWriter();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> PrintWriter pw = <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key for the property</span></pre></td></tr>
-<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param value the value for the property</span></pre></td></tr>
-<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> setBoolean(String key, <span class="keyword">boolean</span> value) {</pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"><a title="Line 294: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 294: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> INSTANCE.props.setProperty(key, Boolean.TRUE.toString());</span></pre></td></tr>
-<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> INSTANCE.props.setProperty(key, Boolean.FALSE.toString());</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw = <span class="keyword">new</span> PrintWriter(sw);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.format(<span class="string">"%s:%n%n"</span>, header);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> Enumeration e = properties.propertyNames();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"><a title="Line 294: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 294: Conditional coverage 0% (0/2)."> <span class="keyword">while</span> (e.hasMoreElements()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String key = (String) e.nextElement();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"><a title="Line 296: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 296: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (key.contains(<span class="string">"password"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.format(<span class="string">"%s='*****'%n"</span>, key);</span></pre></td></tr>
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"><a title="Line 299: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 299: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (LOGGER.isLoggable(Level.FINE)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(String.format(<span class="string">"Setting: %s='%b'"</span>, key, value));</span></pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String value = properties.getProperty(key);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsUncovered"><a title="Line 300: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 300: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (value != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.format(<span class="string">"%s='%s'%n"</span>, key, value);</span></pre></td></tr>
+<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Merges a new properties file into the current properties. This method allows for the loading of a user provided</span></pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * properties file.<br/><br/></span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.flush();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(sw.toString());</span></pre></td></tr>
<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Note: even if using this method - system properties will be loaded before properties loaded from files.</span></pre></td></tr>
-<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param filePath the path to the properties file to merge.</span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 308</td> <td class="nbHitsUncovered"><a title="Line 308: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 308: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (pw != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 309</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> pw.close();</span></pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws FileNotFoundException is thrown when the filePath points to a non-existent file</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when there is an exception loading/merging the properties</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> mergeProperties(File filePath) <span class="keyword">throws</span> FileNotFoundException, IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> FileInputStream fis = <span class="keyword">new</span> FileInputStream(filePath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 315</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeProperties(fis);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 316</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 314</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets a property value.</span></pre></td></tr>
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Merges a new properties file into the current properties. This method allows for the loading of a user provided</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key for the property</span></pre></td></tr>
<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * properties file.<br/><br/></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param value the value for the property</span></pre></td></tr>
<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Note: even if using this method - system properties will be loaded before properties loaded from files.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param filePath the path to the properties file to merge.</span></pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws FileNotFoundException is thrown when the filePath points to a non-existent file</span></pre></td></tr>
-<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when there is an exception loading/merging the properties</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> setString(String key, String value) {</pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> localSettings.get().props.setProperty(key, value);</pre></td></tr>
+<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"><a title="Line 324: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 324: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (LOGGER.isLoggable(Level.FINE)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(String.format(<span class="string">"Setting: %s='%s'"</span>, key, value));</span></pre></td></tr>
<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> mergeProperties(String filePath) <span class="keyword">throws</span> FileNotFoundException, IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> FileInputStream fis = <span class="keyword">new</span> FileInputStream(filePath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeProperties(fis);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 330</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 327</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Sets a property value.</span></pre></td></tr>
<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key for the property</span></pre></td></tr>
<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Merges a new properties file into the current properties. This method allows for the loading of a user provided</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param value the value for the property</span></pre></td></tr>
<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * properties file.<br/><br/></span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Note: even if using this method - system properties will be loaded before properties loaded from files.</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param stream an Input Stream pointing at a properties file to merge</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> setBoolean(String key, <span class="keyword">boolean</span> value) {</pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsUncovered"><a title="Line 336: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 336: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (value) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 337</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> localSettings.get().props.setProperty(key, Boolean.TRUE.toString());</span></pre></td></tr>
<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when there is an exception loading/merging the properties</span></pre></td></tr>
-<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> localSettings.get().props.setProperty(key, Boolean.FALSE.toString());</pre></td></tr>
<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> mergeProperties(InputStream stream) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 341</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> INSTANCE.props.load(stream);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> logProperties(<span class="string">"Properties updated via merge"</span>, INSTANCE.props);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 341</td> <td class="nbHitsUncovered"><a title="Line 341: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 341: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (LOGGER.isLoggable(Level.FINE)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.fine(String.format(<span class="string">"Setting: %s='%b'"</span>, key, value));</span></pre></td></tr>
+<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file as a File object. If the value was specified as a system property or</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * passed in via the -Dprop=value argument - this method will return the value from the system properties before the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Merges a new properties file into the current properties. This method allows for the loading of a user provided</span></pre></td></tr>
<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * values in the contained configuration file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * properties file.<br/><br/></span></pre></td></tr>
<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Note: even if using this method - system properties will be loaded before properties loaded from files.</span></pre></td></tr>
<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file converted to a File object</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param filePath the path to the properties file to merge.</span></pre></td></tr>
<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws FileNotFoundException is thrown when the filePath points to a non-existent file</span></pre></td></tr>
<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getFile(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 354</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String file = getString(key);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 355</td> <td class="nbHitsUncovered"><a title="Line 355: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 355: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(file);</span></pre></td></tr>
-<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file as a File object. If the value was specified as a system property or</span></pre></td></tr>
-<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * passed in via the -Dprop=value argument - this method will return the value from the system properties before the</span></pre></td></tr>
-<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * values in the contained configuration file.</span></pre></td></tr>
-<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This method will check the configured base directory and will use this as the base of the file path.</span></pre></td></tr>
-<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Additionally, if the base directory begins with a leading "[JAR]\" sequence with the path to the folder</span></pre></td></tr>
-<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * containing the JAR file containing this class.</span></pre></td></tr>
-<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file converted to a File object</span></pre></td></tr>
-<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when there is an exception loading/merging the properties</span></pre></td></tr>
+<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getDataFile(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 374</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String file = getString(key);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 375</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINE, String.format(<span class="string">"Settings.getDataFile() - file: '%s'"</span>, file));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 376</td> <td class="nbHitsUncovered"><a title="Line 376: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 376: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 377</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsUncovered"><a title="Line 379: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 379: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file.startsWith(<span class="string">"[JAR]"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 380</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINE, <span class="string">"Settings.getDataFile() - transforming filename"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 381</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File jarPath = getJarPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 382</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINE, String.format(<span class="string">"Settings.getDataFile() - jar file: '%s'"</span>, jarPath.toString()));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 383</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File retVal = <span class="keyword">new</span> File(jarPath, file.substring(6));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 384</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINE, String.format(<span class="string">"Settings.getDataFile() - returning: '%s'"</span>, retVal.toString()));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 385</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> retVal;</span></pre></td></tr>
-<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 387</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(file);</span></pre></td></tr>
-<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> mergeProperties(File filePath) <span class="keyword">throws</span> FileNotFoundException, IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> FileInputStream fis = <span class="keyword">new</span> FileInputStream(filePath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> mergeProperties(fis);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Attempts to retrieve the folder containing the Jar file containing the Settings class.</span></pre></td></tr>
-<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Merges a new properties file into the current properties. This method allows for the loading of a user provided</span></pre></td></tr>
+<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * properties file.<br/><br/></span></pre></td></tr>
+<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Note: even if using this method - system properties will be loaded before properties loaded from files.</span></pre></td></tr>
+<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param filePath the path to the properties file to merge.</span></pre></td></tr>
+<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws FileNotFoundException is thrown when the filePath points to a non-existent file</span></pre></td></tr>
+<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when there is an exception loading/merging the properties</span></pre></td></tr>
+<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> mergeProperties(String filePath) <span class="keyword">throws</span> FileNotFoundException, IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> FileInputStream fis = <span class="keyword">new</span> FileInputStream(filePath);</pre></td></tr>
+<tr> <td class="numLineCover"> 371</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> mergeProperties(fis);</pre></td></tr>
+<tr> <td class="numLineCover"> 372</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Merges a new properties file into the current properties. This method allows for the loading of a user provided</span></pre></td></tr>
+<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * properties file.<br/><br/></span></pre></td></tr>
+<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Note: even if using this method - system properties will be loaded before properties loaded from files.</span></pre></td></tr>
+<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param stream an Input Stream pointing at a properties file to merge</span></pre></td></tr>
+<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IOException is thrown when there is an exception loading/merging the properties</span></pre></td></tr>
+<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> mergeProperties(InputStream stream) <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> localSettings.get().props.load(stream);</pre></td></tr>
+<tr> <td class="numLineCover"> 384</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> logProperties(<span class="string">"Properties updated via merge"</span>, localSettings.get().props);</pre></td></tr>
+<tr> <td class="numLineCover"> 385</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file as a File object. If the value was specified as a system property or</span></pre></td></tr>
+<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * passed in via the -Dprop=value argument - this method will return the value from the system properties before the</span></pre></td></tr>
+<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * values in the contained configuration file.</span></pre></td></tr>
+<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return a File object</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file converted to a File object</span></pre></td></tr>
<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> File getJarPath() {</pre></td></tr>
-<tr> <td class="numLineCover"> 396</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String jarPath = Settings.<span class="keyword">class</span>.getProtectionDomain().getCodeSource().getLocation().getPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 397</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String decodedPath = <span class="string">"."</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 399</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> decodedPath = URLDecoder.decode(jarPath, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 400</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 401</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 402</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 404</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File path = <span class="keyword">new</span> File(decodedPath);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 405</td> <td class="nbHitsUncovered"><a title="Line 405: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 405: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (path.getName().toLowerCase().endsWith(<span class="string">".jar"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 406</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path.getParentFile();</span></pre></td></tr>
-<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 408</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(<span class="string">"."</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getFile(String key) {</pre></td></tr>
+<tr> <td class="numLineCover"> 396</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String file = getString(key);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 397</td> <td class="nbHitsUncovered"><a title="Line 397: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 397: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (file == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 398</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 400</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(file);</span></pre></td></tr>
+<tr> <td class="numLine"> 401</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file as a File object. If the value was specified as a system property or</span></pre></td></tr>
+<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * passed in via the -Dprop=value argument - this method will return the value from the system properties before the</span></pre></td></tr>
+<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * values in the contained configuration file.</span></pre></td></tr>
+<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * This method will check the configured base directory and will use this as the base of the file path.</span></pre></td></tr>
+<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Additionally, if the base directory begins with a leading "[JAR]\" sequence with the path to the folder</span></pre></td></tr>
<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * containing the JAR file containing this class.</span></pre></td></tr>
<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file. If the value was specified as a system property or passed in via the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file converted to a File object</span></pre></td></tr>
<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
-<tr> <td class="numLine"> 416</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value for the requested property</span></pre></td></tr>
-<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getDataFile(String key) {</pre></td></tr>
+<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String file = getString(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 417</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINE, String.format(<span class="string">"Settings.getDataFile() - file: '%s'"</span>, file));</pre></td></tr>
+<tr> <td class="numLineCover"> 418</td> <td class="nbHitsUncovered"><a title="Line 418: Conditional coverage 50% (1/2)."> 6</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 418: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (file == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 419</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getString(String key, String defaultValue) {</pre></td></tr>
-<tr> <td class="numLineCover"> 422</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String str = System.getProperty(key, INSTANCE.props.getProperty(key, defaultValue));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 423</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> str;</span></pre></td></tr>
-<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 425</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 426</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 427</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns the temporary directory.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 421</td> <td class="nbHitsUncovered"><a title="Line 421: Conditional coverage 50% (1/2)."> 6</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 421: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (file.startsWith(<span class="string">"[JAR]"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 422</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, <span class="string">"Settings.getDataFile() - transforming filename"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 423</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File jarPath = getJarPath();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 424</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, String.format(<span class="string">"Settings.getDataFile() - jar file: '%s'"</span>, jarPath.toString()));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 425</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File retVal = <span class="keyword">new</span> File(jarPath, file.substring(6));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 426</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINE, String.format(<span class="string">"Settings.getDataFile() - returning: '%s'"</span>, retVal.toString()));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 427</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> retVal;</span></pre></td></tr>
<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the temporary directory</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 429</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> File(file);</pre></td></tr>
<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getTempDirectory() {</pre></td></tr>
-<tr> <td class="numLineCover"> 432</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty(<span class="string">"java.io.tmpdir"</span>)));</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Attempts to retrieve the folder containing the Jar file containing the Settings class.</span></pre></td></tr>
<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return a File object</span></pre></td></tr>
<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file. If the value was specified as a system property or passed in via the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
-<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
-<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> File getJarPath() {</pre></td></tr>
+<tr> <td class="numLineCover"> 438</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String jarPath = Settings.<span class="keyword">class</span>.getProtectionDomain().getCodeSource().getLocation().getPath();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 439</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String decodedPath = <span class="string">"."</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getString(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 444</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> System.getProperty(key, INSTANCE.props.getProperty(key));</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 441</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> decodedPath = URLDecoder.decode(jarPath, <span class="string">"UTF-8"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 442</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 443</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> LOGGER.log(Level.FINEST, <span class="keyword">null</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 444</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Removes a property from the local properties collection. This is mainly used in test cases.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 446</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> File path = <span class="keyword">new</span> File(decodedPath);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 447</td> <td class="nbHitsUncovered"><a title="Line 447: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 447: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (path.getName().toLowerCase().endsWith(<span class="string">".jar"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 448</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> path.getParentFile();</span></pre></td></tr>
<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 450</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the property key to remove</span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 450</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> File(<span class="string">"."</span>);</span></pre></td></tr>
<tr> <td class="numLine"> 451</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> removeProperty(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 453</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> INSTANCE.props.remove(key);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 454</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 453</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file. If the value was specified as a system property or passed in via the</span></pre></td></tr>
<tr> <td class="numLine"> 456</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns an int value from the properties file. If the value was specified as a system property or passed in via</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
<tr> <td class="numLine"> 458</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 459</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
<tr> <td class="numLine"> 460</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value for the requested property</span></pre></td></tr>
<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
-<tr> <td class="numLine"> 464</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">int</span> getInt(String key) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getString(String key, String defaultValue) {</pre></td></tr>
+<tr> <td class="numLineCover"> 464</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String str = System.getProperty(key, localSettings.get().props.getProperty(key, defaultValue));</pre></td></tr>
+<tr> <td class="numLineCover"> 465</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">return</span> str;</pre></td></tr>
<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">int</span> value;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 468</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = Integer.parseInt(Settings.getString(key));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 469</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 470</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 471</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 472</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 468</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 469</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * A reference to the temporary directory; used incase it needs to be deleted during cleanup.</span></pre></td></tr>
+<tr> <td class="numLine"> 470</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 471</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> File tempDirectory = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 472</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns the temporary directory.</span></pre></td></tr>
<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns an int value from the properties file. If the value was specified as a system property or passed in via</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the temporary directory</span></pre></td></tr>
<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws java.io.IOException thrown if the temporary directory does not exist and cannot be created</span></pre></td></tr>
<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value to return</span></pre></td></tr>
-<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file or the defaultValue if the property does not exist or cannot be</span></pre></td></tr>
-<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * converted to an integer</span></pre></td></tr>
-<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> File getTempDirectory() <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 480</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">final</span> File tmpDir = <span class="keyword">new</span> File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty(<span class="string">"java.io.tmpdir"</span>)));</pre></td></tr>
+<tr> <td class="numLineCover"> 481</td> <td class="nbHitsCovered"><a title="Line 481: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 481: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!tmpDir.exists()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 482</td> <td class="nbHitsUncovered"><a title="Line 482: Conditional coverage 50% (1/2)."> 4</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 482: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!tmpDir.mkdirs()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 483</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Unable to make a temporary folder '%s'"</span>, tmpDir.getPath());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 484</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(msg);</span></pre></td></tr>
<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">int</span> getInt(String key, <span class="keyword">int</span> defaultValue) {</pre></td></tr>
-<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">int</span> value;</pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 486</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> tempDirectory = tmpDir;</pre></td></tr>
<tr> <td class="numLine"> 487</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 488</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = Integer.parseInt(Settings.getString(key));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 489</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Could not convert property '%s' to an int."</span>, key);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 491</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Logger.getLogger(Settings.<span class="keyword">class</span>.getName()).log(Level.FINEST, msg, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 492</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = defaultValue;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 493</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 494</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
-<tr> <td class="numLine"> 495</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 496</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a long value from the properties file. If the value was specified as a system property or passed in via</span></pre></td></tr>
-<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
-<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
-<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 504</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
-<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 506</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">long</span> getLong(String key) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
-<tr> <td class="numLine"> 507</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">long</span> value;</pre></td></tr>
-<tr> <td class="numLine"> 508</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 509</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = Long.parseLong(Settings.getString(key));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 510</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 511</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 512</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 513</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
-<tr> <td class="numLine"> 514</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 515</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 516</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a boolean value from the properties file. If the value was specified as a system property or passed in</span></pre></td></tr>
-<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * via the <code>-Dprop=value</code> argument this method will return the value from the system properties before</span></pre></td></tr>
-<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the values in the contained configuration file.</span></pre></td></tr>
-<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
-<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 525</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> getBoolean(String key) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
-<tr> <td class="numLine"> 526</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> value;</pre></td></tr>
-<tr> <td class="numLine"> 527</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 528</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = Boolean.parseBoolean(Settings.getString(key));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 529</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 530</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 531</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 532</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
-<tr> <td class="numLine"> 533</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 534</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 535</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Returns a boolean value from the properties file. If the value was specified as a system property or passed in</span></pre></td></tr>
-<tr> <td class="numLine"> 537</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * via the <code>-Dprop=value</code> argument this method will return the value from the system properties before</span></pre></td></tr>
-<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the values in the contained configuration file.</span></pre></td></tr>
-<tr> <td class="numLine"> 539</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 540</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 541</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value to return if the setting does not exist</span></pre></td></tr>
-<tr> <td class="numLine"> 542</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
-<tr> <td class="numLine"> 543</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
-<tr> <td class="numLine"> 544</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 545</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> getBoolean(String key, <span class="keyword">boolean</span> defaultValue) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
-<tr> <td class="numLine"> 546</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> value;</pre></td></tr>
-<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 548</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String strValue = Settings.getString(key);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 549</td> <td class="nbHitsUncovered"><a title="Line 549: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 549: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (strValue == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 550</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> defaultValue;</span></pre></td></tr>
-<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 552</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> value = Boolean.parseBoolean(strValue);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 553</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 555</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 556</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> value;</span></pre></td></tr>
-<tr> <td class="numLine"> 557</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 488</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 489</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> tmpDir;</pre></td></tr>
+<tr> <td class="numLine"> 490</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 491</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 492</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 493</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a value from the properties file. If the value was specified as a system property or passed in via the</span></pre></td></tr>
+<tr> <td class="numLine"> 494</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
+<tr> <td class="numLine"> 495</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
+<tr> <td class="numLine"> 496</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> String getString(String key) {</pre></td></tr>
+<tr> <td class="numLineCover"> 501</td> <td class="nbHitsCovered"> 67</td> <td class="src"><pre class="src"> <span class="keyword">return</span> System.getProperty(key, localSettings.get().props.getProperty(key));</pre></td></tr>
+<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 504</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Removes a property from the local properties collection. This is mainly used in test cases.</span></pre></td></tr>
+<tr> <td class="numLine"> 506</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 507</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the property key to remove</span></pre></td></tr>
+<tr> <td class="numLine"> 508</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 509</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> removeProperty(String key) {</pre></td></tr>
+<tr> <td class="numLineCover"> 510</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> localSettings.get().props.remove(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 511</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 512</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 513</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 514</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns an int value from the properties file. If the value was specified as a system property or passed in via</span></pre></td></tr>
+<tr> <td class="numLine"> 515</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
+<tr> <td class="numLine"> 516</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
+<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
+<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">int</span> getInt(String key) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
+<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">int</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 525</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> value = Integer.parseInt(Settings.getString(key));</pre></td></tr>
+<tr> <td class="numLineCover"> 526</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 527</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 528</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 529</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 531</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 532</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 533</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns an int value from the properties file. If the value was specified as a system property or passed in via</span></pre></td></tr>
+<tr> <td class="numLine"> 534</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
+<tr> <td class="numLine"> 535</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
+<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 537</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value to return</span></pre></td></tr>
+<tr> <td class="numLine"> 539</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file or the defaultValue if the property does not exist or cannot be</span></pre></td></tr>
+<tr> <td class="numLine"> 540</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * converted to an integer</span></pre></td></tr>
+<tr> <td class="numLine"> 541</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 542</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">int</span> getInt(String key, <span class="keyword">int</span> defaultValue) {</pre></td></tr>
+<tr> <td class="numLine"> 543</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">int</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 544</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 545</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> value = Integer.parseInt(Settings.getString(key));</pre></td></tr>
+<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (NumberFormatException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 547</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String msg = String.format(<span class="string">"Could not convert property '%s' to an int."</span>, key);</pre></td></tr>
+<tr> <td class="numLineCover"> 548</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> LOGGER.log(Level.FINEST, msg, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 549</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> value = defaultValue;</pre></td></tr>
+<tr> <td class="numLineCover"> 550</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 551</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 552</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 553</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 554</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a long value from the properties file. If the value was specified as a system property or passed in via</span></pre></td></tr>
+<tr> <td class="numLine"> 556</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the -Dprop=value argument - this method will return the value from the system properties before the values in the</span></pre></td></tr>
+<tr> <td class="numLine"> 557</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * contained configuration file.</span></pre></td></tr>
<tr> <td class="numLine"> 558</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 559</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 560</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 561</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
+<tr> <td class="numLine"> 562</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 563</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">long</span> getLong(String key) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
+<tr> <td class="numLine"> 564</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">long</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 566</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> value = Long.parseLong(Settings.getString(key));</pre></td></tr>
+<tr> <td class="numLineCover"> 567</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 568</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 569</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 570</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 571</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 572</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 573</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 574</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a boolean value from the properties file. If the value was specified as a system property or passed in</span></pre></td></tr>
+<tr> <td class="numLine"> 575</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * via the <code>-Dprop=value</code> argument this method will return the value from the system properties before</span></pre></td></tr>
+<tr> <td class="numLine"> 576</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the values in the contained configuration file.</span></pre></td></tr>
+<tr> <td class="numLine"> 577</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 578</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 579</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 580</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
+<tr> <td class="numLine"> 581</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 582</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> getBoolean(String key) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
+<tr> <td class="numLine"> 583</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 584</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 585</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> value = Boolean.parseBoolean(Settings.getString(key));</pre></td></tr>
+<tr> <td class="numLineCover"> 586</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 587</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 588</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 589</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 590</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 591</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 593</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Returns a boolean value from the properties file. If the value was specified as a system property or passed in</span></pre></td></tr>
+<tr> <td class="numLine"> 594</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * via the <code>-Dprop=value</code> argument this method will return the value from the system properties before</span></pre></td></tr>
+<tr> <td class="numLine"> 595</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the values in the contained configuration file.</span></pre></td></tr>
+<tr> <td class="numLine"> 596</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 597</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param key the key to lookup within the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 598</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @param defaultValue the default value to return if the setting does not exist</span></pre></td></tr>
+<tr> <td class="numLine"> 599</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the property from the properties file</span></pre></td></tr>
+<tr> <td class="numLine"> 600</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws InvalidSettingException is thrown if there is an error retrieving the setting</span></pre></td></tr>
+<tr> <td class="numLine"> 601</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 602</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> getBoolean(String key, <span class="keyword">boolean</span> defaultValue) <span class="keyword">throws</span> InvalidSettingException {</pre></td></tr>
+<tr> <td class="numLine"> 603</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 604</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 605</td> <td class="nbHitsCovered"> 30</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String strValue = Settings.getString(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 606</td> <td class="nbHitsCovered"><a title="Line 606: Conditional coverage 100% (2/2)."> 30</a></td> <td class="src"><pre class="src"> <a title="Line 606: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (strValue == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 607</td> <td class="nbHitsCovered"> 28</td> <td class="src"><pre class="src"> <span class="keyword">return</span> defaultValue;</pre></td></tr>
+<tr> <td class="numLine"> 608</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 609</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> value = Boolean.parseBoolean(strValue);</pre></td></tr>
+<tr> <td class="numLineCover"> 610</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NumberFormatException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 611</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidSettingException(<span class="string">"Could not convert property '"</span> + key + <span class="string">"' to an int."</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 612</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 613</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLine"> 614</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 615</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html
index 7b771a68f..3df27dede 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">20%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:20px"><span class="text">7/35</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">1/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
<tr><td><a href="org.owasp.dependencycheck.utils.URLConnectionFactory.html">URLConnectionFactory$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.0;</span>4</td></tr>
</table>
@@ -127,7 +127,7 @@
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"><a title="Line 56: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 56: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (proxyUrl != <span class="keyword">null</span>) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 57</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> proxyPort = Settings.getInt(Settings.KEYS.PROXY_PORT);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SocketAddress addr = <span class="keyword">new</span> InetSocketAddress(proxyUrl, proxyPort);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> SocketAddress address = <span class="keyword">new</span> InetSocketAddress(proxyUrl, proxyPort);</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String username = Settings.getString(Settings.KEYS.PROXY_USERNAME);</span></pre></td></tr>
@@ -152,7 +152,7 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> proxy = <span class="keyword">new</span> Proxy(Proxy.Type.HTTP, addr);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> proxy = <span class="keyword">new</span> Proxy(Proxy.Type.HTTP, address);</span></pre></td></tr>
<tr> <td class="numLineCover"> 76</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = (HttpURLConnection) url.openConnection(proxy);</span></pre></td></tr>
<tr> <td class="numLineCover"> 77</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">else</span> {</span></pre></td></tr>
<tr> <td class="numLineCover"> 78</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = (HttpURLConnection) url.openConnection();</span></pre></td></tr>
@@ -198,26 +198,26 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> HttpURLConnection createHttpURLConnection(URL url, <span class="keyword">boolean</span> proxy) <span class="keyword">throws</span> URLConnectionFailureException {</pre></td></tr>
-<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"><a title="Line 105: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 105: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (proxy) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsUncovered"><a title="Line 105: Conditional coverage 50% (1/2)."> 6</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 105: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (proxy) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> createHttpURLConnection(url);</span></pre></td></tr>
<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpURLConnection conn = <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> HttpURLConnection conn = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn = (HttpURLConnection) url.openConnection();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> <span class="keyword">int</span> timeout = Settings.getInt(Settings.KEYS.CONNECTION_TIMEOUT, 60000);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> conn.setConnectTimeout(timeout);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> conn = (HttpURLConnection) url.openConnection();</pre></td></tr>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> timeout = Settings.getInt(Settings.KEYS.CONNECTION_TIMEOUT, 60000);</pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> conn.setConnectTimeout(timeout);</pre></td></tr>
<tr> <td class="numLineCover"> 113</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ioe) {</span></pre></td></tr>
<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> URLConnectionFailureException(<span class="string">"Error getting connection."</span>, ioe);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> conn;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span> conn;</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html
index c635dd8df..d2273e73b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html
@@ -155,6 +155,6 @@
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
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 17751a29a..37d08ad54 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/21</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
+ <tr><td><a href="org.owasp.dependencycheck.utils.UrlStringUtils.html">UrlStringUtils</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">95%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">20/21</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">83%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:83px"><span class="text">10/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr>
</table>
<div class="separator"> </div>
@@ -99,14 +99,14 @@
<td class="src"><pre class="src"> <span class="comment"> * A regular expression to test if a string contains a URL.</span></pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern CONTAINS_URL_TEST = Pattern.compile(<span class="string">"^.*(ht|f)tps?://.*$"</span>, Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern CONTAINS_URL_TEST = Pattern.compile(<span class="string">"^.*(ht|f)tps?://.*$"</span>, Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> * A regular expression to test if a string is a URL.</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern IS_URL_TEST = Pattern.compile(<span class="string">"^(ht|f)tps?://.*"</span>, Pattern.CASE_INSENSITIVE);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Pattern IS_URL_TEST = Pattern.compile(<span class="string">"^(ht|f)tps?://.*"</span>, Pattern.CASE_INSENSITIVE);</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
@@ -125,7 +125,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> containsUrl(String text) {</pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> CONTAINS_URL_TEST.matcher(text).matches();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 18230</td> <td class="src"><pre class="src"> <span class="keyword">return</span> CONTAINS_URL_TEST.matcher(text).matches();</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
@@ -144,7 +144,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> isUrl(String text) {</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> IS_URL_TEST.matcher(text).matches();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> IS_URL_TEST.matcher(text).matches();</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
@@ -153,7 +153,7 @@
<td class="src"><pre class="src"> <span class="comment"> * A listing of domain parts that should not be used as evidence. Yes, this is an incomplete list.</span></pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> HashSet<String> IGNORE_LIST = <span class="keyword">new</span> HashSet<String>(</span></pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> HashSet<String> IGNORE_LIST = <span class="keyword">new</span> HashSet<String>(</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Arrays.asList(<span class="string">"www"</span>, <span class="string">"com"</span>, <span class="string">"org"</span>, <span class="string">"gov"</span>, <span class="string">"info"</span>, <span class="string">"name"</span>, <span class="string">"net"</span>, <span class="string">"pro"</span>, <span class="string">"tel"</span>, <span class="string">"mobi"</span>, <span class="string">"xxx"</span>));</pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
@@ -188,40 +188,40 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> List<String> extractImportantUrlData(String text) <span class="keyword">throws</span> MalformedURLException {</pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> ArrayList<String> importantParts = <span class="keyword">new</span> ArrayList<String>();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> URL url = <span class="keyword">new</span> URL(text);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] domain = url.getHost().split(<span class="string">"\\."</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> ArrayList<String> importantParts = <span class="keyword">new</span> ArrayList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> URL url = <span class="keyword">new</span> URL(text);</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] domain = url.getHost().split(<span class="string">"\\."</span>);</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//add the domain except www and the tld.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsUncovered"><a title="Line 93: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 93: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < domain.length - 1; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String sub = domain[i];</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsUncovered"><a title="Line 95: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 95: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!IGNORE_LIST.contains(sub.toLowerCase())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> importantParts.add(sub);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"><a title="Line 93: Conditional coverage 100% (2/2)."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 93: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < domain.length - 1; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String sub = domain[i];</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"><a title="Line 95: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 95: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!IGNORE_LIST.contains(sub.toLowerCase())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> importantParts.add(sub);</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String document = url.getPath();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String[] pathParts = document.split(<span class="string">"[\\//]"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsUncovered"><a title="Line 101: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 101: Conditional coverage 0% (0/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < pathParts.length - 2; i++) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"><a title="Line 102: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 102: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!pathParts[i].isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String document = url.getPath();</pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String[] pathParts = document.split(<span class="string">"[\\//]"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 101: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < pathParts.length - 2; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsUncovered"><a title="Line 102: Conditional coverage 50% (1/2)."> 5</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 102: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!pathParts[i].isEmpty()) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 103</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> importantParts.add(pathParts[i]);</span></pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"><a title="Line 106: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 106: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll(<span class="string">"\\..*{0,5}$"</span>, <span class="string">""</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> importantParts.add(fileNameNoExt);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsUncovered"><a title="Line 106: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 7</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 106: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll(<span class="string">"\\..*{0,5}$"</span>, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> importantParts.add(fileNameNoExt);</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> importantParts;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> importantParts;</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 3/29/14 6:13 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 2.0.3 on 4/28/14 8:36 AM.</div>
</body>
</html>
diff --git a/dependency-check-core/cpd.html b/dependency-check-core/cpd.html
index 041628ea0..00f42cbc3 100644
--- a/dependency-check-core/cpd.html
+++ b/dependency-check-core/cpd.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2014-03-29
+ | Generated by Apache Maven Doxia at 2014-04-28
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140329" />
+ <meta name="Date-Revision-yyyymmdd" content="20140428" />
<meta http-equiv="Content-Language" content="en" />
<title>dependency-check-core - CPD Results
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
@@ -147,6 +147,13 @@
Surefire Report
+
+
+
+
+
+
@@ -161,18 +168,18 @@
Checkstyle
-
-
-
-
-
+
+ PMD
+
+
+
+
@@ -232,7 +239,7 @@
CPD Results
-
The following document contains the results of PMD's CPD 5.0.2.
+The following document contains the results of PMD's CPD 5.0.5.
Duplications
@@ -241,21 +248,15 @@
Line
org\owasp\dependencycheck\analyzer\ArchiveAnalyzer.java
-157
+157
org\owasp\dependencycheck\analyzer\JarAnalyzer.java
-924
+920
@Override
public void initializeFileTypeAnalyzer() throws Exception {
final File baseDir = Settings.getTempDirectory();
- if (!baseDir.exists()) {
- if (!baseDir.mkdirs()) {
- final String msg = String.format("Unable to make a temporary folder '%s'", baseDir.getPath());
- throw new AnalysisException(msg);
- }
- }
tempFileLocation = File.createTempFile("check", "tmp", baseDir);
if (!tempFileLocation.delete()) {
final String msg = String.format("Unable to delete temporary file '%s'.", tempFileLocation.getAbsolutePath());
diff --git a/dependency-check-core/dependency-updates-report.html b/dependency-check-core/dependency-updates-report.html
index e6969a97e..70a08a4cd 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
-
+
/
@@ -67,9 +67,9 @@
-
| Last Published: 2014-03-29
+
| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
Project Information
-
+
@@ -145,6 +145,13 @@
Surefire Report
+
+
+
+
+
+
@@ -161,16 +168,16 @@
-
+
+ PMD
-
+
+ CPD
@@ -237,7 +244,7 @@
# of dependencies using the latest version available
-7
+9
# of dependencies where the next version available is smaller than an incremental version update
@@ -249,7 +256,7 @@
# of dependencies where the next version available is a minor version update
-11
+10
# of dependencies where the next version available is a major version update
@@ -285,6 +292,18 @@
+com.google.inject
+guice
+3.0
+provided
+jar
+
+
com.h2database
h2
@@ -294,9 +313,9 @@
jar
1.3.173 1.4.177
-
+
com.hazelcast
hazelcast
@@ -308,7 +327,7 @@
2.5.1 2.6 3.0
-
+
commons-cli
commons-cli
@@ -320,7 +339,7 @@
-
+
commons-io
commons-io
@@ -332,7 +351,7 @@
-
+
commons-lang
commons-lang
@@ -344,7 +363,7 @@
2.6
-
+
junit
junit
@@ -356,7 +375,7 @@
-
+
net.sf.ehcache
ehcache-core
@@ -368,7 +387,7 @@
2.3.0
-
+
org.apache.axis2
axis2-adb
@@ -380,7 +399,7 @@
1.5
-
+
org.apache.axis2
axis2-spring
@@ -392,19 +411,19 @@
1.5
-
-
+org.apache.commons
commons-compress
-1.5
+1.8
compile
jar
1.6
-
+
org.apache.geronimo.daytrader
daytrader-ear
@@ -416,7 +435,7 @@
-
+
org.apache.lucene
lucene-analyzers-common
@@ -428,7 +447,7 @@
4.6.0
-
+
org.apache.lucene
lucene-core
@@ -440,7 +459,7 @@
4.6.0
-
+
org.apache.lucene
lucene-queryparser
@@ -452,7 +471,7 @@
4.6.0
-
+
org.apache.lucene
lucene-test-framework
@@ -464,7 +483,7 @@
4.4.0
-
+
org.apache.maven.scm
maven-scm-provider-cvsexe
@@ -476,7 +495,7 @@
1.9
-
+
org.apache.openjpa
openjpa
@@ -488,7 +507,7 @@
2.1.0
-
+
org.apache.struts
struts2-core
@@ -500,7 +519,7 @@
2.1.6 2.2.1
-
+
org.apache.velocity
velocity
@@ -512,7 +531,7 @@
-
+
org.apache.velocity
velocity-tools
@@ -524,7 +543,7 @@
-
+
org.dojotoolkit
dojo-war
@@ -536,7 +555,7 @@
1.3.1 1.4.2
-
+
org.glassfish.main.admingui
war
@@ -548,7 +567,7 @@
-
+
org.jsoup
jsoup
@@ -560,7 +579,7 @@
1.7.3
-
+
org.mortbay.jetty
jetty
@@ -572,7 +591,7 @@
6.1.17
-
+
org.springframework
spring-webmvc
@@ -584,7 +603,7 @@
2.5.6 3.0.0.RELEASE
-
+
Status
Group Id
Artifact Id
@@ -602,31 +621,55 @@
com.google.code.findbugs:annotations
-
+
Status
-
+
Group Id
com.google.code.findbugs
-
+
Artifact Id
annotations
-
+
Current Version
2.0.1
-
+
Scope
compile
-
+
Classifier
-
+
Type
jar
-
+
Newer versions
2.0.2 Next Incremental 2.0.3 Latest Incremental
+
com.google.inject:guice
+
+
+Status
+
+
+Group Id
+com.google.inject
+
+Artifact Id
+guice
+
+Current Version
+3.0
+
+Scope
+provided
+
+Classifier
+
+
+Type
+jar
com.h2database:h2
@@ -652,7 +695,7 @@
jar
Newer versions
-1.3.173 Next Incremental 1.3.175 Latest Incremental
+1.3.173 Next Incremental 1.3.176 Latest Incremental 1.4.177 Next Minor
com.hazelcast:hazelcast
@@ -679,7 +722,7 @@
jar
Newer versions
-2.5.1 Next Incremental 2.6 Next Minor 3.0-RC2 Latest Minor 3.0 Next Major 3.2 Latest Major
+ 2.5.1 Next Incremental 2.6 Next Minor 3.0-RC2 Latest Minor 3.0 Next Major 3.2 Latest Major
commons-cli:commons-cli
@@ -805,7 +848,7 @@
jar
Newer versions
-2.3.0 Next Minor 2.6.8 Latest Minor
+2.3.0 Next Minor 2.6.9 Latest Minor
org.apache.axis2:axis2-adb
@@ -865,7 +908,7 @@
Status
-
+
Group Id
org.apache.commons
@@ -874,7 +917,7 @@
commons-compress
Current Version
-1.5
+1.8
Scope
compile
@@ -883,10 +926,7 @@
Type
-jar
-
-Newer versions
-1.6 Next Minor 1.8 Latest Minor
+jar
org.apache.geronimo.daytrader:daytrader-ear
@@ -937,7 +977,7 @@
jar
Newer versions
-4.6.0 Next Minor 4.7.0 Latest Minor
+4.6.0 Next Minor 4.8.0 Latest Minor
org.apache.lucene:lucene-core
@@ -964,7 +1004,7 @@
jar
Newer versions
-4.6.0 Next Minor 4.7.0 Latest Minor
+4.6.0 Next Minor 4.8.0 Latest Minor
org.apache.lucene:lucene-queryparser
@@ -991,7 +1031,7 @@
jar
Newer versions
-4.6.0 Next Minor 4.7.0 Latest Minor
+4.6.0 Next Minor 4.8.0 Latest Minor
org.apache.lucene:lucene-test-framework
@@ -1018,7 +1058,7 @@
jar
Newer versions
-4.4.0 Next Minor 4.7.0 Latest Minor
+4.4.0 Next Minor 4.8.0 Latest Minor
org.apache.maven.scm:maven-scm-provider-cvsexe
@@ -1099,7 +1139,7 @@
jar
Newer versions
-2.1.6 Next Incremental 2.1.8.1 Latest Incremental 2.2.1 Next Minor 2.3.16.1 Latest Minor
+2.1.6 Next Incremental 2.1.8.1 Latest Incremental 2.2.1 Next Minor 2.3.16.2 Latest Minor
org.apache.velocity:velocity
@@ -1174,7 +1214,7 @@
war
Newer versions
-1.3.1 Next Incremental 1.3.2 Latest Incremental 1.4.2 Next Minor 1.9.2 Latest Minor
+1.3.1 Next Incremental 1.3.2 Latest Incremental 1.4.2 Next Minor 1.9.3 Latest Minor
org.glassfish.main.admingui:war
diff --git a/dependency-check-core/failsafe-report.html b/dependency-check-core/failsafe-report.html
index 93b553d65..0dbc5ac29 100644
--- a/dependency-check-core/failsafe-report.html
+++ b/dependency-check-core/failsafe-report.html
@@ -1,13 +1,13 @@
dependency-check-core - Surefire Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-10| Last Published: 2014-04-28
- Version: 1.1.3
+ Version: 1.2.0
@@ -168,16 +168,16 @@
-
+
+ PMD
-
+
+ CPD
@@ -268,12 +268,12 @@ function toggleDisplay(elementId) {
Success Rate
Time
-8
+36
0
0
0
100%
-382.652
+
526.61
Note: failures are anticipated and checked for with assertions while errors are unanticipated.
org.owasp.dependencycheck.utils
@@ -353,7 +398,46 @@ function toggleDisplay(elementId) {
0
0
100%
-149.292
+0
+
+
org.owasp.dependencycheck.analyzer
+
org.owasp.dependencycheck.data.update
@@ -374,7 +458,7 @@ function toggleDisplay(elementId) {
0
0
100%
-175.736
+26.089
StandardUpdateIntegrationTest 0
0
100%
-4.214
9.792
+
+
org.owasp.dependencycheck.data.nvdcve
+
Test Cases [Summary ] [Package List ] [Test Cases ]
+
+
+
VulnerabilitySuppressionAnalyzerIntegrationTest
+
+
+testAnalyze
+18.651
+
+testGetAnalysisPhase
+3.416
+
+testGetName
+2.808
+
+
CveDBIntegrationTest
+
+
+testOpen
+16.649
+
+testGetCPEs
+21.171
+
+testGetVulnerabilities
+17.425
+
+
NvdCveUpdaterIntegrationTest
testUpdate
-175.736
+
26.089
StandardUpdateIntegrationTest
testOpenDataStores
-0.94
+4.41
testUpdatesNeeded
-2.021
+1.485
testWithinRange
-0.613
+1.903
testUpdate
-0.64
+1.994
EngineIntegrationTest
testScan
-53.41
+3.813
+
+testEngine
+93.09
+
+
ReportGeneratorIntegrationTest
+
+
+testGenerateXMLReport
+26.079
+
+testGenerateReport
+3.529
DownloaderIntegrationTest
testGetLastModified
-0.696
+0
testFetchFile
-148.596
0 dependency-check-core - FindBugs Bug Detector Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
@@ -147,6 +147,13 @@
Surefire Report
+
+
+
+
+
+
@@ -163,16 +170,16 @@
-
+
+ PMD
-
+
+ CPD
@@ -245,8 +252,8 @@
Errors
Missing Classes
-209
-9
+210
+6
0
0
@@ -283,93 +284,57 @@
Line
Priority
-Found reliance on default encoding in org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.analyzeFileType(Dependency, Engine): new java.io.InputStreamReader(InputStream)
-I18N
-DM_DEFAULT_ENCODING 120 High
-
-Found reliance on default encoding in org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.initializeFileTypeAnalyzer(): new java.io.InputStreamReader(InputStream)
-I18N
-DM_DEFAULT_ENCODING 232 High org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.initializeFileTypeAnalyzer() discards result of readLine after checking if it is nonnull
+STYLE
+RV_DONT_JUST_NULL_CHECK_READLINE 233 Medium
org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer
-
+
Bug
Category
Details
Line
Priority
-
-Possible null pointer dereference of currentVersion in org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.removeSpuriousCPE(Dependency)
-CORRECTNESS
-NP_NULL_ON_SOME_PATH 141 Medium
+Possible null pointer dereference of currentVersion on branch that might be infeasible in org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.removeSpuriousCPE(Dependency)
+STYLE
+NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE 144 Medium
+
Possible null pointer dereference of nextVersion on branch that might be infeasible in org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.removeSpuriousCPE(Dependency)
STYLE
NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE 141 144 Medium
org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer
-
+
Bug
Category
Details
Line
Priority
-
+
Found reliance on default encoding in org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.analyzeFileType(Dependency, Engine): new java.io.FileReader(File)
I18N
DM_DEFAULT_ENCODING 115 High
-
org.owasp.dependencycheck.data.update.task.CallableDownloadTask
-
-
-Bug
-Category
-Details
-Line
-Priority
-
-new org.owasp.dependencycheck.data.update.task.CallableDownloadTask(NvdCveInfo, ExecutorService, CveDB) might ignore java.io.IOException
-BAD_PRACTICE
-DE_MIGHT_IGNORE 59 Medium
-
org.owasp.dependencycheck.utils.LogUtils
-
-
-Bug
-Category
-Details
-Line
-Priority
-
-Changes to logger could be lost in org.owasp.dependencycheck.utils.LogUtils.prepareLogger(InputStream, String)
-EXPERIMENTAL
-LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE 58 High
org.owasp.dependencycheck.utils.URLConnectionFactory
-
+
Bug
Category
Details
Line
Priority
-
+
Redundant nullcheck of conn which is known to be null in org.owasp.dependencycheck.utils.URLConnectionFactory.createHttpURLConnection(URL)
STYLE
RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE dependency-check-core - About
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -111,7 +111,7 @@
-
+
diff --git a/dependency-check-core/javancss.html b/dependency-check-core/javancss.html
index 08a6a4e75..3f96fe10d 100644
--- a/dependency-check-core/javancss.html
+++ b/dependency-check-core/javancss.html
@@ -1,13 +1,13 @@
dependency-check-core - JavaNCSS Metric Results
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
-
+
@@ -147,6 +147,13 @@
Surefire Report
+
+
+
+
+
+
@@ -163,16 +170,16 @@
-
+
+ PMD
-
+
+ CPD
@@ -252,11 +259,11 @@
org.owasp.dependencycheck.analyzer
23
169
-2131
+2138
187
-1260
+1266
164
-631
+640
org.owasp.dependencycheck.jaxb.pom.generated
86
@@ -269,48 +276,48 @@
org.owasp.dependencycheck.utils
22
-102
-845
-109
-679
-8
-454
+106
+866
+113
+697
+10
+472
org.owasp.dependencycheck.data.nvdcve
9
61
-788
+795
68
413
30
-266
+281
org.owasp.dependencycheck.dependency
14
-161
-725
-158
-1000
+167
+744
+164
+1036
13
-222
+231
org.owasp.dependencycheck.suppression
6
48
-326
+330
54
338
6
-145
+151
org.owasp.dependencycheck.data.update.xml
4
35
-315
+316
34
222
5
-124
+127
org.owasp.dependencycheck.agent
1
@@ -319,70 +326,70 @@
65
442
0
-32
+35
org.owasp.dependencycheck.data.update
6
-35
-272
-40
-267
+34
+269
+39
+266
5
-125
+128
org.owasp.dependencycheck.data.lucene
11
30
-264
+265
41
259
20
-228
+231
org.owasp.dependencycheck
1
-21
-218
-21
-118
+22
+223
+22
+127
6
-42
+45
org.owasp.dependencycheck.data.cpe
4
30
-205
+206
32
218
0
-99
+102
org.owasp.dependencycheck.data.update.task
2
17
-158
+171
18
-121
+132
0
-54
+60
org.owasp.dependencycheck.reporting
+3
+14
+159
+17
+118
2
-11
-138
-13
-94
-1
-65
+91
org.owasp.dependencycheck.data.nexus
2
15
-102
+106
17
-102
+108
11
-62
+53
org.owasp.dependencycheck.data.nuget
4
@@ -396,11 +403,11 @@
org.owasp.dependencycheck.data.cwe
2
5
-47
+48
6
29
1
-50
+53
org.owasp.dependencycheck.exception
2
@@ -447,13 +454,13 @@
Single lines comment
Multi lines comment
-206
-1391
-8778
-1545
-12940
-498
-2865
+207
+1404
+8880
+1559
+13049
+501
+2966
[ package ] [ object ] [ method ] [ explanation ]
@@ -467,13 +474,13 @@
Javadocs
org.owasp.dependencycheck.analyzer.JarAnalyzer 643
+639
31
1
37
org.owasp.dependencycheck.data.nvdcve.CveDB 402
+403
20
0
21
@@ -485,7 +492,7 @@
65
org.owasp.dependencycheck.analyzer.CPEAnalyzer 259
+260
17
2
30
@@ -497,16 +504,28 @@
83
org.owasp.dependencycheck.data.update.xml.NvdCve20Handler 208
+209
8
1
24
org.owasp.dependencycheck.Engine 189
-21
+194
+22
0
-21
+
22
+
+org.owasp.dependencycheck.dependency.Dependency 190
+47
+0
+48
+
+org.owasp.dependencycheck.utils.Settings 189
+23
+1
+26
org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory 175
@@ -515,61 +534,49 @@
88
org.owasp.dependencycheck.analyzer.ArchiveAnalyzer 173
+169
11
0
12
-org.owasp.dependencycheck.dependency.Dependency 173
-41
-0
-42
-
-org.owasp.dependencycheck.utils.Settings 169
-19
-1
-22
-
org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer 156
+157
11
0
12
org.owasp.dependencycheck.data.nvdcve.ConnectionFactory 148
+151
9
0
10
org.owasp.dependencycheck.data.update.StandardUpdate 140
+141
8
0
9
org.owasp.dependencycheck.analyzer.AssemblyAnalyzer 128
+130
8
0
8
org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer 119
+120
9
0
10
org.owasp.dependencycheck.dependency.EvidenceCollection 118
+119
18
5
19
org.owasp.dependencycheck.suppression.SuppressionRule 111
+113
24
0
25
@@ -581,13 +588,13 @@
35
org.owasp.dependencycheck.dependency.VulnerableSoftware 107
+108
18
0
19
org.owasp.dependencycheck.data.cpe.CpeMemoryIndex 106
+107
14
0
15
@@ -598,17 +605,17 @@
5
39
-org.owasp.dependencycheck.utils.FileUtils 99
-9
-0
-10
-
org.owasp.dependencycheck.jaxb.pom.generated.Profile 97
24
6
37
+
+org.owasp.dependencycheck.utils.FileUtils 97
+9
+0
+10
org.owasp.dependencycheck.utils.DependencyVersion 91
@@ -617,13 +624,13 @@
11
org.owasp.dependencycheck.reporting.ReportGenerator 86
+88
6
1
7
org.owasp.dependencycheck.utils.Downloader 84
+85
4
0
5
@@ -634,17 +641,17 @@
1
10
+org.owasp.dependencycheck.data.update.task.CallableDownloadTask 75
+11
+0
+11
+
org.owasp.dependencycheck.jaxb.pom.generated.Plugin 70
18
4
-27
-
-org.owasp.dependencycheck.data.update.task.CallableDownloadTask 69
-11
-0
-11
+
27
TOP 30 classes containing the most methods.
@@ -673,10 +680,10 @@
83
org.owasp.dependencycheck.dependency.Dependency 173
-41
+190
+47
0
-42
+48
org.owasp.dependencycheck.dependency.Vulnerability 108
@@ -685,7 +692,7 @@
35
org.owasp.dependencycheck.analyzer.JarAnalyzer 643
+639
31
1
37
@@ -703,37 +710,37 @@
37
org.owasp.dependencycheck.suppression.SuppressionRule 111
+113
24
0
25
-org.owasp.dependencycheck.Engine org.owasp.dependencycheck.utils.Settings 189
-21
-0
-21
+23
+1
+26
+org.owasp.dependencycheck.Engine 194
+22
+0
+22
+
org.owasp.dependencycheck.data.nvdcve.CveDB 402
+403
20
0
21
-
-org.owasp.dependencycheck.utils.Settings 169
-19
-1
-22
org.owasp.dependencycheck.dependency.EvidenceCollection 118
+119
18
5
19
org.owasp.dependencycheck.dependency.VulnerableSoftware 107
+108
18
0
19
@@ -757,7 +764,7 @@
27
org.owasp.dependencycheck.analyzer.CPEAnalyzer 259
+260
17
2
30
@@ -799,7 +806,7 @@
14
org.owasp.dependencycheck.data.cpe.CpeMemoryIndex 106
+107
14
0
15
@@ -842,11 +849,11 @@
Methods average
Javadocs average
-39.33
-8,778.00
-0.32
-6.75
-7.93
+39.60
+8,880.00
+0.31
+6.78
+7.96
[ package ] [ object ] [ method ] [ explanation ]
@@ -904,35 +911,35 @@
9
1
+org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.initializeFileTypeAnalyzer() 52
+20
+1
+
org.owasp.dependencycheck.utils.FileUtils.extractFiles(File,File,Engine) 51
23
1
-
-org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.initializeFileTypeAnalyzer() 50
-18
-1
+org.owasp.dependencycheck.agent.DependencyCheckScanAgent.populateSettings() 49
+38
+1
+
org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.extractArchive(ArchiveInputStream,File,Engine) 49
23
1
-
+
org.owasp.dependencycheck.analyzer.JarAnalyzer.extractPom(String,JarFile,Dependency) 49
9
1
-
+
org.owasp.dependencycheck.analyzer.JarAnalyzer.setPomEvidence(Dependency,Model,Properties,ClassNameInformation) 49
22
1
-
-org.owasp.dependencycheck.agent.DependencyCheckScanAgent.populateSettings() 48
-38
-1
org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.analyzeFileType(Dependency,Engine) 48
@@ -949,20 +956,20 @@
14
1
+org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.loadSuppressionData() 43
+16
+1
+
org.owasp.dependencycheck.analyzer.JarAnalyzer.analyzePOM(Dependency,ClassNameInformation,Engine) 42
11
1
-
+
org.owasp.dependencycheck.data.update.StandardUpdate.updatesNeeded() 42
17
1
-
-org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.loadSuppressionData() 41
-16
-1
org.owasp.dependencycheck.reporting.ReportGenerator.generateReport(String,String) 41
@@ -980,7 +987,7 @@
0
org.owasp.dependencycheck.suppression.SuppressionRule.process(Dependency) 37
+39
25
1
@@ -1017,9 +1024,9 @@
CCN average
Javadocs average
-8,778.00
+8,880.00
4.83
-2.31
+2.30
0.97
diff --git a/dependency-check-core/license.html b/dependency-check-core/license.html
index c26213e90..ddf4910fc 100644
--- a/dependency-check-core/license.html
+++ b/dependency-check-core/license.html
@@ -1,13 +1,13 @@
-
+
dependency-check-core - Project License
@@ -54,7 +54,7 @@
-
+
/
@@ -67,9 +67,9 @@
-
| Last Published: 2014-03-29
+
| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -111,7 +111,7 @@
-
+
diff --git a/dependency-check-core/plugin-updates-report.html b/dependency-check-core/plugin-updates-report.html
index 3931b37c6..62fcc3430 100644
--- a/dependency-check-core/plugin-updates-report.html
+++ b/dependency-check-core/plugin-updates-report.html
@@ -1,13 +1,13 @@
dependency-check-core - Plugin Updates Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
-
+
@@ -145,6 +145,13 @@
Surefire Report
+
+
+
+
+
+
@@ -161,16 +168,16 @@
-
+
+ PMD
-
+
+ CPD
diff --git a/dependency-check-core/pmd.html b/dependency-check-core/pmd.html
index 4e27c2302..1f787f156 100644
--- a/dependency-check-core/pmd.html
+++ b/dependency-check-core/pmd.html
@@ -1,13 +1,13 @@
dependency-check-core - PMD Results
-
+
/
@@ -67,9 +67,9 @@
-
| Last Published: 2014-03-29
+
| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
Project Information
-
+
@@ -147,6 +147,13 @@
Surefire Report
+
+
+
+
+
+
@@ -161,18 +168,18 @@
Checkstyle
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -232,7 +239,7 @@
PMD Results
-
The following document contains the results of PMD 5.0.2.
+The following document contains the results of PMD 5.0.5.
Files
@@ -243,25 +250,19 @@
Line
These nested if statements could be combined
-161 - 164
+
320–323
These nested if statements could be combined
-326 - 329
-
-These nested if statements could be combined
-340 - 343
+
334–337
org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
-
+
Violation
Line
-
-Avoid unused local variables such as 'line'.
-233
Avoid empty while statements
-234 - 236
+233–235
org/owasp/dependencycheck/analyzer/CPEAnalyzer.java
@@ -270,16 +271,16 @@
Line
Useless parentheses.
-213
+216
These nested if statements could be combined
-531 - 536
+534–539
These nested if statements could be combined
-532 - 535
+535–538
These nested if statements could be combined
-541 - 544
+544–547
org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java
@@ -288,7 +289,7 @@
Line
These nested if statements could be combined
-223 - 225
+228–230
org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java
@@ -297,7 +298,7 @@
Line
These nested if statements could be combined
-129 - 150
+133–153
org/owasp/dependencycheck/analyzer/JarAnalyzer.java
@@ -306,22 +307,16 @@
Line
Useless parentheses.
-374
-
-These nested if statements could be combined
-928 - 931
+374
org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java
-
+
Violation
Line
-
-An empty statement (semicolon) not part of a loop
-110
Avoid unused local variables such as 'extractComments'.
-113
+113
org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java
@@ -330,7 +325,7 @@
Line
Useless parentheses.
-76
+76
org/owasp/dependencycheck/data/cpe/IndexEntry.java
@@ -339,10 +334,10 @@
Line
Useless parentheses.
-172
+172
Useless parentheses.
-175
+175
org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java
@@ -351,7 +346,7 @@
Line
These nested if statements could be combined
-242 - 244
+248–250
org/owasp/dependencycheck/data/nvdcve/CveDB.java
@@ -360,13 +355,13 @@
Line
Avoid unused private fields such as 'SELECT_PROPERTY'.
-247
+250
Avoid unused private fields such as 'DELETE_PROPERTY'.
-259
+262
Useless parentheses.
-737
+740
org/owasp/dependencycheck/data/nvdcve/DriverShim.java
@@ -375,7 +370,7 @@
Line
Useless parentheses.
-188
+192
org/owasp/dependencycheck/data/update/StandardUpdate.java
@@ -384,7 +379,7 @@
Line
Useless parentheses.
-114
+118
org/owasp/dependencycheck/dependency/Dependency.java
@@ -393,28 +388,28 @@
Line
Useless parentheses.
-494
+563
Useless parentheses.
-497
+566
Useless parentheses.
-500
+569
Useless parentheses.
-503
+572
Useless parentheses.
-506
+575
Useless parentheses.
-509
+578
Useless parentheses.
-524
+593
Useless parentheses.
-527
+596
org/owasp/dependencycheck/dependency/Evidence.java
@@ -423,7 +418,7 @@
Line
Useless parentheses.
-202
+202
org/owasp/dependencycheck/dependency/Identifier.java
@@ -432,10 +427,10 @@
Line
Useless parentheses.
-175
+175
Useless parentheses.
-178
+178
org/owasp/dependencycheck/dependency/Reference.java
@@ -444,13 +439,13 @@
Line
Useless parentheses.
-109
+109
Useless parentheses.
-112
+112
Useless parentheses.
-115
+115
org/owasp/dependencycheck/dependency/Vulnerability.java
@@ -459,7 +454,7 @@
Line
Useless parentheses.
-373
+373
org/owasp/dependencycheck/dependency/VulnerableSoftware.java
@@ -468,13 +463,13 @@
Line
Useless parentheses.
-139
+143
Useless parentheses.
-178
+182
Useless parentheses.
-183
+187
org/owasp/dependencycheck/suppression/PropertyType.java
@@ -483,7 +478,7 @@
Line
Useless parentheses.
-161
+161
org/owasp/dependencycheck/utils/Checksum.java
@@ -492,7 +487,7 @@
Line
Useless parentheses.
-109
+113
org/owasp/dependencycheck/utils/DependencyVersion.java
@@ -501,19 +496,10 @@
Line
Useless parentheses.
-135
+135
Useless parentheses.
-194
-
-
org/owasp/dependencycheck/utils/FileUtils.java
-
-
-Violation
-Line
-
-These nested if statements could be combined
-107 - 109
194
diff --git a/dependency-check-core/project-info.html b/dependency-check-core/project-info.html
index 18eb2ed95..82fa3943c 100644
--- a/dependency-check-core/project-info.html
+++ b/dependency-check-core/project-info.html
@@ -1,13 +1,13 @@
dependency-check-core - Project Information
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -111,7 +111,7 @@
-
+
diff --git a/dependency-check-core/project-reports.html b/dependency-check-core/project-reports.html
index c8b4f35cf..0cc9b8aa9 100644
--- a/dependency-check-core/project-reports.html
+++ b/dependency-check-core/project-reports.html
@@ -1,13 +1,13 @@
dependency-check-core - Generated Reports
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
-
+
+
+
+
+
+
+
@@ -161,16 +168,16 @@
-
+
+ PMD
-
+
+ CPD
@@ -261,21 +268,24 @@
Surefire Report Report on the test results of the project.
+Failsafe Report Report on the integration test results of the project.
+
Tag List Report on various tags found in the code.
-
+
Checkstyle Report on coding style conventions.
-
-CPD Report Duplicate code detection.
-PMD Report PMD Verification of coding rules.
+CPD Duplicate code detection.
+
FindBugs Report Generates a source code report with the FindBugs Library.
-
+
JavaNCSS Report Code metric analysis.
diff --git a/dependency-check-core/project-summary.html b/dependency-check-core/project-summary.html
index 10dee0583..d8b2bebd8 100644
--- a/dependency-check-core/project-summary.html
+++ b/dependency-check-core/project-summary.html
@@ -1,13 +1,13 @@
dependency-check-core - Project Summary
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -111,7 +111,7 @@
-
+
@@ -203,7 +203,7 @@
dependency-check-core
Version
-1.1.4
+1.2.0
Type
jar
diff --git a/dependency-check-core/surefire-report.html b/dependency-check-core/surefire-report.html
index 625a6e660..520dbdac4 100644
--- a/dependency-check-core/surefire-report.html
+++ b/dependency-check-core/surefire-report.html
@@ -1,13 +1,13 @@
dependency-check-core - Surefire Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
@@ -145,6 +145,13 @@
+
+
+
+
+
+
@@ -161,16 +168,16 @@
-
+
+ PMD
-
+
+ CPD
@@ -250,7 +257,8 @@ function toggleDisplay(elementId) {
-
Summary
+
Summary
+
[Summary ] [Package List ] [Test Cases ]
Tests
@@ -260,13 +268,1388 @@ function toggleDisplay(elementId) {
Success Rate
Time
+165
0
0
-0
-0
-0%
-0
+
1
+
99.394%
+
51.533
Note: failures are anticipated and checked for with assertions while errors are unanticipated.
+
Package List
+
[Summary ] [Package List ] [Test Cases ]
+
+
Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
+
+
org.owasp.dependencycheck.data.cwe
+
+
+Class
+Tests
+Errors
+Failures
+Skipped
+Success Rate
+Time
+
+CweDBTest 1
+0
+0
+0
+100%
+0
+
+
org.owasp.dependencycheck.data.nuget
+
+
+Class
+Tests
+Errors
+Failures
+Skipped
+Success Rate
+Time
+
+XPathNuspecParserTest 3
+0
+0
+0
+100%
+0.117
+
+
org.owasp.dependencycheck.data.nexus
+
+
+Class
+Tests
+Errors
+Failures
+Skipped
+Success Rate
+Time
+
+NexusSearchTest 4
+0
+0
+0
+100%
+1.324
+
+
org.owasp.dependencycheck.dependency
+
+
+
org.owasp.dependencycheck.utils
+
+
+
org.owasp.dependencycheck.data.update.xml
+
+
+
org.owasp.dependencycheck.analyzer
+
+
+
org.owasp.dependencycheck.data.update
+
+
+
org.owasp.dependencycheck.data.nvdcve
+
+
+Class
+Tests
+Errors
+Failures
+Skipped
+Success Rate
+Time
+
+DriverLoaderTest 6
+0
+0
+0
+100%
+0.597
+
+
org.owasp.dependencycheck.suppression
+
+
+
org.owasp.dependencycheck.data.lucene
+
+
+
org.owasp.dependencycheck.data.cpe
+
+
+Class
+Tests
+Errors
+Failures
+Skipped
+Success Rate
+Time
+
+IndexEntryTest 1
+0
+0
+0
+100%
+0
+
Test Cases
+
[Summary ] [Package List ] [Test Cases ]
+
+
AbstractFileTypeAnalyzerTest
+
+
+testNewHashSet
+0.009
+
+
AbstractSuppressionAnalyzerTest
+
+
+testGetRules
+0.887
+
+testInitialize
+0.029
+
+testGetSupportedExtensions
+0.003
+
+
AnalyzerServiceTest
+
+
+testGetAnalyzers
+0.778
+
+
+
+
FalsePositiveAnalyzerTest
+
+
+testAnalyze
+0
+
+testGetAnalysisPhase
+0
+
+testGetName
+0
+
+
+
HintAnalyzerTest
+
+
+testAnalyze
+34.827
+
+testGetAnalysisPhase
+3.124
+
+testGetName
+2.684
+
+
+
+
+
IndexEntryTest
+
+
+testSetName
+0
+
+
CweDBTest
+
+
+testGetCweName
+0
+
+
FieldAnalyzerTest
+
+
+testAnalyzers
+0.252
+
+
+
TokenPairConcatenatingFilterTest
+
+
+testClear
+0.084
+
+testExamples
+0.006
+
+
UrlTokenizingFilterTest
+
+
+testRandomStrings
+0.625
+
+testExamples
+0.009
+
+testEmptyTerm
+0.007
+
+
+
XPathNuspecParserTest
+
+
+testGoodDocument
+0.009
+
+testMissingDocument
+0.079
+
+testNotNuspec
+0.029
+
+
+
+
+
NvdCve_1_2_HandlerTest
+
+
+testParse
+0.046
+
+
NvdCve_2_0_HandlerTest
+
+
+testParse
+0.139
+
+
+
VulnerableSoftwareTest
+
+
+testCompareTo
+0
+
+testHashCode
+0
+
+testEquals
+0
+
+
+
SuppressionHandlerTest
+
+
+testHandler
+0.008
+
+
SuppressionParserTest
+
+
+testParseSuppressionRules
+0
+
+
+
+
+
DependencyVersionUtilTest
+
+
+testParseVersionFromFileName
+0
+
+
DownloaderTest
+
+
+testGetLastModified_file
+0
+
+
FileUtilsTest
+
+
+testGetFileExtension
+0
+
+testDelete
+0
+
+
FilterTest
+
+
+testFilter_Iterable
+0
+
+testPasses
+0
+
dependency-check-core - Tag List report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -90,7 +90,7 @@
@@ -147,6 +147,13 @@
Surefire Report
+
+
+
+
+
+
-
+
+ PMD
-
+
+ CPD
@@ -252,58 +259,58 @@
Line
- can we get more evidence from the parent? EAR contains module name, etc. analyze the dependency (i.e. extract files) if it is a supported type.
-229
+223
org.owasp.dependencycheck.analyzer.CPEAnalyzer
Line
- likely need to change the split... not sure if this will work for CPE with special chars
-442
+445
the following isn't quite right is it? need to think about this guessing game a bit more.
-528
+531
-org.owasp.dependencycheck.analyzer.CPEAnalyzerTest
+org.owasp.dependencycheck.analyzer.CPEAnalyzerIntegrationTest
Line
- yeah, not a very good test as the results are the same with or without weighting...
-222
+198
fix this assert Assert.assertEquals(expResult, result.get(0).getName());
-230
+206
org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzerTest
Line
review the generated test code and remove the default call to fail. fail("The test case is a prototype.");
-84
+62
org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer
Line
fix the version problem below
-127
+131
- can we utilize the pom's groupid and artifactId to filter??? most of these are due to low quality data. Other idea would be to say any CPE found based on LOW confidence evidence should have a different CPE type? (this might be a better solution then just removing the URL for "best-guess" matches).
-236
+239
-move this startswith expression to a configuration file?
-245
+move this startsWith expression to a configuration file?
+248
org.owasp.dependencycheck.analyzer.JarAnalyzer
Line
remove weighting
-650
+647
change this to a regex?
-769
+765
org.owasp.dependencycheck.analyzer.JavaScriptAnalyzerTest
Line
improve the assertions assertTrue(depJQ6.getEvidence().size() > 0); assertTrue(depJQ10.getEvidence().size() > 0); assertTrue(depJQ10min.getEvidence().size() > 0);
-125
+103
org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer
Line
@@ -327,19 +334,19 @@
Line
consider utilizing the matchThreeVersion method to get additional results. However, this might also introduce false positives.
-747
+750
org.owasp.dependencycheck.data.update.StandardUpdateIntegrationTest
Line
make this an actual test
-100
+78
org.owasp.dependencycheck.dependency.EvidenceCollection
Line
consider changing the regex to only compare alpha-numeric (i.e. strip everything else)
-233
+237
org.owasp.dependencycheck.utils.DependencyVersion
Line
@@ -351,7 +358,7 @@
Line
add the FTP protocol?
-158
+163 AnalyzerServiceTest
- ArchiveAnalyzerTest
+ ArchiveAnalyzerIntegrationTest
AssemblyAnalyzerTest
@@ -36,22 +36,25 @@
BaseDBTestCase
- CPEAnalyzerTest
+ BaseTest
+
+
+ CPEAnalyzerIntegrationTest
ChecksumTest
- CveDBMySQLTest
+ CveDBIntegrationTest
- CveDBTest
+ CveDBMySQLTest
CweDBTest
- DatabasePropertiesTest
+ DatabasePropertiesIntegrationTest
DependencyBundlingAnalyzerTest
@@ -91,6 +94,9 @@
FilterTest
+
+
+ HintAnalyzerTest
IndexEntryTest
@@ -126,7 +132,7 @@
PropertyTypeTest
- ReportGeneratorTest
+ ReportGeneratorIntegrationTest
SettingsTest
@@ -153,7 +159,7 @@
UrlTokenizingFilterTest
- VulnerabilitySuppressionAnalyzerTest
+ VulnerabilitySuppressionAnalyzerIntegrationTest
VulnerableSoftwareTest
diff --git a/dependency-check-core/xref-test/index.html b/dependency-check-core/xref-test/index.html
index e68cdab66..617b8c267 100644
--- a/dependency-check-core/xref-test/index.html
+++ b/dependency-check-core/xref-test/index.html
@@ -4,7 +4,7 @@
Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/EngineIntegrationTest.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/EngineIntegrationTest.html
index 3b21c63f5..09e9e88e1 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/EngineIntegrationTest.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/EngineIntegrationTest.html
@@ -26,82 +26,75 @@
18 package org.owasp.dependencycheck;
19
20 import org.junit.After;
-21 import org.junit.AfterClass;
-22 import static org.junit.Assert.assertTrue;
-23 import org.junit.Before;
-24 import org.junit.BeforeClass;
-25 import org.junit.Test;
-26 import org.owasp.dependencycheck.data.nvdcve.CveDB;
-27 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
-28 import org.owasp.dependencycheck.dependency.Dependency;
-29 import org.owasp.dependencycheck.reporting.ReportGenerator;
-30 import org.owasp.dependencycheck.utils.Settings;
-31
-32
-33
-34
-35
-36 public class EngineIntegrationTest {
-37
-38 @BeforeClass
-39 public static void setUpClass() throws Exception {
-40 }
-41
-42 @AfterClass
-43 public static void tearDownClass() throws Exception {
-44 }
-45
-46 @Before
-47 public void setUp() throws Exception {
-48 org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase.ensureDBExists();
-49 }
-50
-51 @After
-52 public void tearDown() {
-53 }
-54
-55
-56
-57
-58
-59
-60 @Test
-61 public void testScan() throws Exception {
-62 String testClasses = "target/test-classes/*.zip" ;
-63 boolean autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
-64 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false);
-65 Engine instance = new Engine();
-66 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-67 instance.scan(testClasses);
-68 assertTrue(instance.getDependencies().size() > 0);
-69 for (Dependency d : instance.getDependencies()) {
-70 assertTrue("non-zip file collected " + d.getFileName(), d.getFileName().toLowerCase().endsWith(".zip" ));
-71 }
-72 instance.cleanup();
-73 }
-74
-75
-76
-77
-78
-79
-80 @Test
-81 public void testEngine() throws Exception {
-82 String testClasses = "target/test-classes" ;
-83 Engine instance = new Engine();
-84 instance.scan(testClasses);
-85 assertTrue(instance.getDependencies().size() > 0);
-86 instance.analyzeDependencies();
-87 CveDB cveDB = new CveDB();
-88 cveDB.open();
-89 DatabaseProperties dbProp = cveDB.getDatabaseProperties();
-90 cveDB.close();
-91 ReportGenerator rg = new ReportGenerator("DependencyCheck" ,
-92 instance.getDependencies(), instance.getAnalyzers(), dbProp);
-93 rg.generateReports("./target/" , "ALL" );
-94 instance.cleanup();
-95 }
-96 }
+21 import static org.junit.Assert.assertTrue;
+22 import org.junit.Before;
+23 import org.junit.Test;
+24 import org.owasp.dependencycheck.data.nvdcve.CveDB;
+25 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
+26 import org.owasp.dependencycheck.dependency.Dependency;
+27 import org.owasp.dependencycheck.reporting.ReportGenerator;
+28 import org.owasp.dependencycheck.utils.Settings;
+29
+30
+31
+32
+33
+34 public class EngineIntegrationTest extends BaseTest {
+35
+36 @Before
+37 public void setUp() throws Exception {
+38 org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase.ensureDBExists();
+39 }
+40
+41 @After
+42 public void tearDown() {
+43 }
+44
+45
+46
+47
+48
+49
+50 @Test
+51 public void testScan() throws Exception {
+52 String testClasses = "target/test-classes/*.zip" ;
+53 boolean autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
+54 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false);
+55 Engine instance = new Engine();
+56 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+57 instance.scan(testClasses);
+58 assertTrue(instance.getDependencies().size() > 0);
+59 for (Dependency d : instance.getDependencies()) {
+60 assertTrue("non-zip file collected " + d.getFileName(), d.getFileName().toLowerCase().endsWith(".zip" ));
+61 }
+62 instance.cleanup();
+63 }
+64
+65
+66
+67
+68
+69
+70 @Test
+71 public void testEngine() throws Exception {
+72 String testClasses = "target/test-classes" ;
+73
+74
+75 Engine instance = new Engine();
+76
+77 instance.scan(testClasses);
+78 assertTrue(instance.getDependencies().size() > 0);
+79 instance.analyzeDependencies();
+80 CveDB cveDB = new CveDB();
+81 cveDB.open();
+82 DatabaseProperties dbProp = cveDB.getDatabaseProperties();
+83 cveDB.close();
+84 ReportGenerator rg = new ReportGenerator("DependencyCheck" ,
+85 instance.getDependencies(), instance.getAnalyzers(), dbProp);
+86 rg.generateReports("./target/" , "ALL" );
+87 instance.cleanup();
+88 }
+89 }
18 package org.owasp.dependencycheck.analyzer;
19
20 import java.util.Set;
-21 import org.junit.After;
-22 import org.junit.AfterClass;
-23 import static org.junit.Assert.assertEquals;
-24 import static org.junit.Assert.assertTrue;
-25 import org.junit.Before;
-26 import org.junit.BeforeClass;
-27 import org.junit.Test;
-28
-29
-30
-31
-32
-33 public class AbstractFileTypeAnalyzerTest {
-34
-35 public AbstractFileTypeAnalyzerTest () {
-36 }
-37
-38 @BeforeClass
-39 public static void setUpClass() throws Exception {
-40 }
-41
-42 @AfterClass
-43 public static void tearDownClass() throws Exception {
-44 }
-45
-46 @Before
-47 public void setUp() {
-48 }
-49
-50 @After
-51 public void tearDown() {
-52 }
-53
-54
-55
-56
-57 @Test
-58 public void testNewHashSet() {
-59 Set result = AbstractFileTypeAnalyzer.newHashSet("one" , "two" );
-60 assertEquals(2, result.size());
-61 assertTrue(result.contains("one" ));
-62 assertTrue(result.contains("two" ));
-63 }
-64 }
+21 import static org.junit.Assert.assertEquals;
+22 import static org.junit.Assert.assertTrue;
+23 import org.junit.Test;
+24 import org.owasp.dependencycheck.BaseTest;
+25
+26
+27
+28
+29
+30 public class AbstractFileTypeAnalyzerTest extends BaseTest {
+31
+32
+33
+34
+35 @Test
+36 public void testNewHashSet() {
+37 Set result = AbstractFileTypeAnalyzer.newHashSet("one" , "two" );
+38 assertEquals(2, result.size());
+39 assertTrue(result.contains("one" ));
+40 assertTrue(result.contains("two" ));
+41 }
+42 }
23 import java.util.Set;
24 import java.util.logging.Level;
25 import java.util.logging.Logger;
-26 import org.junit.After;
-27 import org.junit.AfterClass;
-28 import static org.junit.Assert.assertEquals;
-29 import static org.junit.Assert.assertNull;
-30 import org.junit.Before;
-31 import org.junit.BeforeClass;
-32 import org.junit.Test;
-33 import org.owasp.dependencycheck.Engine;
-34 import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
-35 import org.owasp.dependencycheck.dependency.Dependency;
-36 import org.owasp.dependencycheck.suppression.SuppressionRule;
-37 import org.owasp.dependencycheck.utils.Settings;
-38
-39
-40
-41
-42
-43 public class AbstractSuppressionAnalyzerTest {
-44
-45 public AbstractSuppressionAnalyzerTest () {
-46 }
-47
-48 @BeforeClass
-49 public static void setUpClass() {
-50 }
-51
-52 @AfterClass
-53 public static void tearDownClass() {
-54 }
-55
-56 @Before
-57 public void setUp() {
-58 try {
-59 final String uri = this .getClass().getClassLoader().getResource("suppressions.xml" ).toURI().toURL().toString();
-60 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, uri);
-61 } catch (URISyntaxException ex) {
-62 Logger.getLogger(AbstractSuppressionAnalyzerTest.class .getName()).log(Level.SEVERE, null , ex);
-63 } catch (MalformedURLException ex) {
-64 Logger.getLogger(AbstractSuppressionAnalyzerTest.class .getName()).log(Level.SEVERE, null , ex);
-65 }
-66 }
-67
-68 @After
-69 public void tearDown() {
-70 }
-71
-72
-73
-74
-75 @Test
-76 public void testGetSupportedExtensions() {
-77 AbstractSuppressionAnalyzer instance = new AbstractSuppressionAnalyzerImpl ();
-78 Set<String> result = instance.getSupportedExtensions();
-79 assertNull(result);
-80 }
-81
-82
-83
-84
-85 @Test
-86 public void testInitialize() throws Exception {
-87 AbstractSuppressionAnalyzer instance = new AbstractSuppressionAnalyzerImpl ();
-88 instance.initialize();
-89 }
-90
-91
-92
-93
-94 @Test
-95 public void testGetRules() throws Exception {
-96 AbstractSuppressionAnalyzer instance = new AbstractSuppressionAnalyzerImpl ();
-97 instance.initialize();
-98 int expCount = 5;
-99 List<SuppressionRule> result = instance.getRules();
-100 assertEquals(expCount, result.size());
-101 }
-102
-103 public class AbstractSuppressionAnalyzerImpl extends AbstractSuppressionAnalyzer {
-104
-105 @Override
-106 public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
-107 throw new UnsupportedOperationException("Not supported yet." );
-108 }
-109
-110 @Override
-111 public String getName() {
-112 throw new UnsupportedOperationException("Not supported yet." );
-113 }
-114
-115 @Override
-116 public AnalysisPhase getAnalysisPhase() {
-117 throw new UnsupportedOperationException("Not supported yet." );
-118 }
-119 }
-120
-121 }
+26 import static org.junit.Assert.assertEquals;
+27 import static org.junit.Assert.assertNull;
+28 import org.junit.Before;
+29 import org.junit.Test;
+30 import org.owasp.dependencycheck.BaseTest;
+31 import org.owasp.dependencycheck.Engine;
+32 import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
+33 import org.owasp.dependencycheck.dependency.Dependency;
+34 import org.owasp.dependencycheck.suppression.SuppressionRule;
+35 import org.owasp.dependencycheck.utils.Settings;
+36
+37
+38
+39
+40
+41 public class AbstractSuppressionAnalyzerTest extends BaseTest {
+42
+43 @Before
+44 public void setUp() throws Exception {
+45 try {
+46 final String uri = this .getClass().getClassLoader().getResource("suppressions.xml" ).toURI().toURL().toString();
+47 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, uri);
+48 } catch (URISyntaxException ex) {
+49 Logger.getLogger(AbstractSuppressionAnalyzerTest.class .getName()).log(Level.SEVERE, null , ex);
+50 } catch (MalformedURLException ex) {
+51 Logger.getLogger(AbstractSuppressionAnalyzerTest.class .getName()).log(Level.SEVERE, null , ex);
+52 }
+53 }
+54
+55
+56
+57
+58 @Test
+59 public void testGetSupportedExtensions() {
+60 AbstractSuppressionAnalyzer instance = new AbstractSuppressionAnalyzerImpl ();
+61 Set<String> result = instance.getSupportedExtensions();
+62 assertNull(result);
+63 }
+64
+65
+66
+67
+68 @Test
+69 public void testInitialize() throws Exception {
+70 AbstractSuppressionAnalyzer instance = new AbstractSuppressionAnalyzerImpl ();
+71 instance.initialize();
+72 }
+73
+74
+75
+76
+77 @Test
+78 public void testGetRules() throws Exception {
+79 AbstractSuppressionAnalyzer instance = new AbstractSuppressionAnalyzerImpl ();
+80 instance.initialize();
+81 int expCount = 5;
+82 List<SuppressionRule> result = instance.getRules();
+83 assertEquals(expCount, result.size());
+84 }
+85
+86 public class AbstractSuppressionAnalyzerImpl extends AbstractSuppressionAnalyzer {
+87
+88 @Override
+89 public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
+90 throw new UnsupportedOperationException("Not supported yet." );
+91 }
+92
+93 @Override
+94 public String getName() {
+95 throw new UnsupportedOperationException("Not supported yet." );
+96 }
+97
+98 @Override
+99 public AnalysisPhase getAnalysisPhase() {
+100 throw new UnsupportedOperationException("Not supported yet." );
+101 }
+102 }
+103
+104 }
18 package org.owasp.dependencycheck.analyzer;
19
20 import java.util.Iterator;
-21 import org.junit.After;
-22 import org.junit.AfterClass;
-23 import static org.junit.Assert.assertTrue;
-24 import org.junit.Before;
-25 import org.junit.BeforeClass;
-26 import org.junit.Test;
-27
-28
-29
-30
-31
-32 public class AnalyzerServiceTest {
-33
-34 public AnalyzerServiceTest () {
-35 }
-36
-37 @BeforeClass
-38 public static void setUpClass() throws Exception {
-39 }
-40
-41 @AfterClass
-42 public static void tearDownClass() throws Exception {
-43 }
-44
-45 @Before
-46 public void setUp() {
+21 import static org.junit.Assert.assertTrue;
+22 import org.junit.Test;
+23 import org.owasp.dependencycheck.BaseTest;
+24
+25
+26
+27
+28
+29 public class AnalyzerServiceTest extends BaseTest {
+30
+31
+32
+33
+34 @Test
+35 public void testGetAnalyzers() {
+36 AnalyzerService instance = new AnalyzerService(Thread.currentThread().getContextClassLoader());
+37 Iterator<Analyzer> result = instance.getAnalyzers();
+38
+39 boolean found = false;
+40 while (result.hasNext()) {
+41 Analyzer a = result.next();
+42 if ("Jar Analyzer" .equals(a.getName())) {
+43 found = true ;
+44 }
+45 }
+46 assertTrue("JarAnalyzer loaded" , found);
47 }
-48
-49 @After
-50 public void tearDown() {
-51 }
-52
-53
-54
-55
-56 @Test
-57 public void testGetAnalyzers() {
-58 AnalyzerService instance = AnalyzerService.getInstance();
-59 Iterator<Analyzer> result = instance.getAnalyzers();
-60
-61 boolean found = false;
-62 while (result.hasNext()) {
-63 Analyzer a = result.next();
-64 if ("Jar Analyzer" .equals(a.getName())) {
-65 found = true ;
-66 }
-67 }
-68 assertTrue("JarAnalyzer loaded" , found);
-69 }
-70 }
+48 }
17
18 package org.owasp.dependencycheck.analyzer;
19
-20 import static org.junit.Assert.assertEquals;
-21 import static org.junit.Assert.assertTrue;
-22 import static org.junit.Assert.fail;
-23 import static org.junit.Assume.assumeFalse;
-24
-25 import java.io.File;
-26 import java.util.logging.Level;
-27 import java.util.logging.Logger;
-28
-29 import org.junit.After;
-30 import org.junit.Assume;
-31 import org.junit.Before;
-32 import org.junit.Test;
-33 import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
-34 import org.owasp.dependencycheck.dependency.Confidence;
-35 import org.owasp.dependencycheck.dependency.Dependency;
-36 import org.owasp.dependencycheck.dependency.Evidence;
-37 import org.owasp.dependencycheck.utils.Settings;
-38
-39
-40
-41
-42
-43
-44
-45 public class AssemblyAnalyzerTest {
-46
-47 private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class .getName());
-48
-49 AssemblyAnalyzer analyzer;
-50
-51
-52
-53
-54
-55
-56 @Before
-57 public void setUp() {
-58 try {
-59 analyzer = new AssemblyAnalyzer();
-60 analyzer.supportsExtension("dll" );
-61 analyzer.initialize();
-62 } catch (Exception e) {
-63 LOGGER.log(Level.WARNING, "Exception setting up AssemblyAnalyzer. Tests will be incomplete" , e);
-64 Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE" , e);
-65 }
-66 }
-67
-68
-69
-70
-71 @Test
-72 public void testGetName() {
-73 assertEquals("Assembly Analyzer" , analyzer.getName());
-74 }
-75
-76 @Test
-77 public void testAnalysis() throws Exception {
-78 File f = new File(AssemblyAnalyzerTest.class .getClassLoader().getResource("GrokAssembly.exe" ).getPath());
-79 Dependency d = new Dependency(f);
-80 analyzer.analyze(d, null );
-81 boolean foundVendor = false;
-82 for (Evidence e : d.getVendorEvidence().getEvidence("grokassembly" , "vendor" )) {
-83 if ("OWASP" .equals(e.getValue())) {
-84 foundVendor = true ;
-85 }
-86 }
-87 assertTrue(foundVendor);
-88
-89 boolean foundProduct = false;
-90 for (Evidence e : d.getProductEvidence().getEvidence("grokassembly" , "product" )) {
-91 if ("GrokAssembly" .equals(e.getValue())) {
-92 foundProduct = true ;
-93 }
-94 }
-95 assertTrue(foundProduct);
-96 }
-97
-98 @Test
-99 public void testLog4Net() throws Exception {
-100 File f = new File(AssemblyAnalyzerTest.class .getClassLoader().getResource("log4net.dll" ).getPath());
-101 Dependency d = new Dependency(f);
-102 analyzer.analyze(d, null );
-103 assertTrue(d.getVersionEvidence().getEvidence().contains(new Evidence("grokassembly" , "version" , "1.2.13.0" , Confidence.HIGHEST)));
-104 assertTrue(d.getVendorEvidence().getEvidence().contains(new Evidence("grokassembly" , "vendor" , "The Apache Software Foundation" , Confidence.HIGH)));
-105 assertTrue(d.getProductEvidence().getEvidence().contains(new Evidence("grokassembly" , "product" , "log4net" , Confidence.HIGH)));
-106 }
-107
-108 @Test
-109 public void testNonexistent() {
-110 Level oldLevel = Logger.getLogger(AssemblyAnalyzer.class .getName()).getLevel();
-111 Level oldDependency = Logger.getLogger(Dependency.class .getName()).getLevel();
-112
-113 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(Level.OFF);
-114 Logger.getLogger(Dependency.class .getName()).setLevel(Level.OFF);
-115 File f = new File(AssemblyAnalyzerTest.class .getClassLoader().getResource("log4net.dll" ).getPath());
-116 File test = new File(f.getParent(), "nonexistent.dll" );
-117 Dependency d = new Dependency(test);
-118
-119 try {
-120 analyzer.analyze(d, null );
-121 fail("Expected an AnalysisException" );
-122 } catch (AnalysisException ae) {
-123 assertEquals("File does not exist" , ae.getMessage());
-124 } finally {
-125 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(oldLevel);
-126 Logger.getLogger(Dependency.class .getName()).setLevel(oldDependency);
-127 }
-128 }
-129
-130 @Test
-131 public void testWithSettingMono() throws Exception {
+20 import java.io.File;
+21 import java.util.logging.Level;
+22 import java.util.logging.Logger;
+23 import org.junit.After;
+24 import static org.junit.Assert.assertEquals;
+25 import static org.junit.Assert.assertTrue;
+26 import static org.junit.Assert.fail;
+27 import org.junit.Assume;
+28 import static org.junit.Assume.assumeFalse;
+29 import org.junit.Before;
+30 import org.junit.Test;
+31 import org.owasp.dependencycheck.BaseTest;
+32 import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
+33 import org.owasp.dependencycheck.dependency.Confidence;
+34 import org.owasp.dependencycheck.dependency.Dependency;
+35 import org.owasp.dependencycheck.dependency.Evidence;
+36 import org.owasp.dependencycheck.utils.Settings;
+37
+38
+39
+40
+41
+42
+43
+44 public class AssemblyAnalyzerTest extends BaseTest {
+45
+46 private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzerTest.class .getName());
+47
+48 AssemblyAnalyzer analyzer;
+49
+50
+51
+52
+53
+54
+55 @Before
+56 public void setUp() throws Exception {
+57 try {
+58 analyzer = new AssemblyAnalyzer();
+59 analyzer.supportsExtension("dll" );
+60 analyzer.initialize();
+61 } catch (Exception e) {
+62 if (e.getMessage().contains("Could not execute .NET AssemblyAnalyzer" )) {
+63 LOGGER.log(Level.WARNING, "Exception setting up AssemblyAnalyzer. Tests will be incomplete" );
+64 } else {
+65 LOGGER.log(Level.WARNING, "Exception setting up AssemblyAnalyzer. Tests will be incomplete" , e);
+66 }
+67 Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE" , e);
+68 }
+69 }
+70
+71
+72
+73
+74 @Test
+75 public void testGetName() {
+76 assertEquals("Assembly Analyzer" , analyzer.getName());
+77 }
+78
+79 @Test
+80 public void testAnalysis() throws Exception {
+81 File f = new File(AssemblyAnalyzerTest.class .getClassLoader().getResource("GrokAssembly.exe" ).getPath());
+82 Dependency d = new Dependency(f);
+83 analyzer.analyze(d, null );
+84 boolean foundVendor = false;
+85 for (Evidence e : d.getVendorEvidence().getEvidence("grokassembly" , "vendor" )) {
+86 if ("OWASP" .equals(e.getValue())) {
+87 foundVendor = true ;
+88 }
+89 }
+90 assertTrue(foundVendor);
+91
+92 boolean foundProduct = false;
+93 for (Evidence e : d.getProductEvidence().getEvidence("grokassembly" , "product" )) {
+94 if ("GrokAssembly" .equals(e.getValue())) {
+95 foundProduct = true ;
+96 }
+97 }
+98 assertTrue(foundProduct);
+99 }
+100
+101 @Test
+102 public void testLog4Net() throws Exception {
+103 File f = new File(AssemblyAnalyzerTest.class .getClassLoader().getResource("log4net.dll" ).getPath());
+104 Dependency d = new Dependency(f);
+105 analyzer.analyze(d, null );
+106 assertTrue(d.getVersionEvidence().getEvidence().contains(new Evidence("grokassembly" , "version" , "1.2.13.0" , Confidence.HIGHEST)));
+107 assertTrue(d.getVendorEvidence().getEvidence().contains(new Evidence("grokassembly" , "vendor" , "The Apache Software Foundation" , Confidence.HIGH)));
+108 assertTrue(d.getProductEvidence().getEvidence().contains(new Evidence("grokassembly" , "product" , "log4net" , Confidence.HIGH)));
+109 }
+110
+111 @Test
+112 public void testNonexistent() {
+113 Level oldLevel = Logger.getLogger(AssemblyAnalyzer.class .getName()).getLevel();
+114 Level oldDependency = Logger.getLogger(Dependency.class .getName()).getLevel();
+115
+116 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(Level.OFF);
+117 Logger.getLogger(Dependency.class .getName()).setLevel(Level.OFF);
+118 File f = new File(AssemblyAnalyzerTest.class .getClassLoader().getResource("log4net.dll" ).getPath());
+119 File test = new File(f.getParent(), "nonexistent.dll" );
+120 Dependency d = new Dependency(test);
+121
+122 try {
+123 analyzer.analyze(d, null );
+124 fail("Expected an AnalysisException" );
+125 } catch (AnalysisException ae) {
+126 assertEquals("File does not exist" , ae.getMessage());
+127 } finally {
+128 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(oldLevel);
+129 Logger.getLogger(Dependency.class .getName()).setLevel(oldDependency);
+130 }
+131 }
132
-133
-134 assumeFalse(System.getProperty("os.name" ).startsWith("Windows" ));
+133 @Test
+134 public void testWithSettingMono() throws Exception {
135
-136 String oldValue = Settings.getString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH);
-137
-138
-139
-140
-141 if (oldValue == null ) {
-142 System.setProperty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, "/yooser/bine/mono" );
-143 } else {
-144 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, "/yooser/bine/mono" );
-145 }
-146
-147 Level oldLevel = Logger.getLogger(AssemblyAnalyzer.class .getName()).getLevel();
-148 try {
-149
-150 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(Level.OFF);
-151
-152 AssemblyAnalyzer aanalyzer = new AssemblyAnalyzer();
-153 aanalyzer.supportsExtension("dll" );
-154 aanalyzer.initialize();
-155 fail("Expected an AnalysisException" );
-156 } catch (AnalysisException ae) {
-157 assertEquals("An error occured with the .NET AssemblyAnalyzer" , ae.getMessage());
-158 } finally {
-159
-160 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(oldLevel);
-161
-162
-163 if (oldValue == null ) {
-164 System.getProperties().remove(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH);
-165 } else {
-166 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, oldValue);
-167 }
-168 }
-169 }
-170
-171 @After
-172 public void tearDown() throws Exception {
-173 analyzer.close();
-174 }
-175 }
+136
+137 assumeFalse(System.getProperty("os.name" ).startsWith("Windows" ));
+138
+139 String oldValue = Settings.getString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH);
+140
+141
+142
+143
+144 if (oldValue == null ) {
+145 System.setProperty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, "/yooser/bine/mono" );
+146 } else {
+147 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, "/yooser/bine/mono" );
+148 }
+149
+150 Level oldLevel = Logger.getLogger(AssemblyAnalyzer.class .getName()).getLevel();
+151 try {
+152
+153 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(Level.OFF);
+154
+155 AssemblyAnalyzer aanalyzer = new AssemblyAnalyzer();
+156 aanalyzer.supportsExtension("dll" );
+157 aanalyzer.initialize();
+158 fail("Expected an AnalysisException" );
+159 } catch (AnalysisException ae) {
+160 assertEquals("An error occured with the .NET AssemblyAnalyzer" , ae.getMessage());
+161 } finally {
+162
+163 Logger.getLogger(AssemblyAnalyzer.class .getName()).setLevel(oldLevel);
+164
+165
+166 if (oldValue == null ) {
+167 System.getProperties().remove(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH);
+168 } else {
+169 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, oldValue);
+170 }
+171 }
+172 }
+173
+174 @After
+175 public void tearDown() throws Exception {
+176 analyzer.close();
+177 }
+178 }
17
18 package org.owasp.dependencycheck.analyzer;
19
-20 import org.junit.After;
-21 import org.junit.AfterClass;
-22 import static org.junit.Assert.assertEquals;
-23 import org.junit.Before;
-24 import org.junit.BeforeClass;
-25 import org.junit.Test;
-26 import org.owasp.dependencycheck.dependency.Dependency;
-27
-28
-29
-30
-31
-32 public class DependencyBundlingAnalyzerTest {
-33
-34 public DependencyBundlingAnalyzerTest () {
-35 }
-36
-37 @BeforeClass
-38 public static void setUpClass() {
-39 }
-40
-41 @AfterClass
-42 public static void tearDownClass() {
-43 }
-44
-45 @Before
-46 public void setUp() {
-47 }
-48
-49 @After
-50 public void tearDown() {
+20 import static org.junit.Assert.assertEquals;
+21 import org.junit.Test;
+22 import org.owasp.dependencycheck.BaseTest;
+23 import org.owasp.dependencycheck.dependency.Dependency;
+24
+25
+26
+27
+28
+29 public class DependencyBundlingAnalyzerTest extends BaseTest {
+30
+31
+32
+33
+34 @Test
+35 public void testGetName() {
+36 DependencyBundlingAnalyzer instance = new DependencyBundlingAnalyzer();
+37 String expResult = "Dependency Bundling Analyzer" ;
+38 String result = instance.getName();
+39 assertEquals(expResult, result);
+40 }
+41
+42
+43
+44
+45 @Test
+46 public void testGetAnalysisPhase() {
+47 DependencyBundlingAnalyzer instance = new DependencyBundlingAnalyzer();
+48 AnalysisPhase expResult = AnalysisPhase.PRE_FINDING_ANALYSIS;
+49 AnalysisPhase result = instance.getAnalysisPhase();
+50 assertEquals(expResult, result);
51 }
52
53
-54
+54
55
56 @Test
-57 public void testGetName() {
-58 DependencyBundlingAnalyzer instance = new DependencyBundlingAnalyzer();
-59 String expResult = "Dependency Bundling Analyzer" ;
-60 String result = instance.getName();
-61 assertEquals(expResult, result);
-62 }
-63
-64
-65
-66
-67 @Test
-68 public void testGetAnalysisPhase() {
-69 DependencyBundlingAnalyzer instance = new DependencyBundlingAnalyzer();
-70 AnalysisPhase expResult = AnalysisPhase.PRE_FINDING_ANALYSIS;
-71 AnalysisPhase result = instance.getAnalysisPhase();
-72 assertEquals(expResult, result);
-73 }
-74
-75
-76
-77
-78 @Test
-79 public void testAnalyze() throws Exception {
-80
-81
-82
-83
-84
-85
-86 }
-87
-88
-89
-90
-91 @Test
-92 public void testIsCore() {
-93 Dependency left = new Dependency();
-94 Dependency right = new Dependency();
-95
-96 left.setFileName("axis2-kernel-1.4.1.jar" );
-97 right.setFileName("axis2-adb-1.4.1.jar" );
-98 DependencyBundlingAnalyzer instance = new DependencyBundlingAnalyzer();
-99 boolean expResult = true ;
-100 boolean result = instance.isCore(left, right);
-101 assertEquals(expResult, result);
-102
-103 left.setFileName("struts-1.2.7.jar" );
-104 right.setFileName("file.tar.gz\\file.tar\\struts.jar" );
-105
-106 expResult = true ;
-107 result = instance.isCore(left, right);
-108 assertEquals(expResult, result);
-109 }
-110
-111 }
+57 public void testAnalyze() throws Exception {
+58
+59
+60
+61
+62
+63
+64 }
+65
+66
+67
+68
+69 @Test
+70 public void testIsCore() {
+71 Dependency left = new Dependency();
+72 Dependency right = new Dependency();
+73
+74 left.setFileName("axis2-kernel-1.4.1.jar" );
+75 right.setFileName("axis2-adb-1.4.1.jar" );
+76 DependencyBundlingAnalyzer instance = new DependencyBundlingAnalyzer();
+77 boolean expResult = true ;
+78 boolean result = instance.isCore(left, right);
+79 assertEquals(expResult, result);
+80
+81 left.setFileName("struts-1.2.7.jar" );
+82 right.setFileName("file.tar.gz\\file.tar\\struts.jar" );
+83
+84 expResult = true ;
+85 result = instance.isCore(left, right);
+86 assertEquals(expResult, result);
+87 }
+88
+89 }
15
16 package org.owasp.dependencycheck.analyzer;
17
-18 import org.junit.After;
-19 import org.junit.AfterClass;
-20 import static org.junit.Assert.assertEquals;
-21 import static org.junit.Assert.assertTrue;
-22 import org.junit.Before;
-23 import org.junit.BeforeClass;
-24 import org.junit.Test;
-25 import org.owasp.dependencycheck.Engine;
-26 import org.owasp.dependencycheck.dependency.Dependency;
-27
-28
-29
-30
-31
-32 public class FalsePositiveAnalyzerTest {
-33
-34 public FalsePositiveAnalyzerTest () {
-35 }
-36
-37 @BeforeClass
-38 public static void setUpClass() {
+18 import static org.junit.Assert.assertEquals;
+19 import static org.junit.Assert.assertTrue;
+20 import org.junit.Test;
+21 import org.owasp.dependencycheck.Engine;
+22 import org.owasp.dependencycheck.dependency.Dependency;
+23
+24
+25
+26
+27
+28 public class FalsePositiveAnalyzerTest {
+29
+30
+31
+32
+33 @Test
+34 public void testGetName() {
+35 FalsePositiveAnalyzer instance = new FalsePositiveAnalyzer();
+36 String expResult = "False Positive Analyzer" ;
+37 String result = instance.getName();
+38 assertEquals(expResult, result);
39 }
40
-41 @AfterClass
-42 public static void tearDownClass() {
-43 }
-44
-45 @Before
-46 public void setUp() {
-47 }
-48
-49 @After
-50 public void tearDown() {
-51 }
-52
-53
-54
-55
-56 @Test
-57 public void testGetName() {
-58 FalsePositiveAnalyzer instance = new FalsePositiveAnalyzer();
-59 String expResult = "False Positive Analyzer" ;
-60 String result = instance.getName();
-61 assertEquals(expResult, result);
-62 }
-63
-64
-65
-66
-67 @Test
-68 public void testGetAnalysisPhase() {
-69 FalsePositiveAnalyzer instance = new FalsePositiveAnalyzer();
-70 AnalysisPhase expResult = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;
-71 AnalysisPhase result = instance.getAnalysisPhase();
-72 assertEquals(expResult, result);
-73 }
-74
-75
-76
-77
-78 @Test
-79 public void testAnalyze() throws Exception {
-80 Dependency dependency = new Dependency();
-81 dependency.setFileName("pom.xml" );
-82 dependency.addIdentifier("cpe" , "cpe:/a:file:file:1.2.1" , "http://some.org/url" );
-83 Engine engine = null ;
-84 FalsePositiveAnalyzer instance = new FalsePositiveAnalyzer();
-85 int before = dependency.getIdentifiers().size();
-86 instance.analyze(dependency, engine);
-87 int after = dependency.getIdentifiers().size();
-88 assertTrue(before > after);
-89 }
-90
-91 }
+41
+42
+43
+44 @Test
+45 public void testGetAnalysisPhase() {
+46 FalsePositiveAnalyzer instance = new FalsePositiveAnalyzer();
+47 AnalysisPhase expResult = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;
+48 AnalysisPhase result = instance.getAnalysisPhase();
+49 assertEquals(expResult, result);
+50 }
+51
+52
+53
+54
+55 @Test
+56 public void testAnalyze() throws Exception {
+57 Dependency dependency = new Dependency();
+58 dependency.setFileName("pom.xml" );
+59 dependency.addIdentifier("cpe" , "cpe:/a:file:file:1.2.1" , "http://some.org/url" );
+60 Engine engine = null ;
+61 FalsePositiveAnalyzer instance = new FalsePositiveAnalyzer();
+62 int before = dependency.getIdentifiers().size();
+63 instance.analyze(dependency, engine);
+64 int after = dependency.getIdentifiers().size();
+65 assertTrue(before > after);
+66 }
+67
+68 }
18 package org.owasp.dependencycheck.analyzer;
19
20 import java.io.File;
-21 import org.junit.After;
-22 import org.junit.AfterClass;
-23 import static org.junit.Assert.assertEquals;
-24 import static org.junit.Assert.assertTrue;
-25 import org.junit.Before;
-26 import org.junit.BeforeClass;
-27 import org.junit.Test;
-28 import org.owasp.dependencycheck.dependency.Dependency;
-29
-30
-31
-32
-33
-34 public class FileNameAnalyzerTest {
-35
-36 public FileNameAnalyzerTest () {
-37 }
-38
-39 @BeforeClass
-40 public static void setUpClass() throws Exception {
+21 import static org.junit.Assert.assertEquals;
+22 import static org.junit.Assert.assertTrue;
+23 import org.junit.Test;
+24 import org.owasp.dependencycheck.dependency.Dependency;
+25
+26
+27
+28
+29
+30 public class FileNameAnalyzerTest {
+31
+32
+33
+34
+35 @Test
+36 public void testGetName() {
+37 FileNameAnalyzer instance = new FileNameAnalyzer();
+38 String expResult = "File Name Analyzer" ;
+39 String result = instance.getName();
+40 assertEquals(expResult, result);
41 }
42
-43 @AfterClass
-44 public static void tearDownClass() throws Exception {
-45 }
-46
-47 @Before
-48 public void setUp() {
-49 }
-50
-51 @After
-52 public void tearDown() {
-53 }
-54
-55
-56
-57
-58 @Test
-59 public void testGetName() {
-60 FileNameAnalyzer instance = new FileNameAnalyzer();
-61 String expResult = "File Name Analyzer" ;
-62 String result = instance.getName();
-63 assertEquals(expResult, result);
-64 }
-65
-66
-67
-68
-69 @Test
-70 public void testGetAnalysisPhase() {
-71 FileNameAnalyzer instance = new FileNameAnalyzer();
-72 AnalysisPhase expResult = AnalysisPhase.INFORMATION_COLLECTION;
-73 AnalysisPhase result = instance.getAnalysisPhase();
-74 assertEquals(expResult, result);
-75 }
-76
-77
-78
-79
-80 @Test
-81 public void testAnalyze() throws Exception {
-82 File struts = new File(this .getClass().getClassLoader().getResource("struts2-core-2.1.2.jar" ).getPath());
-83 Dependency resultStruts = new Dependency(struts);
-84 File axis = new File(this .getClass().getClassLoader().getResource("axis2-adb-1.4.1.jar" ).getPath());
-85 Dependency resultAxis = new Dependency(axis);
-86 FileNameAnalyzer instance = new FileNameAnalyzer();
-87 instance.analyze(resultStruts, null );
-88 assertTrue(resultStruts.getVendorEvidence().toString().toLowerCase().contains("struts" ));
-89
-90 instance.analyze(resultAxis, null );
-91 assertTrue(resultStruts.getVersionEvidence().toString().toLowerCase().contains("2.1.2" ));
-92
-93 }
-94
-95
-96
-97
-98 @Test
-99 public void testInitialize() throws Exception {
-100 FileNameAnalyzer instance = new FileNameAnalyzer();
-101 instance.initialize();
-102 assertTrue(true );
-103 }
-104
-105
-106
-107
-108 @Test
-109 public void testClose() throws Exception {
-110 FileNameAnalyzer instance = new FileNameAnalyzer();
-111 instance.close();
-112 assertTrue(true );
-113 }
-114 }
+43
+44
+45
+46 @Test
+47 public void testGetAnalysisPhase() {
+48 FileNameAnalyzer instance = new FileNameAnalyzer();
+49 AnalysisPhase expResult = AnalysisPhase.INFORMATION_COLLECTION;
+50 AnalysisPhase result = instance.getAnalysisPhase();
+51 assertEquals(expResult, result);
+52 }
+53
+54
+55
+56
+57 @Test
+58 public void testAnalyze() throws Exception {
+59 File struts = new File(this .getClass().getClassLoader().getResource("struts2-core-2.1.2.jar" ).getPath());
+60 Dependency resultStruts = new Dependency(struts);
+61 File axis = new File(this .getClass().getClassLoader().getResource("axis2-adb-1.4.1.jar" ).getPath());
+62 Dependency resultAxis = new Dependency(axis);
+63 FileNameAnalyzer instance = new FileNameAnalyzer();
+64 instance.analyze(resultStruts, null );
+65 assertTrue(resultStruts.getVendorEvidence().toString().toLowerCase().contains("struts" ));
+66
+67 instance.analyze(resultAxis, null );
+68 assertTrue(resultStruts.getVersionEvidence().toString().toLowerCase().contains("2.1.2" ));
+69
+70 }
+71
+72
+73
+74
+75 @Test
+76 public void testInitialize() throws Exception {
+77 FileNameAnalyzer instance = new FileNameAnalyzer();
+78 instance.initialize();
+79 assertTrue(true );
+80 }
+81
+82
+83
+84
+85 @Test
+86 public void testClose() throws Exception {
+87 FileNameAnalyzer instance = new FileNameAnalyzer();
+88 instance.close();
+89 assertTrue(true );
+90 }
+91 }
21 import java.util.HashSet;
22 import java.util.Properties;
23 import java.util.Set;
-24 import org.junit.After;
-25 import org.junit.AfterClass;
-26 import static org.junit.Assert.assertEquals;
-27 import static org.junit.Assert.assertTrue;
-28 import org.junit.Before;
-29 import org.junit.BeforeClass;
-30 import org.junit.Test;
-31 import org.owasp.dependencycheck.dependency.Dependency;
-32 import org.owasp.dependencycheck.dependency.Evidence;
-33
-34
-35
-36
-37
-38 public class JarAnalyzerTest {
-39
-40 public JarAnalyzerTest () {
-41 }
-42
-43 @BeforeClass
-44 public static void setUpClass() throws Exception {
-45 }
-46
-47 @AfterClass
-48 public static void tearDownClass() throws Exception {
-49 }
+24 import static org.junit.Assert.assertEquals;
+25 import static org.junit.Assert.assertTrue;
+26 import org.junit.Test;
+27 import org.owasp.dependencycheck.BaseTest;
+28 import org.owasp.dependencycheck.dependency.Dependency;
+29 import org.owasp.dependencycheck.dependency.Evidence;
+30
+31
+32
+33
+34
+35 public class JarAnalyzerTest extends BaseTest {
+36
+37
+38
+39
+40
+41
+42 @Test
+43 public void testAnalyze() throws Exception {
+44 File file = new File(this .getClass().getClassLoader().getResource("struts2-core-2.1.2.jar" ).getPath());
+45 Dependency result = new Dependency(file);
+46 JarAnalyzer instance = new JarAnalyzer();
+47 instance.analyze(result, null );
+48 assertTrue(result.getVendorEvidence().toString().toLowerCase().contains("apache" ));
+49 assertTrue(result.getVendorEvidence().getWeighting().contains("apache" ));
50
-51 @Before
-52 public void setUp() {
-53 }
-54
-55 @After
-56 public void tearDown() {
-57 }
-58
-59
-60
-61
-62
-63
-64 @Test
-65 public void testAnalyze() throws Exception {
-66 File file = new File(this .getClass().getClassLoader().getResource("struts2-core-2.1.2.jar" ).getPath());
-67 Dependency result = new Dependency(file);
-68 JarAnalyzer instance = new JarAnalyzer();
-69 instance.analyze(result, null );
-70 assertTrue(result.getVendorEvidence().toString().toLowerCase().contains("apache" ));
-71 assertTrue(result.getVendorEvidence().getWeighting().contains("apache" ));
-72
-73 file = new File(this .getClass().getClassLoader().getResource("org.mortbay.jetty.jar" ).getPath());
-74 result = new Dependency(file);
-75 instance.analyze(result, null );
-76 boolean found = false;
-77 for (Evidence e : result.getProductEvidence()) {
-78 if (e.getName().equalsIgnoreCase("package-title" )
-79 && e.getValue().equalsIgnoreCase("org.mortbay.http" )) {
-80 found = true ;
-81 break ;
-82 }
-83 }
-84 assertTrue("package-title of org.mortbay.http not found in org.mortbay.jetty.jar" , found);
-85
-86 found = false;
-87 for (Evidence e : result.getVendorEvidence()) {
-88 if (e.getName().equalsIgnoreCase("implementation-url" )
-89 && e.getValue().equalsIgnoreCase("http://jetty.mortbay.org" )) {
-90 found = true ;
-91 break ;
-92 }
-93 }
-94 assertTrue("implementation-url of http://jetty.mortbay.org not found in org.mortbay.jetty.jar" , found);
-95
-96 found = false;
-97 for (Evidence e : result.getVersionEvidence()) {
-98 if (e.getName().equalsIgnoreCase("Implementation-Version" )
-99 && e.getValue().equalsIgnoreCase("4.2.27" )) {
-100 found = true ;
-101 break ;
-102 }
-103 }
-104 assertTrue("implementation-version of 4.2.27 not found in org.mortbay.jetty.jar" , found);
-105
-106 file = new File(this .getClass().getClassLoader().getResource("org.mortbay.jmx.jar" ).getPath());
-107 result = new Dependency(file);
-108 instance.analyze(result, null );
-109 assertEquals("org.mortbar,jmx.jar has version evidence?" , result.getVersionEvidence().size(), 0);
-110 }
-111
-112
-113
-114
-115 @Test
-116 public void testGetSupportedExtensions() {
-117 JarAnalyzer instance = new JarAnalyzer();
-118 Set expResult = new HashSet();
-119 expResult.add("jar" );
-120 expResult.add("war" );
-121 Set result = instance.getSupportedExtensions();
-122 assertEquals(expResult, result);
-123 }
-124
-125
-126
-127
-128 @Test
-129 public void testGetName() {
-130 JarAnalyzer instance = new JarAnalyzer();
-131 String expResult = "Jar Analyzer" ;
-132 String result = instance.getName();
-133 assertEquals(expResult, result);
-134 }
-135
-136
-137
-138
-139 @Test
-140 public void testSupportsExtension() {
-141 String extension = "jar" ;
-142 JarAnalyzer instance = new JarAnalyzer();
-143 boolean expResult = true ;
-144 boolean result = instance.supportsExtension(extension);
-145 assertEquals(expResult, result);
-146 }
-147
-148 @Test
-149 public void testInterpolateString() {
-150 Properties prop = new Properties();
-151 prop.setProperty("key" , "value" );
-152 prop.setProperty("nested" , "nested ${key}" );
-153 String text = "This is a test of '${key}' '${nested}'" ;
-154 String expResults = "This is a test of 'value' 'nested value'" ;
-155 JarAnalyzer instance = new JarAnalyzer();
-156 String results = instance.interpolateString(text, prop);
-157 assertEquals(expResults, results);
-158 }
-159 }
+51 file = new File(this .getClass().getClassLoader().getResource("org.mortbay.jetty.jar" ).getPath());
+52 result = new Dependency(file);
+53 instance.analyze(result, null );
+54 boolean found = false;
+55 for (Evidence e : result.getProductEvidence()) {
+56 if (e.getName().equalsIgnoreCase("package-title" )
+57 && e.getValue().equalsIgnoreCase("org.mortbay.http" )) {
+58 found = true ;
+59 break ;
+60 }
+61 }
+62 assertTrue("package-title of org.mortbay.http not found in org.mortbay.jetty.jar" , found);
+63
+64 found = false;
+65 for (Evidence e : result.getVendorEvidence()) {
+66 if (e.getName().equalsIgnoreCase("implementation-url" )
+67 && e.getValue().equalsIgnoreCase("http://jetty.mortbay.org" )) {
+68 found = true ;
+69 break ;
+70 }
+71 }
+72 assertTrue("implementation-url of http://jetty.mortbay.org not found in org.mortbay.jetty.jar" , found);
+73
+74 found = false;
+75 for (Evidence e : result.getVersionEvidence()) {
+76 if (e.getName().equalsIgnoreCase("Implementation-Version" )
+77 && e.getValue().equalsIgnoreCase("4.2.27" )) {
+78 found = true ;
+79 break ;
+80 }
+81 }
+82 assertTrue("implementation-version of 4.2.27 not found in org.mortbay.jetty.jar" , found);
+83
+84 file = new File(this .getClass().getClassLoader().getResource("org.mortbay.jmx.jar" ).getPath());
+85 result = new Dependency(file);
+86 instance.analyze(result, null );
+87 assertEquals("org.mortbar,jmx.jar has version evidence?" , result.getVersionEvidence().size(), 0);
+88 }
+89
+90
+91
+92
+93 @Test
+94 public void testGetSupportedExtensions() {
+95 JarAnalyzer instance = new JarAnalyzer();
+96 Set expResult = new HashSet();
+97 expResult.add("jar" );
+98 expResult.add("war" );
+99 Set result = instance.getSupportedExtensions();
+100 assertEquals(expResult, result);
+101 }
+102
+103
+104
+105
+106 @Test
+107 public void testGetName() {
+108 JarAnalyzer instance = new JarAnalyzer();
+109 String expResult = "Jar Analyzer" ;
+110 String result = instance.getName();
+111 assertEquals(expResult, result);
+112 }
+113
+114
+115
+116
+117 @Test
+118 public void testSupportsExtension() {
+119 String extension = "jar" ;
+120 JarAnalyzer instance = new JarAnalyzer();
+121 boolean expResult = true ;
+122 boolean result = instance.supportsExtension(extension);
+123 assertEquals(expResult, result);
+124 }
+125
+126 @Test
+127 public void testInterpolateString() {
+128 Properties prop = new Properties();
+129 prop.setProperty("key" , "value" );
+130 prop.setProperty("nested" , "nested ${key}" );
+131 String text = "This is a test of '${key}' '${nested}'" ;
+132 String expResults = "This is a test of 'value' 'nested value'" ;
+133 JarAnalyzer instance = new JarAnalyzer();
+134 String results = instance.interpolateString(text, prop);
+135 assertEquals(expResults, results);
+136 }
+137 }
20 import java.io.File;
21 import java.util.HashSet;
22 import java.util.Set;
-23 import org.junit.After;
-24 import org.junit.AfterClass;
-25 import static org.junit.Assert.assertEquals;
-26 import org.junit.Before;
-27 import org.junit.BeforeClass;
-28 import org.junit.Test;
-29 import org.owasp.dependencycheck.Engine;
-30 import org.owasp.dependencycheck.dependency.Dependency;
-31
-32
-33
-34
-35
-36 public class JavaScriptAnalyzerTest {
-37
-38 public JavaScriptAnalyzerTest () {
-39 }
-40
-41 @BeforeClass
-42 public static void setUpClass() {
-43 }
-44
-45 @AfterClass
-46 public static void tearDownClass() {
-47 }
-48
-49 @Before
-50 public void setUp() {
-51 }
-52
-53 @After
-54 public void tearDown() {
-55 }
-56
-57
-58
-59
-60 @Test
-61 public void testGetSupportedExtensions() {
-62 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
-63 Set expResult = new HashSet<String>();
-64 expResult.add("js" );
-65 Set result = instance.getSupportedExtensions();
-66 assertEquals(expResult, result);
-67 }
-68
-69
-70
-71
-72 @Test
-73 public void testGetName() {
-74 System.out.println("getName" );
-75 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
-76 String expResult = "JavaScript Analyzer" ;
-77 String result = instance.getName();
-78 assertEquals(expResult, result);
-79 }
-80
-81
-82
-83
-84 @Test
-85 public void testSupportsExtension() {
-86 String extension = "js" ;
-87 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
-88 boolean expResult = true ;
-89 boolean result = instance.supportsExtension(extension);
-90 assertEquals(expResult, result);
-91 }
-92
-93
-94
-95
-96 @Test
-97 public void testGetAnalysisPhase() {
-98 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
-99 AnalysisPhase expResult = AnalysisPhase.INFORMATION_COLLECTION;
-100 AnalysisPhase result = instance.getAnalysisPhase();
-101 assertEquals(expResult, result);
-102 }
-103
-104
-105
-106
-107 @Test
-108 public void testAnalyze() throws Exception {
-109 File jq6 = new File(this .getClass().getClassLoader().getResource("jquery-1.6.2.min.js" ).getPath());
-110 File jq10 = new File(this .getClass().getClassLoader().getResource("jquery-1.10.2.js" ).getPath());
-111 File jq10min = new File(this .getClass().getClassLoader().getResource("jquery-1.10.2.min.js" ).getPath());
-112 Dependency depJQ6 = new Dependency(jq6);
-113 Dependency depJQ10 = new Dependency(jq10);
-114 Dependency depJQ10min = new Dependency(jq10min);
-115 Engine engine = null ;
-116 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129 }
-130
-131
-132
-133
-134 @Test
-135 public void testInitialize() throws Exception {
-136 }
-137
-138
-139
-140
-141 @Test
-142 public void testClose() throws Exception {
-143
-144 }
-145 }
+23 import static org.junit.Assert.assertEquals;
+24 import org.junit.Test;
+25 import org.owasp.dependencycheck.BaseTest;
+26 import org.owasp.dependencycheck.Engine;
+27 import org.owasp.dependencycheck.dependency.Dependency;
+28
+29
+30
+31
+32
+33 public class JavaScriptAnalyzerTest extends BaseTest {
+34
+35
+36
+37
+38 @Test
+39 public void testGetSupportedExtensions() {
+40 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
+41 Set expResult = new HashSet<String>();
+42 expResult.add("js" );
+43 Set result = instance.getSupportedExtensions();
+44 assertEquals(expResult, result);
+45 }
+46
+47
+48
+49
+50 @Test
+51 public void testGetName() {
+52 System.out.println("getName" );
+53 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
+54 String expResult = "JavaScript Analyzer" ;
+55 String result = instance.getName();
+56 assertEquals(expResult, result);
+57 }
+58
+59
+60
+61
+62 @Test
+63 public void testSupportsExtension() {
+64 String extension = "js" ;
+65 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
+66 boolean expResult = true ;
+67 boolean result = instance.supportsExtension(extension);
+68 assertEquals(expResult, result);
+69 }
+70
+71
+72
+73
+74 @Test
+75 public void testGetAnalysisPhase() {
+76 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
+77 AnalysisPhase expResult = AnalysisPhase.INFORMATION_COLLECTION;
+78 AnalysisPhase result = instance.getAnalysisPhase();
+79 assertEquals(expResult, result);
+80 }
+81
+82
+83
+84
+85 @Test
+86 public void testAnalyze() throws Exception {
+87 File jq6 = new File(this .getClass().getClassLoader().getResource("jquery-1.6.2.min.js" ).getPath());
+88 File jq10 = new File(this .getClass().getClassLoader().getResource("jquery-1.10.2.js" ).getPath());
+89 File jq10min = new File(this .getClass().getClassLoader().getResource("jquery-1.10.2.min.js" ).getPath());
+90 Dependency depJQ6 = new Dependency(jq6);
+91 Dependency depJQ10 = new Dependency(jq10);
+92 Dependency depJQ10min = new Dependency(jq10min);
+93 Engine engine = null ;
+94 JavaScriptAnalyzer instance = new JavaScriptAnalyzer();
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107 }
+108
+109
+110
+111
+112 @Test
+113 public void testInitialize() throws Exception {
+114 }
+115
+116
+117
+118
+119 @Test
+120 public void testClose() throws Exception {
+121
+122 }
+123 }
22 import static org.junit.Assert.assertTrue;
23 import org.junit.Before;
24 import org.junit.Test;
-25
-26 public class NuspecAnalyzerTest {
-27
-28 private NuspecAnalyzer instance;
-29
-30 @Before
-31 public void setUp() {
-32 instance = new NuspecAnalyzer();
-33 instance.setEnabled(true );
-34 }
-35
-36 @Test
-37 public void testGetAnalyzerName() {
-38 assertEquals("Nuspec Analyzer" , instance.getName());
-39 }
-40
-41 @Test
-42 public void testGetSupportedExtensions() {
-43 assertTrue(instance.getSupportedExtensions().contains("nuspec" ));
-44 assertFalse(instance.getSupportedExtensions().contains("nupkg" ));
-45 }
-46
-47 @Test
-48 public void testSupportsExtension() {
-49 assertTrue(instance.supportsExtension("nuspec" ));
-50 assertFalse(instance.supportsExtension("nupkg" ));
-51 }
-52
-53 @Test
-54 public void testGetAnalysisPhaze() {
-55 assertEquals(AnalysisPhase.INFORMATION_COLLECTION, instance.getAnalysisPhase());
-56 }
-57 }
-58
-59
+25 import org.owasp.dependencycheck.BaseTest;
+26
+27 public class NuspecAnalyzerTest extends BaseTest {
+28
+29 private NuspecAnalyzer instance;
+30
+31 @Before
+32 public void setUp() throws Exception {
+33 instance = new NuspecAnalyzer();
+34 instance.setEnabled(true );
+35 }
+36
+37 @Test
+38 public void testGetAnalyzerName() {
+39 assertEquals("Nuspec Analyzer" , instance.getName());
+40 }
+41
+42 @Test
+43 public void testGetSupportedExtensions() {
+44 assertTrue(instance.getSupportedExtensions().contains("nuspec" ));
+45 assertFalse(instance.getSupportedExtensions().contains("nupkg" ));
+46 }
+47
+48 @Test
+49 public void testSupportsExtension() {
+50 assertTrue(instance.supportsExtension("nuspec" ));
+51 assertFalse(instance.supportsExtension("nupkg" ));
+52 }
+53
+54 @Test
+55 public void testGetAnalysisPhaze() {
+56 assertEquals(AnalysisPhase.INFORMATION_COLLECTION, instance.getAnalysisPhase());
+57 }
+58 }
+59
+60
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.analyzer
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.analyzer
AnalyzerServiceTest
- ArchiveAnalyzerTest
+ ArchiveAnalyzerIntegrationTest
AssemblyAnalyzerTest
- CPEAnalyzerTest
+ CPEAnalyzerIntegrationTest
DependencyBundlingAnalyzerTest
@@ -44,6 +44,9 @@
FileNameAnalyzerTest
+
+
+ HintAnalyzerTest
JarAnalyzerTest
@@ -55,7 +58,7 @@
NuspecAnalyzerTest
- VulnerabilitySuppressionAnalyzerTest
+ VulnerabilitySuppressionAnalyzerIntegrationTest
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html
index 9481a9ef9..b299601ad 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.analyzer
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.analyzer
- ArchiveAnalyzerTest
+ ArchiveAnalyzerIntegrationTest
@@ -67,7 +67,7 @@
- CPEAnalyzerTest
+ CPEAnalyzerIntegrationTest
@@ -84,6 +84,11 @@
FileNameAnalyzerTest
+
+
+
+ HintAnalyzerTest
+
@@ -102,7 +107,7 @@
- VulnerabilitySuppressionAnalyzerTest
+ VulnerabilitySuppressionAnalyzerIntegrationTest
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.html
index fac6d587a..24c4ea538 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/AbstractDatabaseTestCase.html
@@ -25,42 +25,24 @@
17
18 package org.owasp.dependencycheck.data.cpe;
19
-20 import junit.framework.TestCase;
-21 import org.junit.After;
-22 import org.junit.AfterClass;
-23 import org.junit.Before;
-24 import org.junit.BeforeClass;
-25 import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase;
-26
-27
-28
-29
-30
-31
-32
-33 public abstract class AbstractDatabaseTestCase extends TestCase {
-34
-35 @BeforeClass
-36 public static void setUpClass() throws Exception {
-37 }
-38
-39 @AfterClass
-40 public static void tearDownClass() throws Exception {
-41 }
-42
-43 @Before
-44 @Override
-45 public void setUp() throws Exception {
-46 BaseDBTestCase.ensureDBExists();
-47 super .setUp();
-48 }
-49
-50 @After
-51 @Override
-52 public void tearDown() throws Exception {
-53 super .tearDown();
-54 }
-55 }
+20 import org.junit.Before;
+21 import org.owasp.dependencycheck.BaseTest;
+22 import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase;
+23
+24
+25
+26
+27
+28
+29
+30 public abstract class AbstractDatabaseTestCase extends BaseTest {
+31
+32 @Before
+33 public void setUp() throws Exception {
+34 BaseDBTestCase.ensureDBExists();
+35 }
+36
+37 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cpe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cpe
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cpe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cpe
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cwe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cwe
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cwe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cwe
69
70
71
-72
-73 @Test
-74 public void testClear() throws IOException {
-75
-76 TokenStream ts = new WhitespaceTokenizer(LuceneUtils.CURRENT_VERSION, new StringReader("one two three" ));
-77 TokenPairConcatenatingFilter filter = new TokenPairConcatenatingFilter(ts);
-78 assertTokenStreamContents(filter, new String[]{"one" , "onetwo" , "two" , "twothree" , "three" });
-79
-80 assertNotNull(filter.getPreviousWord());
-81 filter.clear();
-82 assertNull(filter.getPreviousWord());
-83 assertTrue(filter.getWords().isEmpty());
-84 }
-85 }
+72
+73
+74
+75 @Test
+76 public void testClear() throws IOException {
+77
+78 TokenStream ts = new WhitespaceTokenizer(LuceneUtils.CURRENT_VERSION, new StringReader("one two three" ));
+79 TokenPairConcatenatingFilter filter = new TokenPairConcatenatingFilter(ts);
+80 assertTokenStreamContents(filter, new String[]{"one" , "onetwo" , "two" , "twothree" , "three" });
+81
+82 assertNotNull(filter.getPreviousWord());
+83 filter.clear();
+84 assertNull(filter.getPreviousWord());
+85 assertTrue(filter.getWords().isEmpty());
+86 }
+87 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.lucene
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.lucene
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.lucene
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.lucene
17
18 package org.owasp.dependencycheck.data.nexus;
19
-20 import static org.junit.Assert.assertEquals;
-21 import static org.junit.Assert.assertNotNull;
-22
-23 import java.io.FileNotFoundException;
-24 import java.net.URL;
-25 import java.util.logging.Logger;
-26
-27 import org.junit.Assume;
-28 import org.junit.Before;
-29 import org.junit.Test;
-30 import org.owasp.dependencycheck.utils.Settings;
-31
-32 public class NexusSearchTest {
-33
-34 private static final Logger LOGGER = Logger.getLogger(NexusSearchTest.class .getName());
-35 private NexusSearch searcher;
-36
-37 @Before
-38 public void setUp() throws Exception {
-39 String nexusUrl = Settings.getString(Settings.KEYS.ANALYZER_NEXUS_URL);
-40 LOGGER.fine(nexusUrl);
-41 searcher = new NexusSearch(new URL(nexusUrl));
-42 Assume.assumeTrue(searcher.preflightRequest());
-43 }
-44
-45 @Test(expected = IllegalArgumentException.class )
-46 public void testNullSha1() throws Exception {
-47 searcher.searchSha1(null );
-48 }
-49
-50 @Test(expected = IllegalArgumentException.class )
-51 public void testMalformedSha1() throws Exception {
-52 searcher.searchSha1("invalid" );
-53 }
-54
-55
-56
-57
-58 @Test
-59 public void testValidSha1() throws Exception {
-60 MavenArtifact ma = searcher.searchSha1("9977a8d04e75609cf01badc4eb6a9c7198c4c5ea" );
-61 assertEquals("Incorrect group" , "org.apache.maven.plugins" , ma.getGroupId());
-62 assertEquals("Incorrect artifact" , "maven-compiler-plugin" , ma.getArtifactId());
-63 assertEquals("Incorrect version" , "3.1" , ma.getVersion());
-64 assertNotNull("URL Should not be null" , ma.getArtifactUrl());
-65 }
-66
-67
-68
-69
-70 @Test(expected = FileNotFoundException.class )
-71 public void testMissingSha1() throws Exception {
-72 searcher.searchSha1("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" );
-73 }
-74 }
-75
-76
+20 import java.io.FileNotFoundException;
+21 import java.net.URL;
+22 import java.util.logging.Logger;
+23 import static org.junit.Assert.assertEquals;
+24 import static org.junit.Assert.assertNotNull;
+25 import org.junit.Assume;
+26 import org.junit.Before;
+27 import org.junit.Test;
+28 import org.owasp.dependencycheck.BaseTest;
+29 import org.owasp.dependencycheck.utils.Settings;
+30
+31 public class NexusSearchTest extends BaseTest {
+32
+33 private static final Logger LOGGER = Logger.getLogger(NexusSearchTest.class .getName());
+34 private NexusSearch searcher;
+35
+36 @Before
+37 public void setUp() throws Exception {
+38 String nexusUrl = Settings.getString(Settings.KEYS.ANALYZER_NEXUS_URL);
+39 LOGGER.fine(nexusUrl);
+40 searcher = new NexusSearch(new URL(nexusUrl));
+41 Assume.assumeTrue(searcher.preflightRequest());
+42 }
+43
+44 @Test(expected = IllegalArgumentException.class )
+45 public void testNullSha1() throws Exception {
+46 searcher.searchSha1(null );
+47 }
+48
+49 @Test(expected = IllegalArgumentException.class )
+50 public void testMalformedSha1() throws Exception {
+51 searcher.searchSha1("invalid" );
+52 }
+53
+54
+55
+56
+57 @Test
+58 public void testValidSha1() throws Exception {
+59 MavenArtifact ma = searcher.searchSha1("9977a8d04e75609cf01badc4eb6a9c7198c4c5ea" );
+60 assertEquals("Incorrect group" , "org.apache.maven.plugins" , ma.getGroupId());
+61 assertEquals("Incorrect artifact" , "maven-compiler-plugin" , ma.getArtifactId());
+62 assertEquals("Incorrect version" , "3.1" , ma.getVersion());
+63 assertNotNull("URL Should not be null" , ma.getArtifactUrl());
+64 }
+65
+66
+67
+68
+69 @Test(expected = FileNotFoundException.class )
+70 public void testMissingSha1() throws Exception {
+71 searcher.searchSha1("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" );
+72 }
+73 }
+74
+75
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nexus
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nexus
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nexus
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nexus
17
18 package org.owasp.dependencycheck.data.nuget;
19
-20 import java.io.InputStream;
-21
-22 import org.junit.Test;
-23 import static org.junit.Assert.*;
-24
-25
-26
-27
-28
-29
-30
-31 public class XPathNuspecParserTest {
-32
-33
-34
-35
-36
-37 @Test
-38 public void testGoodDocument() throws Exception {
-39 NuspecParser parser = new XPathNuspecParser();
-40 InputStream is = XPathNuspecParserTest.class .getClassLoader().getResourceAsStream("log4net.2.0.3.nuspec" );
-41 NugetPackage np = parser.parse(is);
-42 assertEquals("log4net" , np.getId());
-43 assertEquals("2.0.3" , np.getVersion());
-44 assertEquals("log4net [1.2.13]" , np.getTitle());
-45 assertEquals("Apache Software Foundation" , np.getAuthors());
-46 assertEquals("Apache Software Foundation" , np.getOwners());
-47 assertEquals("http://logging.apache.org/log4net/license.html" , np.getLicenseUrl());
-48 }
-49
-50
-51
-52
-53
-54
-55 @Test(expected=NuspecParseException.class )
-56 public void testMissingDocument() throws Exception {
-57 NuspecParser parser = new XPathNuspecParser();
-58 InputStream is = XPathNuspecParserTest.class .getClassLoader().getResourceAsStream("dependencycheck.properties" );
-59 NugetPackage np = parser.parse(is);
-60 }
-61
-62
-63
-64
-65
-66
-67 @Test(expected=NuspecParseException.class )
-68 public void testNotNuspec() throws Exception {
-69 NuspecParser parser = new XPathNuspecParser();
-70 InputStream is = XPathNuspecParserTest.class .getClassLoader().getResourceAsStream("suppressions.xml" );
-71 NugetPackage np = parser.parse(is);
-72 }
-73 }
+20 import java.io.ByteArrayOutputStream;
+21 import java.io.InputStream;
+22 import java.io.PrintStream;
+23 import static org.junit.Assert.assertEquals;
+24 import org.junit.Test;
+25 import org.owasp.dependencycheck.BaseTest;
+26
+27
+28
+29
+30
+31
+32 public class XPathNuspecParserTest extends BaseTest {
+33
+34
+35
+36
+37
+38
+39 @Test
+40 public void testGoodDocument() throws Exception {
+41 NuspecParser parser = new XPathNuspecParser();
+42 InputStream is = XPathNuspecParserTest.class .getClassLoader().getResourceAsStream("log4net.2.0.3.nuspec" );
+43 NugetPackage np = parser.parse(is);
+44 assertEquals("log4net" , np.getId());
+45 assertEquals("2.0.3" , np.getVersion());
+46 assertEquals("log4net [1.2.13]" , np.getTitle());
+47 assertEquals("Apache Software Foundation" , np.getAuthors());
+48 assertEquals("Apache Software Foundation" , np.getOwners());
+49 assertEquals("http://logging.apache.org/log4net/license.html" , np.getLicenseUrl());
+50 }
+51
+52
+53
+54
+55
+56
+57 @Test(expected = NuspecParseException.class )
+58 public void testMissingDocument() throws Exception {
+59 NuspecParser parser = new XPathNuspecParser();
+60 InputStream is = XPathNuspecParserTest.class .getClassLoader().getResourceAsStream("dependencycheck.properties" );
+61
+62
+63 final ByteArrayOutputStream myOut = new ByteArrayOutputStream();
+64 System.setErr(new PrintStream(myOut));
+65
+66 NugetPackage np = parser.parse(is);
+67 }
+68
+69
+70
+71
+72
+73
+74 @Test(expected = NuspecParseException.class )
+75 public void testNotNuspec() throws Exception {
+76 NuspecParser parser = new XPathNuspecParser();
+77 InputStream is = XPathNuspecParserTest.class .getClassLoader().getResourceAsStream("suppressions.xml" );
+78 NugetPackage np = parser.parse(is);
+79 }
+80 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nuget
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nuget
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nuget
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nuget
26 import java.util.logging.Logger;
27 import java.util.zip.ZipEntry;
28 import java.util.zip.ZipInputStream;
-29 import junit.framework.TestCase;
-30 import org.owasp.dependencycheck.utils.Settings;
-31
-32
-33
-34
-35
-36 public abstract class BaseDBTestCase extends TestCase {
-37
-38 protected final static int BUFFER_SIZE = 2048;
-39
-40 @Override
-41 protected void setUp() throws Exception {
-42 super .setUp();
+29 import org.junit.Before;
+30 import org.owasp.dependencycheck.BaseTest;
+31 import org.owasp.dependencycheck.utils.Settings;
+32
+33
+34
+35
+36
+37 public abstract class BaseDBTestCase extends BaseTest {
+38
+39 protected final static int BUFFER_SIZE = 2048;
+40
+41 @Before
+42 public void setUp() throws Exception {
43 ensureDBExists();
44 }
45
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html
index d0a0dc24e..46b7df66f 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nvdcve
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nvdcve
BaseDBTestCase
+
+
+ CveDBIntegrationTest
CveDBMySQLTest
- CveDBTest
-
-
- DatabasePropertiesTest
+ DatabasePropertiesIntegrationTest
DriverLoaderTest
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html
index f19046feb..d27dfb59f 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nvdcve
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nvdcve
BaseDBTestCase
+
+
+
+ CveDBIntegrationTest
+
@@ -47,12 +52,7 @@
- CveDBTest
-
-
-
-
- DatabasePropertiesTest
+ DatabasePropertiesIntegrationTest
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/NvdCveInfoTest.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/NvdCveInfoTest.html
index 4bc9a2226..aede8b561 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/NvdCveInfoTest.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/NvdCveInfoTest.html
@@ -25,99 +25,77 @@
17
18 package org.owasp.dependencycheck.data.update;
19
-20 import org.junit.After;
-21 import org.junit.AfterClass;
-22 import static org.junit.Assert.assertEquals;
-23 import org.junit.Before;
-24 import org.junit.BeforeClass;
-25 import org.junit.Test;
-26
-27
-28
-29
-30
-31
-32 public class NvdCveInfoTest {
-33
-34 public NvdCveInfoTest () {
-35 }
-36
-37 @BeforeClass
-38 public static void setUpClass() {
-39 }
-40
-41 @AfterClass
-42 public static void tearDownClass() {
-43 }
-44
-45 @Before
-46 public void setUp() {
-47 }
-48
-49 @After
-50 public void tearDown() {
-51 }
-52
-53
-54
-55
-56 @Test
-57 public void testSetGetId() {
-58 NvdCveInfo instance = new NvdCveInfo();
-59 String expResult = "id" ;
-60 instance.setId(expResult);
-61 String result = instance.getId();
-62 assertEquals(expResult, result);
-63 }
-64
-65
-66
-67
-68 @Test
-69 public void testSetGetUrl() {
-70 NvdCveInfo instance = new NvdCveInfo();
-71 String expResult = "http://www.someurl.com/something" ;
-72 instance.setUrl(expResult);
-73 String result = instance.getUrl();
-74 assertEquals(expResult, result);
-75 }
-76
-77
-78
-79
-80 @Test
-81 public void testSetGetOldSchemaVersionUrl() {
-82 NvdCveInfo instance = new NvdCveInfo();
-83 String expResult = "http://www.someurl.com/something" ;
-84 instance.setOldSchemaVersionUrl(expResult);
-85 String result = instance.getOldSchemaVersionUrl();
-86 assertEquals(expResult, result);
-87 }
-88
-89
-90
-91
-92 @Test
-93 public void testSetGetTimestamp() {
-94 NvdCveInfo instance = new NvdCveInfo();
-95 long expResult = 1337L;
-96 instance.setTimestamp(expResult);
-97 long result = instance.getTimestamp();
-98 assertEquals(expResult, result);
-99 }
-100
-101
-102
-103
-104 @Test
-105 public void testSetGetNeedsUpdate() {
-106 NvdCveInfo instance = new NvdCveInfo();
-107 boolean expResult = true ;
-108 instance.setNeedsUpdate(expResult);
-109 boolean result = instance.getNeedsUpdate();
-110 assertEquals(expResult, result);
-111 }
-112 }
+20 import static org.junit.Assert.assertEquals;
+21 import org.junit.Test;
+22 import org.owasp.dependencycheck.BaseTest;
+23
+24
+25
+26
+27
+28
+29 public class NvdCveInfoTest extends BaseTest {
+30
+31
+32
+33
+34 @Test
+35 public void testSetGetId() {
+36 NvdCveInfo instance = new NvdCveInfo();
+37 String expResult = "id" ;
+38 instance.setId(expResult);
+39 String result = instance.getId();
+40 assertEquals(expResult, result);
+41 }
+42
+43
+44
+45
+46 @Test
+47 public void testSetGetUrl() {
+48 NvdCveInfo instance = new NvdCveInfo();
+49 String expResult = "http://www.someurl.com/something" ;
+50 instance.setUrl(expResult);
+51 String result = instance.getUrl();
+52 assertEquals(expResult, result);
+53 }
+54
+55
+56
+57
+58 @Test
+59 public void testSetGetOldSchemaVersionUrl() {
+60 NvdCveInfo instance = new NvdCveInfo();
+61 String expResult = "http://www.someurl.com/something" ;
+62 instance.setOldSchemaVersionUrl(expResult);
+63 String result = instance.getOldSchemaVersionUrl();
+64 assertEquals(expResult, result);
+65 }
+66
+67
+68
+69
+70 @Test
+71 public void testSetGetTimestamp() {
+72 NvdCveInfo instance = new NvdCveInfo();
+73 long expResult = 1337L;
+74 instance.setTimestamp(expResult);
+75 long result = instance.getTimestamp();
+76 assertEquals(expResult, result);
+77 }
+78
+79
+80
+81
+82 @Test
+83 public void testSetGetNeedsUpdate() {
+84 NvdCveInfo instance = new NvdCveInfo();
+85 boolean expResult = true ;
+86 instance.setNeedsUpdate(expResult);
+87 boolean result = instance.getNeedsUpdate();
+88 assertEquals(expResult, result);
+89 }
+90 }
17
18 package org.owasp.dependencycheck.data.update;
19
-20 import org.junit.After;
-21 import org.junit.AfterClass;
-22 import org.junit.Before;
-23 import org.junit.BeforeClass;
-24 import org.junit.Test;
-25
-26
-27
-28
-29
-30 public class NvdCveUpdaterIntegrationTest {
-31
-32 public NvdCveUpdaterIntegrationTest () {
-33 }
-34
-35 @BeforeClass
-36 public static void setUpClass() {
-37 }
-38
-39 @AfterClass
-40 public static void tearDownClass() {
-41 }
-42
-43 @Before
-44 public void setUp() {
-45 }
-46
-47 @After
-48 public void tearDown() {
-49 }
-50
-51
-52
-53
-54 @Test
-55 public void testUpdate() throws Exception {
-56 NvdCveUpdater instance = new NvdCveUpdater();
-57 instance.update();
-58 }
-59 }
+20 import org.junit.Test;
+21 import org.owasp.dependencycheck.BaseTest;
+22
+23
+24
+25
+26
+27 public class NvdCveUpdaterIntegrationTest extends BaseTest {
+28
+29
+30
+31
+32 @Test
+33 public void testUpdate() throws Exception {
+34 NvdCveUpdater instance = new NvdCveUpdater();
+35 instance.update();
+36 }
+37 }
19
20 import java.net.MalformedURLException;
21 import java.util.Calendar;
-22 import org.junit.After;
-23 import org.junit.AfterClass;
-24 import static org.junit.Assert.assertEquals;
-25 import static org.junit.Assert.assertNotNull;
-26 import org.junit.Before;
-27 import org.junit.BeforeClass;
-28 import org.junit.Test;
-29 import org.owasp.dependencycheck.data.update.exception.UpdateException;
-30 import org.owasp.dependencycheck.utils.DownloadFailedException;
-31
-32
-33
-34
-35
-36 public class StandardUpdateIntegrationTest {
-37
-38 public StandardUpdateIntegrationTest () {
-39 }
-40
-41 @BeforeClass
-42 public static void setUpClass() {
-43 }
-44
-45 @AfterClass
-46 public static void tearDownClass() {
-47 }
-48
-49 @Before
-50 public void setUp() {
-51 }
-52
-53 @After
-54 public void tearDown() {
-55 }
+22 import static org.junit.Assert.assertEquals;
+23 import static org.junit.Assert.assertNotNull;
+24 import org.junit.Test;
+25 import org.owasp.dependencycheck.BaseTest;
+26 import org.owasp.dependencycheck.data.update.exception.UpdateException;
+27 import org.owasp.dependencycheck.utils.DownloadFailedException;
+28
+29
+30
+31
+32
+33 public class StandardUpdateIntegrationTest extends BaseTest {
+34
+35 public StandardUpdate getStandardUpdateTask() throws MalformedURLException, DownloadFailedException, UpdateException {
+36 StandardUpdate instance = new StandardUpdate();
+37 return instance;
+38 }
+39
+40
+41
+42
+43 @Test
+44 public void testOpenDataStores() throws Exception {
+45 StandardUpdate instance = getStandardUpdateTask();
+46 instance.openDataStores();
+47 instance.closeDataStores();
+48 }
+49
+50
+51
+52
+53 @Test
+54 public void testWithinRange() throws Exception {
+55 Calendar c = Calendar.getInstance();
56
-57 public StandardUpdate getStandardUpdateTask() throws MalformedURLException, DownloadFailedException, UpdateException {
-58 StandardUpdate instance = new StandardUpdate();
-59 return instance;
-60 }
-61
-62
-63
-64
-65 @Test
-66 public void testOpenDataStores() throws Exception {
-67 StandardUpdate instance = getStandardUpdateTask();
-68 instance.openDataStores();
-69 instance.closeDataStores();
-70 }
-71
-72
-73
-74
-75 @Test
-76 public void testWithinRange() throws Exception {
-77 Calendar c = Calendar.getInstance();
-78
-79 long current = c.getTimeInMillis();
-80 long lastRun = c.getTimeInMillis() - (3 * (1000 * 60 * 60 * 24));
-81 int range = 7;
-82 StandardUpdate instance = getStandardUpdateTask();
-83 boolean expResult = true ;
-84 boolean result = instance.withinRange(lastRun, current, range);
-85 assertEquals(expResult, result);
-86
-87 lastRun = c.getTimeInMillis() - (8 * (1000 * 60 * 60 * 24));
-88 expResult = false;
-89 result = instance.withinRange(lastRun, current, range);
-90 assertEquals(expResult, result);
-91 }
-92
-93
-94
-95
-96 @Test
-97 public void testUpdate() throws Exception {
-98 StandardUpdate instance = getStandardUpdateTask();
-99 instance.update();
-100
-101 }
-102
-103
-104
-105
-106 @Test
-107 public void testUpdatesNeeded() throws Exception {
-108 StandardUpdate instance = getStandardUpdateTask();
-109 UpdateableNvdCve result = instance.updatesNeeded();
-110 assertNotNull(result);
-111 }
-112 }
+57 long current = c.getTimeInMillis();
+58 long lastRun = c.getTimeInMillis() - (3 * (1000 * 60 * 60 * 24));
+59 int range = 7;
+60 StandardUpdate instance = getStandardUpdateTask();
+61 boolean expResult = true ;
+62 boolean result = instance.withinRange(lastRun, current, range);
+63 assertEquals(expResult, result);
+64
+65 lastRun = c.getTimeInMillis() - (8 * (1000 * 60 * 60 * 24));
+66 expResult = false;
+67 result = instance.withinRange(lastRun, current, range);
+68 assertEquals(expResult, result);
+69 }
+70
+71
+72
+73
+74 @Test
+75 public void testUpdate() throws Exception {
+76 StandardUpdate instance = getStandardUpdateTask();
+77 instance.update();
+78
+79 }
+80
+81
+82
+83
+84 @Test
+85 public void testUpdatesNeeded() throws Exception {
+86 StandardUpdate instance = getStandardUpdateTask();
+87 UpdateableNvdCve result = instance.updatesNeeded();
+88 assertNotNull(result);
+89 }
+90 }
20 import java.io.File;
21 import java.io.IOException;
22 import java.net.MalformedURLException;
-23 import org.junit.After;
-24 import org.junit.AfterClass;
-25 import static org.junit.Assert.assertEquals;
-26 import static org.junit.Assert.assertFalse;
-27 import static org.junit.Assert.assertTrue;
-28 import org.junit.Before;
-29 import org.junit.BeforeClass;
-30 import org.junit.Test;
-31 import org.owasp.dependencycheck.utils.DownloadFailedException;
-32
-33
-34
-35
-36
-37 public class UpdateableNvdCveTest {
-38
-39 public UpdateableNvdCveTest () {
-40 }
-41
-42 @BeforeClass
-43 public static void setUpClass() {
-44 }
-45
-46 @AfterClass
-47 public static void tearDownClass() {
-48 }
-49
-50 @Before
-51 public void setUp() {
-52 }
+23 import static org.junit.Assert.assertEquals;
+24 import static org.junit.Assert.assertFalse;
+25 import static org.junit.Assert.assertTrue;
+26 import org.junit.Test;
+27 import org.owasp.dependencycheck.BaseTest;
+28 import org.owasp.dependencycheck.utils.DownloadFailedException;
+29
+30
+31
+32
+33
+34 public class UpdateableNvdCveTest extends BaseTest {
+35
+36
+37
+38
+39 @Test
+40 public void testIsUpdateNeeded() throws MalformedURLException, DownloadFailedException, IOException {
+41 String id = "key" ;
+42
+43 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
+44 String url = "file:///" + f.getCanonicalPath();
+45 UpdateableNvdCve instance = new UpdateableNvdCve();
+46 instance.add(id, url, url, false);
+47
+48 boolean expResult = false;
+49 boolean result = instance.isUpdateNeeded();
+50 assertEquals(expResult, result);
+51
+52 instance.add("nextId" , url, url, true );
53
-54 @After
-55 public void tearDown() {
-56 }
-57
-58
-59
-60
-61 @Test
-62 public void testIsUpdateNeeded() throws MalformedURLException, DownloadFailedException, IOException {
-63 String id = "key" ;
-64
+54 expResult = true ;
+55 result = instance.isUpdateNeeded();
+56 assertEquals(expResult, result);
+57 }
+58
+59
+60
+61
+62 @Test
+63 public void testAdd_3args() throws Exception {
+64 String id = "key" ;
65 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
-66 String url = "file:///" + f.getCanonicalPath();
-67 UpdateableNvdCve instance = new UpdateableNvdCve();
-68 instance.add(id, url, url, false);
-69
-70 boolean expResult = false;
-71 boolean result = instance.isUpdateNeeded();
-72 assertEquals(expResult, result);
-73
-74 instance.add("nextId" , url, url, true );
+66
+67 String url = "file:///" + f.getCanonicalPath();
+68 UpdateableNvdCve instance = new UpdateableNvdCve();
+69 instance.add(id, url, url);
+70 NvdCveInfo results = instance.get(id);
+71 assertEquals(id, results.getId());
+72 assertEquals(url, results.getUrl());
+73 assertEquals(url, results.getOldSchemaVersionUrl());
+74 }
75
-76 expResult = true ;
-77 result = instance.isUpdateNeeded();
-78 assertEquals(expResult, result);
-79 }
-80
-81
-82
-83
-84 @Test
-85 public void testAdd_3args() throws Exception {
-86 String id = "key" ;
-87 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
-88
-89 String url = "file:///" + f.getCanonicalPath();
-90 UpdateableNvdCve instance = new UpdateableNvdCve();
-91 instance.add(id, url, url);
-92 NvdCveInfo results = instance.get(id);
-93 assertEquals(id, results.getId());
-94 assertEquals(url, results.getUrl());
-95 assertEquals(url, results.getOldSchemaVersionUrl());
-96 }
-97
-98
-99
-100
-101 @Test
-102 public void testAdd_4args() throws Exception {
-103 String id = "key" ;
-104
-105 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
-106 String url = "file:///" + f.getCanonicalPath();
-107 UpdateableNvdCve instance = new UpdateableNvdCve();
-108 instance.add(id, url, url, false);
-109
-110 boolean expResult = false;
-111 boolean result = instance.isUpdateNeeded();
-112 assertEquals(expResult, result);
-113
-114 instance.add("nextId" , url, url, false);
-115 NvdCveInfo results = instance.get(id);
+76
+77
+78
+79 @Test
+80 public void testAdd_4args() throws Exception {
+81 String id = "key" ;
+82
+83 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
+84 String url = "file:///" + f.getCanonicalPath();
+85 UpdateableNvdCve instance = new UpdateableNvdCve();
+86 instance.add(id, url, url, false);
+87
+88 boolean expResult = false;
+89 boolean result = instance.isUpdateNeeded();
+90 assertEquals(expResult, result);
+91
+92 instance.add("nextId" , url, url, false);
+93 NvdCveInfo results = instance.get(id);
+94
+95 assertEquals(id, results.getId());
+96 assertEquals(url, results.getUrl());
+97 assertEquals(url, results.getOldSchemaVersionUrl());
+98
+99 }
+100
+101
+102
+103
+104 @Test
+105 public void testClear() throws MalformedURLException, DownloadFailedException, IOException {
+106 String id = "key" ;
+107
+108 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
+109 String url = "file:///" + f.getCanonicalPath();
+110 UpdateableNvdCve instance = new UpdateableNvdCve();
+111 instance.add(id, url, url, false);
+112 assertFalse(instance.getCollection().isEmpty());
+113 instance.clear();
+114 assertTrue(instance.getCollection().isEmpty());
+115 }
116
-117 assertEquals(id, results.getId());
-118 assertEquals(url, results.getUrl());
-119 assertEquals(url, results.getOldSchemaVersionUrl());
-120
-121 }
-122
-123
-124
-125
-126 @Test
-127 public void testClear() throws MalformedURLException, DownloadFailedException, IOException {
-128 String id = "key" ;
-129
-130 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
-131 String url = "file:///" + f.getCanonicalPath();
-132 UpdateableNvdCve instance = new UpdateableNvdCve();
-133 instance.add(id, url, url, false);
-134 assertFalse(instance.getCollection().isEmpty());
-135 instance.clear();
-136 assertTrue(instance.getCollection().isEmpty());
-137 }
-138
-139
-140
-141
-142 @Test
-143 public void testIterator() throws IOException {
-144
-145 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
-146 String url = "file:///" + f.getCanonicalPath();
-147 UpdateableNvdCve instance = new UpdateableNvdCve();
-148 instance.add("one" , url, url, false);
-149 instance.add("two" , url, url, false);
-150 instance.add("three" , url, url, false);
-151 int itemsProcessed = 0;
-152 for (NvdCveInfo item : instance) {
-153 if ("one" .equals(item.getId())) {
-154 instance.remove();
-155 }
-156 itemsProcessed += 1;
-157 }
-158 assertEquals(3, itemsProcessed);
-159 assertEquals(2, instance.getCollection().size());
-160 }
-161 }
+117
+118
+119
+120 @Test
+121 public void testIterator() throws IOException {
+122
+123 File f = new File("target/test-classes/nvdcve-2.0-2012.xml" );
+124 String url = "file:///" + f.getCanonicalPath();
+125 UpdateableNvdCve instance = new UpdateableNvdCve();
+126 instance.add("one" , url, url, false);
+127 instance.add("two" , url, url, false);
+128 instance.add("three" , url, url, false);
+129 int itemsProcessed = 0;
+130 for (NvdCveInfo item : instance) {
+131 if ("one" .equals(item.getId())) {
+132 instance.remove();
+133 }
+134 itemsProcessed += 1;
+135 }
+136 assertEquals(3, itemsProcessed);
+137 assertEquals(2, instance.getCollection().size());
+138 }
+139 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.xml
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.xml
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.xml
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.xml
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.dependency
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.dependency
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.dependency
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.dependency
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck
+
+ BaseTest
+
+
+
EngineIntegrationTest
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html
index c82825bae..c73ea1500 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.reporting
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.reporting
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.reporting
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.reporting
- ReportGeneratorTest
+ ReportGeneratorIntegrationTest
diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/SuppressionRuleTest.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/SuppressionRuleTest.html
index 77379b716..4b46a4bba 100644
--- a/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/SuppressionRuleTest.html
+++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/SuppressionRuleTest.html
@@ -421,63 +421,68 @@
413 dependency.setSha1sum(sha1);
414 instance.process(dependency);
415 assertTrue(dependency.getVulnerabilities().isEmpty());
-416
-417
-418 dependency.addVulnerability(v);
-419 instance = new SuppressionRule();
-420 instance.addCvssBelow(5f);
-421 instance.process(dependency);
-422 assertTrue(dependency.getVulnerabilities().size() == 1);
-423 instance.addCvssBelow(8f);
-424 instance.process(dependency);
-425 assertTrue(dependency.getVulnerabilities().isEmpty());
-426
-427
-428 dependency.addVulnerability(v);
-429 instance = new SuppressionRule();
-430 instance.addCve("CVE-2012-1337" );
-431 instance.process(dependency);
-432 assertTrue(dependency.getVulnerabilities().size() == 1);
-433 instance.addCve("CVE-2013-1337" );
-434 instance.process(dependency);
-435 assertTrue(dependency.getVulnerabilities().isEmpty());
-436
-437
-438 instance = new SuppressionRule();
-439 PropertyType pt = new PropertyType();
-440 pt.setValue("cpe:/a:microsoft:.net_framework:4.0" );
-441 instance.addCpe(pt);
-442 instance.process(dependency);
-443 assertTrue(dependency.getIdentifiers().size() == 1);
-444 pt = new PropertyType();
-445 pt.setValue("cpe:/a:microsoft:.net_framework:4.5" );
-446 instance.addCpe(pt);
+416 assertTrue(dependency.getSuppressedVulnerabilities().size() == 1);
+417
+418
+419 dependency.addVulnerability(v);
+420 instance = new SuppressionRule();
+421 instance.addCvssBelow(5f);
+422 instance.process(dependency);
+423 assertTrue(dependency.getVulnerabilities().size() == 1);
+424 instance.addCvssBelow(8f);
+425 instance.process(dependency);
+426 assertTrue(dependency.getVulnerabilities().isEmpty());
+427 assertTrue(dependency.getSuppressedVulnerabilities().size() == 1);
+428
+429
+430 dependency.addVulnerability(v);
+431 instance = new SuppressionRule();
+432 instance.addCve("CVE-2012-1337" );
+433 instance.process(dependency);
+434 assertTrue(dependency.getVulnerabilities().size() == 1);
+435 instance.addCve("CVE-2013-1337" );
+436 instance.process(dependency);
+437 assertTrue(dependency.getVulnerabilities().isEmpty());
+438 assertTrue(dependency.getSuppressedVulnerabilities().size() == 1);
+439
+440
+441 instance = new SuppressionRule();
+442 PropertyType pt = new PropertyType();
+443 pt.setValue("cpe:/a:microsoft:.net_framework:4.0" );
+444 instance.addCpe(pt);
+445 instance.process(dependency);
+446 assertTrue(dependency.getIdentifiers().size() == 1);
447 pt = new PropertyType();
-448 pt.setValue(".*" );
-449 pt.setRegex(true );
-450 instance.setFilePath(pt);
-451 instance.process(dependency);
-452 assertTrue(dependency.getIdentifiers().isEmpty());
-453
-454 dependency.addIdentifier("cwe" , "cpe:/a:microsoft:.net_framework:4.0" , "some url not needed for this test" );
-455 dependency.addIdentifier("cwe" , "cpe:/a:microsoft:.net_framework:4.5" , "some url not needed for this test" );
-456 dependency.addIdentifier("cwe" , "cpe:/a:microsoft:.net_framework:5.0" , "some url not needed for this test" );
-457 pt = new PropertyType();
-458 pt.setValue("cpe:/a:microsoft:.net_framework" );
-459 instance.addCpe(pt);
-460 assertTrue(dependency.getIdentifiers().size() == 3);
-461 instance.process(dependency);
-462 assertTrue(dependency.getIdentifiers().isEmpty());
-463 }
-464
-465 private Vulnerability createVulnerability() {
-466 Vulnerability v = new Vulnerability();
-467 v.setCwe("CWE-287 Improper Authentication" );
-468 v.setName("CVE-2013-1337" );
-469 v.setCvssScore(7.5f);
-470 return v;
-471 }
-472 }
+448 pt.setValue("cpe:/a:microsoft:.net_framework:4.5" );
+449 instance.addCpe(pt);
+450 pt = new PropertyType();
+451 pt.setValue(".*" );
+452 pt.setRegex(true );
+453 instance.setFilePath(pt);
+454 instance.process(dependency);
+455 assertTrue(dependency.getIdentifiers().isEmpty());
+456 assertTrue(dependency.getSuppressedIdentifiers().size() == 1);
+457
+458 dependency.addIdentifier("cwe" , "cpe:/a:microsoft:.net_framework:4.0" , "some url not needed for this test" );
+459 dependency.addIdentifier("cwe" , "cpe:/a:microsoft:.net_framework:4.5" , "some url not needed for this test" );
+460 dependency.addIdentifier("cwe" , "cpe:/a:microsoft:.net_framework:5.0" , "some url not needed for this test" );
+461 pt = new PropertyType();
+462 pt.setValue("cpe:/a:microsoft:.net_framework" );
+463 instance.addCpe(pt);
+464 assertTrue(dependency.getIdentifiers().size() == 3);
+465 instance.process(dependency);
+466 assertTrue(dependency.getIdentifiers().isEmpty());
+467 assertTrue(dependency.getSuppressedIdentifiers().size() == 3);
+468 }
+469
+470 private Vulnerability createVulnerability() {
+471 Vulnerability v = new Vulnerability();
+472 v.setCwe("CWE-287 Improper Authentication" );
+473 v.setName("CVE-2013-1337" );
+474 v.setCvssScore(7.5f);
+475 return v;
+476 }
+477 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.suppression
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.suppression
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.suppression
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.suppression
19
20 import java.io.File;
21 import java.net.URL;
-22 import org.junit.After;
-23 import org.junit.AfterClass;
-24 import static org.junit.Assert.assertTrue;
-25 import org.junit.Before;
-26 import org.junit.BeforeClass;
-27 import org.junit.Test;
-28
-29
-30
-31
-32
-33 public class DownloaderIntegrationTest {
-34
-35 @BeforeClass
-36 public static void setUpClass() throws Exception {
-37 }
-38
-39 @AfterClass
-40 public static void tearDownClass() throws Exception {
-41 }
-42
-43 @Before
-44 public void setUp() {
-45 }
+22 import static org.junit.Assert.assertTrue;
+23 import org.junit.Test;
+24 import org.owasp.dependencycheck.BaseTest;
+25
+26
+27
+28
+29
+30 public class DownloaderIntegrationTest extends BaseTest {
+31
+32
+33
+34
+35
+36
+37 @Test
+38 public void testFetchFile() throws Exception {
+39
+40
+41
+42
+43 URL url = new URL(Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL));
+44 File outputPath = new File("target/downloaded_cve.xml" );
+45 Downloader.fetchFile(url, outputPath);
46
-47 @After
-48 public void tearDown() {
-49 }
-50
-51
-52
-53
-54
-55
-56 @Test
-57 public void testFetchFile() throws Exception {
-58
-59
-60
-61
-62 URL url = new URL(Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL));
-63 File outputPath = new File("target/downloaded_cve.xml" );
-64 Downloader.fetchFile(url, outputPath);
-65
-66 }
-67
-68 @Test
-69 public void testGetLastModified() throws Exception {
-70 URL url = new URL("http://nvd.nist.gov/download/nvdcve-2012.xml" );
-71 long timestamp = Downloader.getLastModified(url);
-72 assertTrue("timestamp equal to zero?" , timestamp > 0);
-73 }
-74 }
+47 }
+48
+49 @Test
+50 public void testGetLastModified() throws Exception {
+51 URL url = new URL("http://nvd.nist.gov/download/nvdcve-2012.xml" );
+52 long timestamp = Downloader.getLastModified(url);
+53 assertTrue("timestamp equal to zero?" , timestamp > 0);
+54 }
+55 }
18 package org.owasp.dependencycheck.utils;
19
20 import java.io.File;
-21 import org.junit.After;
-22 import org.junit.AfterClass;
-23 import static org.junit.Assert.assertEquals;
-24 import static org.junit.Assert.assertFalse;
-25 import static org.junit.Assert.assertTrue;
-26 import static org.junit.Assert.fail;
-27 import org.junit.Before;
-28 import org.junit.BeforeClass;
-29 import org.junit.Test;
-30
-31
-32
-33
-34
-35 public class FileUtilsTest {
-36
-37 public FileUtilsTest () {
-38 }
-39
-40 @BeforeClass
-41 public static void setUpClass() throws Exception {
-42 }
-43
-44 @AfterClass
-45 public static void tearDownClass() throws Exception {
+21 import static org.junit.Assert.assertEquals;
+22 import static org.junit.Assert.assertFalse;
+23 import static org.junit.Assert.assertTrue;
+24 import static org.junit.Assert.fail;
+25 import org.junit.Test;
+26 import org.owasp.dependencycheck.BaseTest;
+27
+28
+29
+30
+31
+32 public class FileUtilsTest extends BaseTest {
+33
+34
+35
+36
+37 @Test
+38 public void testGetFileExtension() {
+39 String[] fileName = {"something-0.9.5.jar" , "lib2-1.1.js" };
+40 String[] expResult = {"jar" , "js" };
+41
+42 for (int i = 0; i < fileName.length; i++) {
+43 String result = FileUtils.getFileExtension(fileName[i]);
+44 assertEquals("Failed extraction on \"" + fileName[i] + "\"." , expResult[i], result);
+45 }
46 }
47
-48 @Before
-49 public void setUp() {
-50 }
-51
-52 @After
-53 public void tearDown() {
-54 }
-55
-56
-57
-58
-59 @Test
-60 public void testGetFileExtension() {
-61 String[] fileName = {"something-0.9.5.jar" , "lib2-1.1.js" };
-62 String[] expResult = {"jar" , "js" };
-63
-64 for (int i = 0; i < fileName.length; i++) {
-65 String result = FileUtils.getFileExtension(fileName[i]);
-66 assertEquals("Failed extraction on \"" + fileName[i] + "\"." , expResult[i], result);
-67 }
-68 }
-69
-70
-71
-72
-73 @Test
-74 public void testDelete() throws Exception {
-75
-76 File file = File.createTempFile("tmp" , "deleteme" , Settings.getTempDirectory());
-77 if (!file.exists()) {
-78 fail("Unable to create a temporary file." );
-79 }
-80 boolean status = FileUtils.delete(file);
-81 assertTrue("delete returned a failed status" , status);
-82 assertFalse("Temporary file exists after attempting deletion" , file.exists());
-83 }
-84 }
+48
+49
+50
+51 @Test
+52 public void testDelete() throws Exception {
+53
+54 File file = File.createTempFile("tmp" , "deleteme" , Settings.getTempDirectory());
+55 if (!file.exists()) {
+56 fail("Unable to create a temporary file." );
+57 }
+58 boolean status = FileUtils.delete(file);
+59 assertTrue("delete returned a failed status" , status);
+60 assertFalse("Temporary file exists after attempting deletion" , file.exists());
+61 }
+62 }
19
20 import java.util.ArrayList;
21 import java.util.List;
-22 import org.junit.After;
-23 import org.junit.AfterClass;
-24 import static org.junit.Assert.assertArrayEquals;
-25 import static org.junit.Assert.assertFalse;
-26 import static org.junit.Assert.assertTrue;
-27 import org.junit.Before;
-28 import org.junit.BeforeClass;
-29 import org.junit.Test;
-30
-31
-32
-33
-34
-35 public class FilterTest {
-36
-37 public FilterTest () {
-38 }
-39
-40 @BeforeClass
-41 public static void setUpClass() throws Exception {
-42 }
-43
-44 @AfterClass
-45 public static void tearDownClass() throws Exception {
-46 }
-47
-48 @Before
-49 public void setUp() {
-50 }
-51
-52 @After
-53 public void tearDown() {
-54 }
-55
-56
-57
-58
-59 @Test
-60 public void testPasses() {
-61 String keep = "keep" ;
-62 String fail = "fail" ;
-63
-64 assertTrue("String contained keep - but passes returned false." , TEST_FILTER.passes(keep));
-65 assertFalse("String contained fail - but passes returned true." , TEST_FILTER.passes(fail));
-66 }
-67
-68
-69
-70
-71 @Test
-72 public void testFilter_Iterable() {
-73 List<String> testData = new ArrayList<String>();
-74 testData.add("keep" );
-75 testData.add("remove" );
-76 testData.add("keep" );
-77
-78 List<String> expResults = new ArrayList<String>();
-79 expResults.add("keep" );
-80 expResults.add("keep" );
-81
-82 List<String> actResults = new ArrayList<String>();
-83 for (String s : TEST_FILTER.filter(testData)) {
-84 actResults.add(s);
-85 }
-86 assertArrayEquals(expResults.toArray(), actResults.toArray());
-87 }
-88 private static final Filter<String> TEST_FILTER
-89 = new Filter<String>() {
-90 public boolean passes(String str) {
-91 return str.contains("keep" );
-92 }
-93 };
-94 }
+22 import static org.junit.Assert.assertArrayEquals;
+23 import static org.junit.Assert.assertFalse;
+24 import static org.junit.Assert.assertTrue;
+25 import org.junit.Test;
+26
+27
+28
+29
+30
+31 public class FilterTest {
+32
+33
+34
+35
+36 @Test
+37 public void testPasses() {
+38 String keep = "keep" ;
+39 String fail = "fail" ;
+40
+41 assertTrue("String contained keep - but passes returned false." , TEST_FILTER.passes(keep));
+42 assertFalse("String contained fail - but passes returned true." , TEST_FILTER.passes(fail));
+43 }
+44
+45
+46
+47
+48 @Test
+49 public void testFilter_Iterable() {
+50 List<String> testData = new ArrayList<String>();
+51 testData.add("keep" );
+52 testData.add("remove" );
+53 testData.add("keep" );
+54
+55 List<String> expResults = new ArrayList<String>();
+56 expResults.add("keep" );
+57 expResults.add("keep" );
+58
+59 List<String> actResults = new ArrayList<String>();
+60 for (String s : TEST_FILTER.filter(testData)) {
+61 actResults.add(s);
+62 }
+63 assertArrayEquals(expResults.toArray(), actResults.toArray());
+64 }
+65 private static final Filter<String> TEST_FILTER
+66 = new Filter<String>() {
+67 public boolean passes(String str) {
+68 return str.contains("keep" );
+69 }
+70 };
+71 }
20 import java.io.File;
21 import java.io.IOException;
22 import java.net.URISyntaxException;
-23 import org.junit.After;
-24 import org.junit.AfterClass;
-25 import org.junit.Assert;
-26 import org.junit.Before;
-27 import org.junit.BeforeClass;
-28 import org.junit.Test;
-29
-30
-31
-32
-33
-34 public class SettingsTest {
-35
-36 @BeforeClass
-37 public static void setUpClass() throws Exception {
-38 }
-39
-40 @AfterClass
-41 public static void tearDownClass() throws Exception {
+23 import org.junit.Assert;
+24 import org.junit.Test;
+25 import org.owasp.dependencycheck.BaseTest;
+26
+27
+28
+29
+30
+31 public class SettingsTest extends BaseTest {
+32
+33
+34
+35
+36 @Test
+37 public void testGetString() {
+38 String key = Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS;
+39 String expResult = "7" ;
+40 String result = Settings.getString(key);
+41 Assert.assertTrue(result.endsWith(expResult));
42 }
43
-44 @Before
-45 public void setUp() throws Exception {
-46 }
-47
-48 @After
-49 public void tearDown() throws Exception {
-50 }
-51
-52
-53
-54
-55 @Test
-56 public void testGetString() {
-57 String key = Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS;
-58 String expResult = "7" ;
-59 String result = Settings.getString(key);
-60 Assert.assertTrue(result.endsWith(expResult));
-61 }
-62
-63
-64
-65
-66 @Test
-67 public void testGetDataFile() throws IOException {
-68 String key = Settings.KEYS.DATA_DIRECTORY;
-69 String expResult = "data" ;
-70 File result = Settings.getDataFile(key);
-71 Assert.assertTrue(result.getAbsolutePath().endsWith(expResult));
-72 }
-73
-74
-75
-76
-77 @Test
-78 public void testMergeProperties_String() throws IOException, URISyntaxException {
-79 String key = Settings.KEYS.PROXY_PORT;
-80 String expResult = Settings.getString(key);
-81 File f = new File(this .getClass().getClassLoader().getResource("test.properties" ).toURI());
-82
-83 Settings.mergeProperties(f.getAbsolutePath());
-84 String result = Settings.getString(key);
-85 Assert.assertTrue("setting didn't change?" , (expResult == null && result != null ) || !expResult.equals(result));
-86 }
-87
-88
-89
-90
-91 @Test
-92 public void testSetString() {
-93 String key = "newProperty" ;
-94 String value = "someValue" ;
-95 Settings.setString(key, value);
-96 String expResults = Settings.getString(key);
-97 Assert.assertEquals(expResults, value);
-98 }
-99
-100
-101
-102
-103 @Test
-104 public void testGetString_String_String() {
-105 String key = "key That Doesn't Exist" ;
-106 String defaultValue = "blue bunny" ;
-107 String expResult = "blue bunny" ;
-108 String result = Settings.getString(key);
-109 Assert.assertTrue(result == null );
-110 result = Settings.getString(key, defaultValue);
-111 Assert.assertEquals(expResult, result);
-112 }
-113
-114
-115
-116
-117 @Test
-118 public void testGetString_String() {
-119 String key = Settings.KEYS.CONNECTION_TIMEOUT;
-120 String result = Settings.getString(key);
-121 Assert.assertTrue(result == null );
-122 }
-123
-124
-125
-126
-127 @Test
-128 public void testGetInt() throws InvalidSettingException {
-129 String key = "SomeNumber" ;
-130 int expResult = 85;
-131 Settings.setString(key, "85" );
-132 int result = Settings.getInt(key);
-133 Assert.assertEquals(expResult, result);
-134 }
-135
-136
-137
-138
-139 @Test
-140 public void testGetLong() throws InvalidSettingException {
-141 String key = "SomeNumber" ;
-142 long expResult = 300L;
-143 Settings.setString(key, "300" );
-144 long result = Settings.getLong(key);
-145 Assert.assertEquals(expResult, result);
-146 }
-147
-148
-149
-150
-151 @Test
-152 public void testGetBoolean() throws InvalidSettingException {
-153 String key = "SomeBoolean" ;
-154 Settings.setString(key, "false" );
-155 boolean expResult = false;
-156 boolean result = Settings.getBoolean(key);
-157 Assert.assertEquals(expResult, result);
-158
-159 key = "something that does not exist" ;
-160 expResult = true ;
-161 result = Settings.getBoolean(key, true );
-162 Assert.assertEquals(expResult, result);
-163 }
-164
-165
-166
-167
-168 @Test
-169 public void testRemoveProperty() {
-170 String key = "SomeKey" ;
-171 String value = "value" ;
-172 String dfault = "default" ;
-173 Settings.setString(key, value);
-174 String ret = Settings.getString(key);
-175 Assert.assertEquals(value, ret);
-176 Settings.removeProperty(key);
-177 ret = Settings.getString(key, dfault);
-178 Assert.assertEquals(dfault, ret);
-179 }
-180 }
+44
+45
+46
+47 @Test
+48 public void testGetDataFile() throws IOException {
+49 String key = Settings.KEYS.DATA_DIRECTORY;
+50 String expResult = "data" ;
+51 File result = Settings.getDataFile(key);
+52 Assert.assertTrue(result.getAbsolutePath().endsWith(expResult));
+53 }
+54
+55
+56
+57
+58 @Test
+59 public void testMergeProperties_String() throws IOException, URISyntaxException {
+60 String key = Settings.KEYS.PROXY_PORT;
+61 String expResult = Settings.getString(key);
+62 File f = new File(this .getClass().getClassLoader().getResource("test.properties" ).toURI());
+63
+64 Settings.mergeProperties(f.getAbsolutePath());
+65 String result = Settings.getString(key);
+66 Assert.assertTrue("setting didn't change?" , (expResult == null && result != null ) || !expResult.equals(result));
+67 }
+68
+69
+70
+71
+72 @Test
+73 public void testSetString() {
+74 String key = "newProperty" ;
+75 String value = "someValue" ;
+76 Settings.setString(key, value);
+77 String expResults = Settings.getString(key);
+78 Assert.assertEquals(expResults, value);
+79 }
+80
+81
+82
+83
+84 @Test
+85 public void testGetString_String_String() {
+86 String key = "key That Doesn't Exist" ;
+87 String defaultValue = "blue bunny" ;
+88 String expResult = "blue bunny" ;
+89 String result = Settings.getString(key);
+90 Assert.assertTrue(result == null );
+91 result = Settings.getString(key, defaultValue);
+92 Assert.assertEquals(expResult, result);
+93 }
+94
+95
+96
+97
+98 @Test
+99 public void testGetString_String() {
+100 String key = Settings.KEYS.CONNECTION_TIMEOUT;
+101 String result = Settings.getString(key);
+102 Assert.assertTrue(result == null );
+103 }
+104
+105
+106
+107
+108 @Test
+109 public void testGetInt() throws InvalidSettingException {
+110 String key = "SomeNumber" ;
+111 int expResult = 85;
+112 Settings.setString(key, "85" );
+113 int result = Settings.getInt(key);
+114 Assert.assertEquals(expResult, result);
+115 }
+116
+117
+118
+119
+120 @Test
+121 public void testGetLong() throws InvalidSettingException {
+122 String key = "SomeNumber" ;
+123 long expResult = 300L;
+124 Settings.setString(key, "300" );
+125 long result = Settings.getLong(key);
+126 Assert.assertEquals(expResult, result);
+127 }
+128
+129
+130
+131
+132 @Test
+133 public void testGetBoolean() throws InvalidSettingException {
+134 String key = "SomeBoolean" ;
+135 Settings.setString(key, "false" );
+136 boolean expResult = false;
+137 boolean result = Settings.getBoolean(key);
+138 Assert.assertEquals(expResult, result);
+139
+140 key = "something that does not exist" ;
+141 expResult = true ;
+142 result = Settings.getBoolean(key, true );
+143 Assert.assertEquals(expResult, result);
+144 }
+145
+146
+147
+148
+149 @Test
+150 public void testRemoveProperty() {
+151 String key = "SomeKey" ;
+152 String value = "value" ;
+153 String dfault = "default" ;
+154 Settings.setString(key, value);
+155 String ret = Settings.getString(key);
+156 Assert.assertEquals(value, ret);
+157 Settings.removeProperty(key);
+158 ret = Settings.getString(key, dfault);
+159 Assert.assertEquals(dfault, ret);
+160 }
+161 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.utils
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.utils
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.utils
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.utils
Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
- Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
diff --git a/dependency-check-core/xref/allclasses-frame.html b/dependency-check-core/xref/allclasses-frame.html
index 54c3f9ed5..f7b842ae4 100644
--- a/dependency-check-core/xref/allclasses-frame.html
+++ b/dependency-check-core/xref/allclasses-frame.html
@@ -181,6 +181,9 @@
Engine
+
+
+ EscapeTool
Evidence
diff --git a/dependency-check-core/xref/index.html b/dependency-check-core/xref/index.html
index e68cdab66..617b8c267 100644
--- a/dependency-check-core/xref/index.html
+++ b/dependency-check-core/xref/index.html
@@ -4,7 +4,7 @@
Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/Engine.html b/dependency-check-core/xref/org/owasp/dependencycheck/Engine.html
index 19ce1d4bd..3a81192bf 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/Engine.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/Engine.html
@@ -74,425 +74,443 @@
66
67
68 private final Set<FileTypeAnalyzer> fileTypeAnalyzers;
-69
-70
-71
-72
-73
-74
-75 public Engine () throws DatabaseException {
-76 this .dependencies = new ArrayList<Dependency>();
-77 this .analyzers = new EnumMap<AnalysisPhase, List<Analyzer>>(AnalysisPhase.class );
-78 this .fileTypeAnalyzers = new HashSet<FileTypeAnalyzer>();
-79
-80 ConnectionFactory.initialize();
-81
-82 boolean autoUpdate = true ;
-83 try {
-84 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
-85 } catch (InvalidSettingException ex) {
-86 Logger.getLogger(Engine.class .getName()).log(Level.FINE, "Invalid setting for auto-update; using true." );
-87 }
-88 if (autoUpdate) {
-89 doUpdates();
-90 }
-91 loadAnalyzers();
-92 }
-93
-94
-95
-96
-97 public void cleanup() {
-98 ConnectionFactory.cleanup();
-99 }
+69
+70
+71
+72 private ClassLoader serviceClassLoader;
+73
+74
+75
+76 private static final Logger LOGGER = Logger.getLogger(Engine.class .getName());
+77
+78
+79
+80
+81
+82
+83 public Engine () throws DatabaseException {
+84 this (Thread.currentThread().getContextClassLoader());
+85 }
+86
+87
+88
+89
+90
+91
+92
+93 public Engine (ClassLoader serviceClassLoader) throws DatabaseException {
+94 this .dependencies = new ArrayList<Dependency>();
+95 this .analyzers = new EnumMap<AnalysisPhase, List<Analyzer>>(AnalysisPhase.class );
+96 this .fileTypeAnalyzers = new HashSet<FileTypeAnalyzer>();
+97 this .serviceClassLoader = serviceClassLoader;
+98
+99 ConnectionFactory.initialize();
100
-101
-102
-103
-104 private void loadAnalyzers() {
-105
-106 for (AnalysisPhase phase : AnalysisPhase.values()) {
-107 analyzers.put(phase, new ArrayList<Analyzer>());
-108 }
-109
-110 final AnalyzerService service = AnalyzerService.getInstance();
-111 final Iterator<Analyzer> iterator = service.getAnalyzers();
-112 while (iterator.hasNext()) {
-113 final Analyzer a = iterator.next();
-114 analyzers.get(a.getAnalysisPhase()).add(a);
-115 if (a instanceof FileTypeAnalyzer) {
-116 this .fileTypeAnalyzers.add((FileTypeAnalyzer) a);
-117 }
-118 }
-119 }
-120
-121
-122
-123
-124
-125
-126
-127 public List<Analyzer> getAnalyzers(AnalysisPhase phase) {
-128 return analyzers.get(phase);
-129 }
-130
-131
-132
-133
-134
-135
-136 public List<Dependency> getDependencies() {
-137 return dependencies;
+101 boolean autoUpdate = true ;
+102 try {
+103 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
+104 } catch (InvalidSettingException ex) {
+105 LOGGER.log(Level.FINE, "Invalid setting for auto-update; using true." );
+106 }
+107 if (autoUpdate) {
+108 doUpdates();
+109 }
+110 loadAnalyzers();
+111 }
+112
+113
+114
+115
+116 public void cleanup() {
+117 ConnectionFactory.cleanup();
+118 }
+119
+120
+121
+122
+123 private void loadAnalyzers() {
+124
+125 for (AnalysisPhase phase : AnalysisPhase.values()) {
+126 analyzers.put(phase, new ArrayList<Analyzer>());
+127 }
+128
+129 final AnalyzerService service = new AnalyzerService (serviceClassLoader);
+130 final Iterator<Analyzer> iterator = service.getAnalyzers();
+131 while (iterator.hasNext()) {
+132 final Analyzer a = iterator.next();
+133 analyzers.get(a.getAnalysisPhase()).add(a);
+134 if (a instanceof FileTypeAnalyzer) {
+135 this .fileTypeAnalyzers.add((FileTypeAnalyzer) a);
+136 }
+137 }
138 }
139
-140 public void setDependencies(List<Dependency> dependencies) {
-141 this .dependencies = dependencies;
-142
-143
-144
-145 }
-146
-147
-148
-149
-150
-151
+140
+141
+142
+143
+144
+145
+146 public List<Analyzer> getAnalyzers(AnalysisPhase phase) {
+147 return analyzers.get(phase);
+148 }
+149
+150
+151
152
-153
+153
154
-155 public void scan(String[] paths) {
-156 for (String path : paths) {
-157 final File file = new File(path);
-158 scan(file);
-159 }
-160 }
-161
-162
-163
-164
-165
-166
-167
-168 public void scan(String path) {
-169 if (path.matches("^.*[\\/]\\*\\.[^\\/:*|?<>\"]+$" )) {
-170 final String[] parts = path.split("\\*\\." );
-171 final String[] ext = new String[]{parts[parts.length - 1]};
-172 final File dir = new File(path.substring(0, path.length() - ext[0].length() - 2));
-173 if (dir.isDirectory()) {
-174 final List<File> files = (List<File>) org.apache.commons.io.FileUtils.listFiles(dir, ext, true );
-175 scan(files);
-176 } else {
-177 final String msg = String.format("Invalid file path provided to scan '%s'" , path);
-178 Logger.getLogger(Engine.class .getName()).log(Level.SEVERE, msg);
-179 }
-180 } else {
-181 final File file = new File(path);
-182 scan(file);
-183 }
-184 }
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194 public void scan(File[] files) {
-195 for (File file : files) {
-196 scan(file);
-197 }
-198 }
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208 public void scan(Set<File> files) {
-209 for (File file : files) {
-210 scan(file);
-211 }
-212 }
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222 public void scan(List<File> files) {
-223 for (File file : files) {
-224 scan(file);
-225 }
-226 }
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236 public void scan(File file) {
-237 if (file.exists()) {
-238 if (file.isDirectory()) {
-239 scanDirectory(file);
-240 } else {
-241 scanFile(file);
-242 }
-243 }
-244 }
-245
-246
-247
-248
-249
-250
-251 protected void scanDirectory(File dir) {
-252 final File[] files = dir.listFiles();
-253 if (files != null ) {
-254 for (File f : files) {
-255 if (f.isDirectory()) {
-256 scanDirectory(f);
-257 } else {
-258 scanFile(f);
-259 }
-260 }
-261 }
-262 }
-263
-264
-265
-266
-267
-268
-269 protected void scanFile(File file) {
-270 if (!file.isFile()) {
-271 final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file." , file.toString());
-272 Logger.getLogger(Engine.class .getName()).log(Level.FINE, msg);
-273 return ;
-274 }
-275 final String fileName = file.getName();
-276 final String extension = FileUtils.getFileExtension(fileName);
-277 if (extension != null ) {
-278 if (supportsExtension(extension)) {
-279 final Dependency dependency = new Dependency (file);
-280 dependencies.add(dependency);
-281 }
-282 } else {
-283 final String msg = String.format("No file extension found on file '%s'. The file was not analyzed." ,
-284 file.toString());
-285 Logger.getLogger(Engine.class .getName()).log(Level.FINEST, msg);
-286 }
-287 }
-288
-289
-290
-291
-292 public void analyzeDependencies() {
-293
-294 try {
-295 ensureDataExists();
-296 } catch (NoDataException ex) {
-297 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis." , ex.getMessage());
-298 Logger.getLogger(Engine.class .getName()).log(Level.SEVERE, msg);
-299 Logger.getLogger(Engine.class .getName()).log(Level.FINE, null , ex);
-300 return ;
-301 } catch (DatabaseException ex) {
-302 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis." , ex.getMessage());
-303 Logger.getLogger(Engine.class .getName()).log(Level.SEVERE, msg);
-304 Logger.getLogger(Engine.class .getName()).log(Level.FINE, null , ex);
-305 return ;
-306
-307 }
-308
-309 final String logHeader = String.format("%n"
-310 + "----------------------------------------------------%n"
-311 + "BEGIN ANALYSIS%n"
-312 + "----------------------------------------------------" );
-313 Logger.getLogger(Engine.class .getName()).log(Level.FINE, logHeader);
-314 Logger.getLogger(Engine.class .getName()).log(Level.INFO, "Analysis Starting" );
-315
-316
-317 for (AnalysisPhase phase : AnalysisPhase.values()) {
-318 final List<Analyzer> analyzerList = analyzers.get(phase);
-319
-320 for (Analyzer a : analyzerList) {
-321 initializeAnalyzer(a);
-322
-323
-324
-325
-326
-327 final String msg = String.format("Begin Analyzer '%s'" , a.getName());
-328 Logger.getLogger(Engine.class .getName()).log(Level.FINE, msg);
-329 final Set<Dependency> dependencySet = new HashSet<Dependency>();
-330 dependencySet.addAll(dependencies);
-331 for (Dependency d : dependencySet) {
-332 boolean shouldAnalyze = true ;
-333 if (a instanceof FileTypeAnalyzer) {
-334 final FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;
-335 shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());
-336 }
-337 if (shouldAnalyze) {
-338 final String msgFile = String.format("Begin Analysis of '%s'" , d.getActualFilePath());
-339 Logger.getLogger(Engine.class .getName()).log(Level.FINE, msgFile);
-340 try {
-341 a.analyze(d, this );
-342 } catch (AnalysisException ex) {
-343 final String exMsg = String.format("An error occured while analyzing '%s'." , d.getActualFilePath());
-344 Logger.getLogger(Engine.class .getName()).log(Level.WARNING, exMsg);
-345 Logger.getLogger(Engine.class .getName()).log(Level.FINE, "" , ex);
-346 } catch (Throwable ex) {
-347 final String axMsg = String.format("An unexpected error occurred during analysis of '%s'" , d.getActualFilePath());
-348
-349 Logger.getLogger(Engine.class .getName()).log(Level.WARNING, axMsg);
-350 Logger.getLogger(Engine.class .getName()).log(Level.FINE, "" , ex);
-351 }
-352 }
-353 }
-354 }
-355 }
-356 for (AnalysisPhase phase : AnalysisPhase.values()) {
-357 final List<Analyzer> analyzerList = analyzers.get(phase);
-358
-359 for (Analyzer a : analyzerList) {
-360 closeAnalyzer(a);
-361 }
-362 }
-363
-364 final String logFooter = String.format("%n"
-365 + "----------------------------------------------------%n"
-366 + "END ANALYSIS%n"
-367 + "----------------------------------------------------" );
-368 Logger.getLogger(Engine.class .getName()).log(Level.FINE, logFooter);
-369 Logger.getLogger(Engine.class .getName()).log(Level.INFO, "Analysis Complete" );
-370 }
-371
-372
-373
-374
-375
-376
-377 private void initializeAnalyzer(Analyzer analyzer) {
-378 try {
-379 final String msg = String.format("Initializing %s" , analyzer.getName());
-380 Logger.getLogger(Engine.class .getName()).log(Level.FINE, msg);
-381 analyzer.initialize();
-382 } catch (Throwable ex) {
-383 final String msg = String.format("Exception occurred initializing %s." , analyzer.getName());
-384 Logger.getLogger(Engine.class .getName()).log(Level.SEVERE, msg);
-385 Logger.getLogger(Engine.class .getName()).log(Level.FINE, null , ex);
-386 try {
-387 analyzer.close();
-388 } catch (Throwable ex1) {
-389 Logger.getLogger(Engine.class .getName()).log(Level.FINEST, null , ex1);
-390 }
-391 }
-392 }
-393
-394
-395
-396
-397
-398
-399 private void closeAnalyzer(Analyzer analyzer) {
-400 final String msg = String.format("Closing Analyzer '%s'" , analyzer.getName());
-401 Logger.getLogger(Engine.class .getName()).log(Level.FINE, msg);
-402 try {
-403 analyzer.close();
-404 } catch (Throwable ex) {
-405 Logger.getLogger(Engine.class .getName()).log(Level.FINEST, null , ex);
-406 }
-407 }
-408
-409
-410
-411
-412 private void doUpdates() {
-413 final UpdateService service = UpdateService.getInstance();
-414 final Iterator<CachedWebDataSource> iterator = service.getDataSources();
-415 while (iterator.hasNext()) {
-416 final CachedWebDataSource source = iterator.next();
-417 try {
-418 source.update();
-419 } catch (UpdateException ex) {
-420 Logger.getLogger(Engine.class .getName()).log(Level.WARNING,
-421 "Unable to update Cached Web DataSource, using local data instead. Results may not include recent vulnerabilities." );
-422 Logger.getLogger(Engine.class .getName()).log(Level.FINE,
-423 String.format("Unable to update details for %s" , source.getClass().getName()), ex);
-424 }
+155 public List<Dependency> getDependencies() {
+156 return dependencies;
+157 }
+158
+159 public void setDependencies(List<Dependency> dependencies) {
+160 this .dependencies = dependencies;
+161
+162
+163
+164 }
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174 public void scan(String[] paths) {
+175 for (String path : paths) {
+176 final File file = new File(path);
+177 scan(file);
+178 }
+179 }
+180
+181
+182
+183
+184
+185
+186
+187 public void scan(String path) {
+188 if (path.matches("^.*[\\/]\\*\\.[^\\/:*|?<>\"]+$" )) {
+189 final String[] parts = path.split("\\*\\." );
+190 final String[] ext = new String[]{parts[parts.length - 1]};
+191 final File dir = new File(path.substring(0, path.length() - ext[0].length() - 2));
+192 if (dir.isDirectory()) {
+193 final List<File> files = (List<File>) org.apache.commons.io.FileUtils.listFiles(dir, ext, true );
+194 scan(files);
+195 } else {
+196 final String msg = String.format("Invalid file path provided to scan '%s'" , path);
+197 LOGGER.log(Level.SEVERE, msg);
+198 }
+199 } else {
+200 final File file = new File(path);
+201 scan(file);
+202 }
+203 }
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213 public void scan(File[] files) {
+214 for (File file : files) {
+215 scan(file);
+216 }
+217 }
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227 public void scan(Set<File> files) {
+228 for (File file : files) {
+229 scan(file);
+230 }
+231 }
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241 public void scan(List<File> files) {
+242 for (File file : files) {
+243 scan(file);
+244 }
+245 }
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255 public void scan(File file) {
+256 if (file.exists()) {
+257 if (file.isDirectory()) {
+258 scanDirectory(file);
+259 } else {
+260 scanFile(file);
+261 }
+262 }
+263 }
+264
+265
+266
+267
+268
+269
+270 protected void scanDirectory(File dir) {
+271 final File[] files = dir.listFiles();
+272 if (files != null ) {
+273 for (File f : files) {
+274 if (f.isDirectory()) {
+275 scanDirectory(f);
+276 } else {
+277 scanFile(f);
+278 }
+279 }
+280 }
+281 }
+282
+283
+284
+285
+286
+287
+288 protected void scanFile(File file) {
+289 if (!file.isFile()) {
+290 final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file." , file.toString());
+291 LOGGER.log(Level.FINE, msg);
+292 return ;
+293 }
+294 final String fileName = file.getName();
+295 final String extension = FileUtils.getFileExtension(fileName);
+296 if (extension != null ) {
+297 if (supportsExtension(extension)) {
+298 final Dependency dependency = new Dependency (file);
+299 dependencies.add(dependency);
+300 }
+301 } else {
+302 final String msg = String.format("No file extension found on file '%s'. The file was not analyzed." ,
+303 file.toString());
+304 LOGGER.log(Level.FINEST, msg);
+305 }
+306 }
+307
+308
+309
+310
+311 public void analyzeDependencies() {
+312
+313 try {
+314 ensureDataExists();
+315 } catch (NoDataException ex) {
+316 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis." , ex.getMessage());
+317 LOGGER.log(Level.SEVERE, msg);
+318 LOGGER.log(Level.FINE, null , ex);
+319 return ;
+320 } catch (DatabaseException ex) {
+321 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis." , ex.getMessage());
+322 LOGGER.log(Level.SEVERE, msg);
+323 LOGGER.log(Level.FINE, null , ex);
+324 return ;
+325
+326 }
+327
+328 final String logHeader = String.format("%n"
+329 + "----------------------------------------------------%n"
+330 + "BEGIN ANALYSIS%n"
+331 + "----------------------------------------------------" );
+332 LOGGER.log(Level.FINE, logHeader);
+333 LOGGER.log(Level.INFO, "Analysis Starting" );
+334
+335
+336 for (AnalysisPhase phase : AnalysisPhase.values()) {
+337 final List<Analyzer> analyzerList = analyzers.get(phase);
+338
+339 for (Analyzer a : analyzerList) {
+340 initializeAnalyzer(a);
+341
+342
+343
+344
+345
+346 final String msg = String.format("Begin Analyzer '%s'" , a.getName());
+347 LOGGER.log(Level.FINE, msg);
+348 final Set<Dependency> dependencySet = new HashSet<Dependency>();
+349 dependencySet.addAll(dependencies);
+350 for (Dependency d : dependencySet) {
+351 boolean shouldAnalyze = true ;
+352 if (a instanceof FileTypeAnalyzer) {
+353 final FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;
+354 shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());
+355 }
+356 if (shouldAnalyze) {
+357 final String msgFile = String.format("Begin Analysis of '%s'" , d.getActualFilePath());
+358 LOGGER.log(Level.FINE, msgFile);
+359 try {
+360 a.analyze(d, this );
+361 } catch (AnalysisException ex) {
+362 final String exMsg = String.format("An error occurred while analyzing '%s'." , d.getActualFilePath());
+363 LOGGER.log(Level.WARNING, exMsg);
+364 LOGGER.log(Level.FINE, "" , ex);
+365 } catch (Throwable ex) {
+366 final String axMsg = String.format("An unexpected error occurred during analysis of '%s'" , d.getActualFilePath());
+367
+368 LOGGER.log(Level.WARNING, axMsg);
+369 LOGGER.log(Level.FINE, "" , ex);
+370 }
+371 }
+372 }
+373 }
+374 }
+375 for (AnalysisPhase phase : AnalysisPhase.values()) {
+376 final List<Analyzer> analyzerList = analyzers.get(phase);
+377
+378 for (Analyzer a : analyzerList) {
+379 closeAnalyzer(a);
+380 }
+381 }
+382
+383 final String logFooter = String.format("%n"
+384 + "----------------------------------------------------%n"
+385 + "END ANALYSIS%n"
+386 + "----------------------------------------------------" );
+387 LOGGER.log(Level.FINE, logFooter);
+388 LOGGER.log(Level.INFO, "Analysis Complete" );
+389 }
+390
+391
+392
+393
+394
+395
+396 private void initializeAnalyzer(Analyzer analyzer) {
+397 try {
+398 final String msg = String.format("Initializing %s" , analyzer.getName());
+399 LOGGER.log(Level.FINE, msg);
+400 analyzer.initialize();
+401 } catch (Throwable ex) {
+402 final String msg = String.format("Exception occurred initializing %s." , analyzer.getName());
+403 LOGGER.log(Level.SEVERE, msg);
+404 LOGGER.log(Level.FINE, null , ex);
+405 try {
+406 analyzer.close();
+407 } catch (Throwable ex1) {
+408 LOGGER.log(Level.FINEST, null , ex1);
+409 }
+410 }
+411 }
+412
+413
+414
+415
+416
+417
+418 private void closeAnalyzer(Analyzer analyzer) {
+419 final String msg = String.format("Closing Analyzer '%s'" , analyzer.getName());
+420 LOGGER.log(Level.FINE, msg);
+421 try {
+422 analyzer.close();
+423 } catch (Throwable ex) {
+424 LOGGER.log(Level.FINEST, null , ex);
425 }
426 }
427
428
-429
-430
-431
-432
-433 public List<Analyzer> getAnalyzers() {
-434 final List<Analyzer> ret = new ArrayList<Analyzer>();
-435 for (AnalysisPhase phase : AnalysisPhase.values()) {
-436 final List<Analyzer> analyzerList = analyzers.get(phase);
-437 ret.addAll(analyzerList);
-438 }
-439 return ret;
-440 }
-441
-442
-443
-444
-445
-446
-447
-448 public boolean supportsExtension(String ext) {
-449 if (ext == null ) {
-450 return false;
-451 }
-452 boolean scan = false;
-453 for (FileTypeAnalyzer a : this .fileTypeAnalyzers) {
-454
-455
-456 scan |= a.supportsExtension(ext);
+429
+430
+431 private void doUpdates() {
+432 final UpdateService service = new UpdateService (serviceClassLoader);
+433 final Iterator<CachedWebDataSource> iterator = service.getDataSources();
+434 while (iterator.hasNext()) {
+435 final CachedWebDataSource source = iterator.next();
+436 try {
+437 source.update();
+438 } catch (UpdateException ex) {
+439 LOGGER.log(Level.WARNING,
+440 "Unable to update Cached Web DataSource, using local data instead. Results may not include recent vulnerabilities." );
+441 LOGGER.log(Level.FINE,
+442 String.format("Unable to update details for %s" , source.getClass().getName()), ex);
+443 }
+444 }
+445 }
+446
+447
+448
+449
+450
+451
+452 public List<Analyzer> getAnalyzers() {
+453 final List<Analyzer> ret = new ArrayList<Analyzer>();
+454 for (AnalysisPhase phase : AnalysisPhase.values()) {
+455 final List<Analyzer> analyzerList = analyzers.get(phase);
+456 ret.addAll(analyzerList);
457 }
-458 return scan;
+458 return ret;
459 }
460
461
-462
+462
463
-464
-465
+464
+465
466
-467 private void ensureDataExists() throws NoDataException, DatabaseException {
-468 final CpeMemoryIndex cpe = CpeMemoryIndex.getInstance();
-469 final CveDB cve = new CveDB ();
-470
-471 try {
-472 cve.open();
-473 cpe.open(cve);
-474 } catch (IndexException ex) {
-475 throw new NoDataException (ex.getMessage(), ex);
-476 } catch (DatabaseException ex) {
-477 throw new NoDataException (ex.getMessage(), ex);
-478 } finally {
-479 cve.close();
-480 }
-481 if (cpe.numDocs() <= 0) {
-482 cpe.close();
-483 throw new NoDataException ("No documents exist" );
-484 }
-485 }
-486
-487 }
+467 public boolean supportsExtension(String ext) {
+468 if (ext == null ) {
+469 return false;
+470 }
+471 boolean scan = false;
+472 for (FileTypeAnalyzer a : this .fileTypeAnalyzers) {
+473
+474
+475 scan |= a.supportsExtension(ext);
+476 }
+477 return scan;
+478 }
+479
+480
+481
+482
+483
+484
+485
+486 private void ensureDataExists() throws NoDataException, DatabaseException {
+487 final CpeMemoryIndex cpe = CpeMemoryIndex.getInstance();
+488 final CveDB cve = new CveDB ();
+489
+490 try {
+491 cve.open();
+492 cpe.open(cve);
+493 } catch (IndexException ex) {
+494 throw new NoDataException (ex.getMessage(), ex);
+495 } catch (DatabaseException ex) {
+496 throw new NoDataException (ex.getMessage(), ex);
+497 } finally {
+498 cve.close();
+499 }
+500 if (cpe.numDocs() <= 0) {
+501 cpe.close();
+502 throw new NoDataException ("No documents exist" );
+503 }
+504 }
+505 }
64
65
66 private static final String NEW_LINE = System.getProperty("line.separator" , "\n" ).intern();
-67
-68
-69
-70
-71 private String applicationName = "Dependency-Check" ;
-72
-73
-74
-75
-76
-77
-78 public String getApplicationName() {
-79 return applicationName;
-80 }
-81
-82
-83
-84
-85
-86
-87 public void setApplicationName(String applicationName) {
-88 this .applicationName = applicationName;
-89 }
-90
-91
-92
-93
-94 private List<Dependency> dependencies;
-95
-96
-97
-98
-99
-100
-101 public List<Dependency> getDependencies() {
-102 return dependencies;
-103 }
-104
-105
-106
-107
-108
-109
-110 public void setDependencies(List<Dependency> dependencies) {
-111 this .dependencies = dependencies;
-112 }
-113
-114
-115
-116
-117 private String dataDirectory = null ;
-118
-119
-120
-121
-122
-123
-124 public String getDataDirectory() {
-125 return dataDirectory;
-126 }
-127
-128
-129
-130
-131
-132
-133 public void setDataDirectory(String dataDirectory) {
-134 this .dataDirectory = dataDirectory;
-135 }
-136
-137
-138
-139
-140 private String reportOutputDirectory;
-141
-142
-143
-144
-145
-146
-147 public String getReportOutputDirectory() {
-148 return reportOutputDirectory;
-149 }
-150
-151
-152
-153
-154
-155
-156 public void setReportOutputDirectory(String reportOutputDirectory) {
-157 this .reportOutputDirectory = reportOutputDirectory;
-158 }
-159
-160
-161
-162
-163
-164
-165 private float failBuildOnCVSS = 11;
-166
-167
-168
-169
-170
-171
-172 public float getFailBuildOnCVSS() {
-173 return failBuildOnCVSS;
-174 }
-175
-176
-177
-178
-179
-180
-181 public void setFailBuildOnCVSS(float failBuildOnCVSS) {
-182 this .failBuildOnCVSS = failBuildOnCVSS;
-183 }
-184
-185
-186
-187
-188
-189 private boolean autoUpdate = true ;
-190
-191
-192
-193
-194
-195
-196 public boolean isAutoUpdate() {
-197 return autoUpdate;
-198 }
-199
-200
-201
-202
-203
-204
-205 public void setAutoUpdate(boolean autoUpdate) {
-206 this .autoUpdate = autoUpdate;
-207 }
-208
-209
-210
-211
-212
-213 private ReportGenerator.Format reportFormat = ReportGenerator.Format.HTML;
-214
-215
-216
-217
-218
-219
-220 public ReportGenerator.Format getReportFormat() {
-221 return reportFormat;
-222 }
-223
-224
-225
-226
-227
-228
-229 public void setReportFormat(ReportGenerator.Format reportFormat) {
-230 this .reportFormat = reportFormat;
-231 }
-232
-233
-234
-235
-236 private String proxyUrl;
-237
-238
-239
-240
-241
-242
-243 public String getProxyUrl() {
-244 return proxyUrl;
-245 }
-246
-247
-248
-249
-250
-251
-252 public void setProxyUrl(String proxyUrl) {
-253 this .proxyUrl = proxyUrl;
-254 }
-255
-256
-257
-258
-259 private String proxyPort;
-260
-261
-262
-263
-264
-265
-266 public String getProxyPort() {
-267 return proxyPort;
-268 }
-269
-270
-271
-272
-273
-274
-275 public void setProxyPort(String proxyPort) {
-276 this .proxyPort = proxyPort;
-277 }
-278
-279
-280
-281
-282 private String proxyUsername;
-283
-284
-285
-286
-287
-288
-289 public String getProxyUsername() {
-290 return proxyUsername;
-291 }
-292
-293
-294
-295
-296
-297
-298 public void setProxyUsername(String proxyUsername) {
-299 this .proxyUsername = proxyUsername;
-300 }
-301
-302
-303
-304
-305 private String proxyPassword;
-306
-307
-308
-309
-310
-311
-312 public String getProxyPassword() {
-313 return proxyPassword;
-314 }
-315
-316
-317
-318
-319
-320
-321 public void setProxyPassword(String proxyPassword) {
-322 this .proxyPassword = proxyPassword;
-323 }
-324
-325
-326
-327
-328 private String connectionTimeout;
-329
-330
-331
-332
-333
-334
-335 public String getConnectionTimeout() {
-336 return connectionTimeout;
-337 }
-338
-339
-340
-341
-342
-343
-344 public void setConnectionTimeout(String connectionTimeout) {
-345 this .connectionTimeout = connectionTimeout;
-346 }
-347
-348
-349
-350
-351 private String logFile = null ;
-352
-353
-354
-355
-356
-357
-358 public String getLogFile() {
-359 return logFile;
-360 }
-361
-362
-363
-364
-365
-366
-367 public void setLogFile(String logFile) {
-368 this .logFile = logFile;
-369 }
-370
-371
-372
-373
-374 private String suppressionFile;
-375
-376
-377
-378
-379
-380
-381 public String getSuppressionFile() {
-382 return suppressionFile;
-383 }
-384
-385
-386
-387
-388
-389
-390 public void setSuppressionFile(String suppressionFile) {
-391 this .suppressionFile = suppressionFile;
-392 }
-393
-394
-395
-396
-397 private boolean showSummary = true ;
-398
-399
-400
-401
-402
-403
-404 public boolean isShowSummary() {
-405 return showSummary;
-406 }
-407
-408
-409
-410
-411
-412
-413 public void setShowSummary(boolean showSummary) {
-414 this .showSummary = showSummary;
-415 }
-416
-417
-418
-419
-420 private boolean nexusAnalyzerEnabled = true ;
-421
-422
-423
-424
-425
-426
-427 public boolean isNexusAnalyzerEnabled() {
-428 return nexusAnalyzerEnabled;
-429 }
-430
-431
-432
-433
-434
-435
-436 public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
-437 this .nexusAnalyzerEnabled = nexusAnalyzerEnabled;
-438 }
-439
-440
-441
-442
-443 private String nexusUrl;
-444
-445
-446
-447
-448
-449
-450 public String getNexusUrl() {
-451 return nexusUrl;
-452 }
-453
-454
-455
-456
-457
-458
-459 public void setNexusUrl(String nexusUrl) {
-460 this .nexusUrl = nexusUrl;
-461 }
-462
-463
-464
-465
-466 private boolean nexusUsesProxy = true ;
-467
-468
-469
-470
-471
-472
-473 public boolean isNexusUsesProxy() {
-474 return nexusUsesProxy;
-475 }
-476
-477
-478
-479
-480
-481
-482 public void setNexusUsesProxy(boolean nexusUsesProxy) {
-483 this .nexusUsesProxy = nexusUsesProxy;
-484 }
-485
-486
-487
-488
-489 private String databaseDriverName;
-490
-491
-492
-493
-494
-495
-496 public String getDatabaseDriverName() {
-497 return databaseDriverName;
-498 }
-499
-500
-501
-502
-503
-504
-505 public void setDatabaseDriverName(String databaseDriverName) {
-506 this .databaseDriverName = databaseDriverName;
-507 }
-508
-509
-510
-511
-512 private String databaseDriverPath;
-513
-514
-515
-516
-517
-518
-519 public String getDatabaseDriverPath() {
-520 return databaseDriverPath;
-521 }
-522
-523
-524
-525
-526
-527
-528 public void setDatabaseDriverPath(String databaseDriverPath) {
-529 this .databaseDriverPath = databaseDriverPath;
-530 }
-531
-532
-533
-534
-535 private String connectionString;
-536
-537
-538
-539
-540
-541
-542 public String getConnectionString() {
-543 return connectionString;
-544 }
-545
-546
-547
-548
-549
-550
-551 public void setConnectionString(String connectionString) {
-552 this .connectionString = connectionString;
-553 }
-554
-555
-556
-557
-558 private String databaseUser;
-559
-560
-561
-562
-563
-564
-565 public String getDatabaseUser() {
-566 return databaseUser;
-567 }
-568
-569
-570
-571
-572
-573
-574 public void setDatabaseUser(String databaseUser) {
-575 this .databaseUser = databaseUser;
-576 }
-577
-578
-579
-580
-581 private String databasePassword;
-582
-583
-584
-585
-586
-587
-588 public String getDatabasePassword() {
-589 return databasePassword;
-590 }
-591
-592
-593
-594
-595
-596
-597 public void setDatabasePassword(String databasePassword) {
-598 this .databasePassword = databasePassword;
-599 }
-600
-601
-602
-603
-604
-605 private String zipExtensions;
-606
-607
-608
-609
-610
-611
-612 public String getZipExtensions() {
-613 return zipExtensions;
-614 }
-615
-616
-617
-618
-619
-620
-621 public void setZipExtensions(String zipExtensions) {
-622 this .zipExtensions = zipExtensions;
-623 }
-624
-625
-626
-627
-628 private String cveUrl12Modified;
-629
-630
-631
-632
-633
-634
-635 public String getCveUrl12Modified() {
-636 return cveUrl12Modified;
-637 }
-638
-639
-640
-641
-642
-643
-644 public void setCveUrl12Modified(String cveUrl12Modified) {
-645 this .cveUrl12Modified = cveUrl12Modified;
-646 }
-647
-648
-649
-650
-651 private String cveUrl20Modified;
-652
-653
-654
-655
-656
-657
-658 public String getCveUrl20Modified() {
-659 return cveUrl20Modified;
-660 }
-661
-662
-663
-664
-665
-666
-667 public void setCveUrl20Modified(String cveUrl20Modified) {
-668 this .cveUrl20Modified = cveUrl20Modified;
-669 }
-670
-671
-672
-673
-674 private String cveUrl12Base;
-675
-676
-677
-678
-679
-680
-681 public String getCveUrl12Base() {
-682 return cveUrl12Base;
-683 }
-684
-685
-686
-687
-688
-689
-690 public void setCveUrl12Base(String cveUrl12Base) {
-691 this .cveUrl12Base = cveUrl12Base;
-692 }
-693
-694
-695
-696
-697 private String cveUrl20Base;
-698
-699
-700
-701
-702
-703
-704 public String getCveUrl20Base() {
-705 return cveUrl20Base;
-706 }
-707
-708
-709
-710
-711
-712
-713 public void setCveUrl20Base(String cveUrl20Base) {
-714 this .cveUrl20Base = cveUrl20Base;
-715 }
-716
-717
-718
-719
-720 private String pathToMono;
-721
-722
-723
-724
-725
-726
-727 public String getPathToMono() {
-728 return pathToMono;
-729 }
-730
-731
-732
-733
-734
-735
-736 public void setPathToMono(String pathToMono) {
-737 this .pathToMono = pathToMono;
-738 }
-739
-740
-741
-742
-743
-744
-745
-746
-747 private Engine executeDependencyCheck() throws DatabaseException {
-748 populateSettings();
-749 Engine engine = null ;
-750 try {
-751 engine = new Engine ();
-752 engine.setDependencies(this .dependencies);
-753 engine.analyzeDependencies();
-754
-755 } finally {
-756 if (engine != null ) {
-757 engine.cleanup();
-758 }
-759 }
-760 return engine;
-761 }
-762
-763
-764
-765
-766
-767
-768
-769 private void generateExternalReports(Engine engine, File outDirectory) {
-770 DatabaseProperties prop = null ;
-771 CveDB cve = null ;
-772 try {
-773 cve = new CveDB ();
-774 cve.open();
-775 prop = cve.getDatabaseProperties();
-776 } catch (DatabaseException ex) {
-777 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.FINE, "Unable to retrieve DB Properties" , ex);
-778 } finally {
-779 if (cve != null ) {
-780 cve.close();
-781 }
-782 }
-783 final ReportGenerator r = new ReportGenerator (this .applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
-784 try {
-785 r.generateReports(outDirectory.getCanonicalPath(), this .reportFormat.name());
-786 } catch (IOException ex) {
-787 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.SEVERE,
+67
+68
+69
+70 private static final Logger LOGGER = Logger.getLogger(DependencyCheckScanAgent.class .getName());
+71
+72
+73
+74 private String applicationName = "Dependency-Check" ;
+75
+76
+77
+78
+79
+80
+81 public String getApplicationName() {
+82 return applicationName;
+83 }
+84
+85
+86
+87
+88
+89
+90 public void setApplicationName(String applicationName) {
+91 this .applicationName = applicationName;
+92 }
+93
+94
+95
+96
+97 private List<Dependency> dependencies;
+98
+99
+100
+101
+102
+103
+104 public List<Dependency> getDependencies() {
+105 return dependencies;
+106 }
+107
+108
+109
+110
+111
+112
+113 public void setDependencies(List<Dependency> dependencies) {
+114 this .dependencies = dependencies;
+115 }
+116
+117
+118
+119
+120 private String dataDirectory = null ;
+121
+122
+123
+124
+125
+126
+127 public String getDataDirectory() {
+128 return dataDirectory;
+129 }
+130
+131
+132
+133
+134
+135
+136 public void setDataDirectory(String dataDirectory) {
+137 this .dataDirectory = dataDirectory;
+138 }
+139
+140
+141
+142
+143 private String reportOutputDirectory;
+144
+145
+146
+147
+148
+149
+150 public String getReportOutputDirectory() {
+151 return reportOutputDirectory;
+152 }
+153
+154
+155
+156
+157
+158
+159 public void setReportOutputDirectory(String reportOutputDirectory) {
+160 this .reportOutputDirectory = reportOutputDirectory;
+161 }
+162
+163
+164
+165
+166
+167
+168 private float failBuildOnCVSS = 11;
+169
+170
+171
+172
+173
+174
+175 public float getFailBuildOnCVSS() {
+176 return failBuildOnCVSS;
+177 }
+178
+179
+180
+181
+182
+183
+184 public void setFailBuildOnCVSS(float failBuildOnCVSS) {
+185 this .failBuildOnCVSS = failBuildOnCVSS;
+186 }
+187
+188
+189
+190
+191
+192 private boolean autoUpdate = true ;
+193
+194
+195
+196
+197
+198
+199 public boolean isAutoUpdate() {
+200 return autoUpdate;
+201 }
+202
+203
+204
+205
+206
+207
+208 public void setAutoUpdate(boolean autoUpdate) {
+209 this .autoUpdate = autoUpdate;
+210 }
+211
+212
+213
+214
+215
+216 private ReportGenerator.Format reportFormat = ReportGenerator.Format.HTML;
+217
+218
+219
+220
+221
+222
+223 public ReportGenerator.Format getReportFormat() {
+224 return reportFormat;
+225 }
+226
+227
+228
+229
+230
+231
+232 public void setReportFormat(ReportGenerator.Format reportFormat) {
+233 this .reportFormat = reportFormat;
+234 }
+235
+236
+237
+238
+239 private String proxyUrl;
+240
+241
+242
+243
+244
+245
+246 public String getProxyUrl() {
+247 return proxyUrl;
+248 }
+249
+250
+251
+252
+253
+254
+255 public void setProxyUrl(String proxyUrl) {
+256 this .proxyUrl = proxyUrl;
+257 }
+258
+259
+260
+261
+262 private String proxyPort;
+263
+264
+265
+266
+267
+268
+269 public String getProxyPort() {
+270 return proxyPort;
+271 }
+272
+273
+274
+275
+276
+277
+278 public void setProxyPort(String proxyPort) {
+279 this .proxyPort = proxyPort;
+280 }
+281
+282
+283
+284
+285 private String proxyUsername;
+286
+287
+288
+289
+290
+291
+292 public String getProxyUsername() {
+293 return proxyUsername;
+294 }
+295
+296
+297
+298
+299
+300
+301 public void setProxyUsername(String proxyUsername) {
+302 this .proxyUsername = proxyUsername;
+303 }
+304
+305
+306
+307
+308 private String proxyPassword;
+309
+310
+311
+312
+313
+314
+315 public String getProxyPassword() {
+316 return proxyPassword;
+317 }
+318
+319
+320
+321
+322
+323
+324 public void setProxyPassword(String proxyPassword) {
+325 this .proxyPassword = proxyPassword;
+326 }
+327
+328
+329
+330
+331 private String connectionTimeout;
+332
+333
+334
+335
+336
+337
+338 public String getConnectionTimeout() {
+339 return connectionTimeout;
+340 }
+341
+342
+343
+344
+345
+346
+347 public void setConnectionTimeout(String connectionTimeout) {
+348 this .connectionTimeout = connectionTimeout;
+349 }
+350
+351
+352
+353
+354 private String logFile = null ;
+355
+356
+357
+358
+359
+360
+361 public String getLogFile() {
+362 return logFile;
+363 }
+364
+365
+366
+367
+368
+369
+370 public void setLogFile(String logFile) {
+371 this .logFile = logFile;
+372 }
+373
+374
+375
+376
+377 private String suppressionFile;
+378
+379
+380
+381
+382
+383
+384 public String getSuppressionFile() {
+385 return suppressionFile;
+386 }
+387
+388
+389
+390
+391
+392
+393 public void setSuppressionFile(String suppressionFile) {
+394 this .suppressionFile = suppressionFile;
+395 }
+396
+397
+398
+399
+400 private boolean showSummary = true ;
+401
+402
+403
+404
+405
+406
+407 public boolean isShowSummary() {
+408 return showSummary;
+409 }
+410
+411
+412
+413
+414
+415
+416 public void setShowSummary(boolean showSummary) {
+417 this .showSummary = showSummary;
+418 }
+419
+420
+421
+422
+423 private boolean nexusAnalyzerEnabled = true ;
+424
+425
+426
+427
+428
+429
+430 public boolean isNexusAnalyzerEnabled() {
+431 return nexusAnalyzerEnabled;
+432 }
+433
+434
+435
+436
+437
+438
+439 public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
+440 this .nexusAnalyzerEnabled = nexusAnalyzerEnabled;
+441 }
+442
+443
+444
+445
+446 private String nexusUrl;
+447
+448
+449
+450
+451
+452
+453 public String getNexusUrl() {
+454 return nexusUrl;
+455 }
+456
+457
+458
+459
+460
+461
+462 public void setNexusUrl(String nexusUrl) {
+463 this .nexusUrl = nexusUrl;
+464 }
+465
+466
+467
+468
+469 private boolean nexusUsesProxy = true ;
+470
+471
+472
+473
+474
+475
+476 public boolean isNexusUsesProxy() {
+477 return nexusUsesProxy;
+478 }
+479
+480
+481
+482
+483
+484
+485 public void setNexusUsesProxy(boolean nexusUsesProxy) {
+486 this .nexusUsesProxy = nexusUsesProxy;
+487 }
+488
+489
+490
+491
+492 private String databaseDriverName;
+493
+494
+495
+496
+497
+498
+499 public String getDatabaseDriverName() {
+500 return databaseDriverName;
+501 }
+502
+503
+504
+505
+506
+507
+508 public void setDatabaseDriverName(String databaseDriverName) {
+509 this .databaseDriverName = databaseDriverName;
+510 }
+511
+512
+513
+514
+515 private String databaseDriverPath;
+516
+517
+518
+519
+520
+521
+522 public String getDatabaseDriverPath() {
+523 return databaseDriverPath;
+524 }
+525
+526
+527
+528
+529
+530
+531 public void setDatabaseDriverPath(String databaseDriverPath) {
+532 this .databaseDriverPath = databaseDriverPath;
+533 }
+534
+535
+536
+537
+538 private String connectionString;
+539
+540
+541
+542
+543
+544
+545 public String getConnectionString() {
+546 return connectionString;
+547 }
+548
+549
+550
+551
+552
+553
+554 public void setConnectionString(String connectionString) {
+555 this .connectionString = connectionString;
+556 }
+557
+558
+559
+560
+561 private String databaseUser;
+562
+563
+564
+565
+566
+567
+568 public String getDatabaseUser() {
+569 return databaseUser;
+570 }
+571
+572
+573
+574
+575
+576
+577 public void setDatabaseUser(String databaseUser) {
+578 this .databaseUser = databaseUser;
+579 }
+580
+581
+582
+583
+584 private String databasePassword;
+585
+586
+587
+588
+589
+590
+591 public String getDatabasePassword() {
+592 return databasePassword;
+593 }
+594
+595
+596
+597
+598
+599
+600 public void setDatabasePassword(String databasePassword) {
+601 this .databasePassword = databasePassword;
+602 }
+603
+604
+605
+606
+607
+608 private String zipExtensions;
+609
+610
+611
+612
+613
+614
+615 public String getZipExtensions() {
+616 return zipExtensions;
+617 }
+618
+619
+620
+621
+622
+623
+624 public void setZipExtensions(String zipExtensions) {
+625 this .zipExtensions = zipExtensions;
+626 }
+627
+628
+629
+630
+631 private String cveUrl12Modified;
+632
+633
+634
+635
+636
+637
+638 public String getCveUrl12Modified() {
+639 return cveUrl12Modified;
+640 }
+641
+642
+643
+644
+645
+646
+647 public void setCveUrl12Modified(String cveUrl12Modified) {
+648 this .cveUrl12Modified = cveUrl12Modified;
+649 }
+650
+651
+652
+653
+654 private String cveUrl20Modified;
+655
+656
+657
+658
+659
+660
+661 public String getCveUrl20Modified() {
+662 return cveUrl20Modified;
+663 }
+664
+665
+666
+667
+668
+669
+670 public void setCveUrl20Modified(String cveUrl20Modified) {
+671 this .cveUrl20Modified = cveUrl20Modified;
+672 }
+673
+674
+675
+676
+677 private String cveUrl12Base;
+678
+679
+680
+681
+682
+683
+684 public String getCveUrl12Base() {
+685 return cveUrl12Base;
+686 }
+687
+688
+689
+690
+691
+692
+693 public void setCveUrl12Base(String cveUrl12Base) {
+694 this .cveUrl12Base = cveUrl12Base;
+695 }
+696
+697
+698
+699
+700 private String cveUrl20Base;
+701
+702
+703
+704
+705
+706
+707 public String getCveUrl20Base() {
+708 return cveUrl20Base;
+709 }
+710
+711
+712
+713
+714
+715
+716 public void setCveUrl20Base(String cveUrl20Base) {
+717 this .cveUrl20Base = cveUrl20Base;
+718 }
+719
+720
+721
+722
+723 private String pathToMono;
+724
+725
+726
+727
+728
+729
+730 public String getPathToMono() {
+731 return pathToMono;
+732 }
+733
+734
+735
+736
+737
+738
+739 public void setPathToMono(String pathToMono) {
+740 this .pathToMono = pathToMono;
+741 }
+742
+743
+744
+745
+746
+747
+748
+749
+750 private Engine executeDependencyCheck() throws DatabaseException {
+751 populateSettings();
+752 Engine engine = null ;
+753 engine = new Engine ();
+754 engine.setDependencies(this .dependencies);
+755 engine.analyzeDependencies();
+756 return engine;
+757 }
+758
+759
+760
+761
+762
+763
+764
+765 private void generateExternalReports(Engine engine, File outDirectory) {
+766 DatabaseProperties prop = null ;
+767 CveDB cve = null ;
+768 try {
+769 cve = new CveDB ();
+770 cve.open();
+771 prop = cve.getDatabaseProperties();
+772 } catch (DatabaseException ex) {
+773 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties" , ex);
+774 } finally {
+775 if (cve != null ) {
+776 cve.close();
+777 }
+778 }
+779 final ReportGenerator r = new ReportGenerator (this .applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
+780 try {
+781 r.generateReports(outDirectory.getCanonicalPath(), this .reportFormat.name());
+782 } catch (IOException ex) {
+783 LOGGER.log(Level.SEVERE,
+784 "Unexpected exception occurred during analysis; please see the verbose error log for more details." );
+785 LOGGER.log(Level.FINE, null , ex);
+786 } catch (Throwable ex) {
+787 LOGGER.log(Level.SEVERE,
788 "Unexpected exception occurred during analysis; please see the verbose error log for more details." );
-789 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.FINE, null , ex);
-790 } catch (Throwable ex) {
-791 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.SEVERE,
-792 "Unexpected exception occurred during analysis; please see the verbose error log for more details." );
-793 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.FINE, null , ex);
-794 }
-795 }
-796
-797
-798
-799
-800
-801 private void populateSettings() {
-802 if (dataDirectory != null ) {
-803 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
-804 } else {
-805 final File jarPath = new File(DependencyCheckScanAgent.class .getProtectionDomain().getCodeSource().getLocation().getPath());
-806 final File base = jarPath.getParentFile();
-807 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
-808 final File dataDir = new File(base, sub);
-809 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-810 }
-811
-812 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-813
-814 if (proxyUrl != null && !proxyUrl.isEmpty()) {
-815 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
+789 LOGGER.log(Level.FINE, null , ex);
+790 }
+791 }
+792
+793
+794
+795
+796
+797 private void populateSettings() {
+798 Settings.initialize();
+799 if (dataDirectory != null ) {
+800 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
+801 } else {
+802 final File jarPath = new File(DependencyCheckScanAgent.class .getProtectionDomain().getCodeSource().getLocation().getPath());
+803 final File base = jarPath.getParentFile();
+804 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
+805 final File dataDir = new File(base, sub);
+806 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+807 }
+808
+809 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+810
+811 if (proxyUrl != null && !proxyUrl.isEmpty()) {
+812 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
+813 }
+814 if (proxyPort != null && !proxyPort.isEmpty()) {
+815 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
816 }
-817 if (proxyPort != null && !proxyPort.isEmpty()) {
-818 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+817 if (proxyUsername != null && !proxyUsername.isEmpty()) {
+818 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
819 }
-820 if (proxyUsername != null && !proxyUsername.isEmpty()) {
-821 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
+820 if (proxyPassword != null && !proxyPassword.isEmpty()) {
+821 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
822 }
-823 if (proxyPassword != null && !proxyPassword.isEmpty()) {
-824 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
+823 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+824 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
825 }
-826 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
-827 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+826 if (suppressionFile != null && !suppressionFile.isEmpty()) {
+827 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
828 }
-829 if (suppressionFile != null && !suppressionFile.isEmpty()) {
-830 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
-831 }
-832 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
-833 if (nexusUrl != null && !nexusUrl.isEmpty()) {
-834 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
-835 }
-836 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
-837 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
-838 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+829 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
+830 if (nexusUrl != null && !nexusUrl.isEmpty()) {
+831 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+832 }
+833 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+834 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+835 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+836 }
+837 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+838 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
839 }
-840 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
-841 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+840 if (connectionString != null && !connectionString.isEmpty()) {
+841 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
842 }
-843 if (connectionString != null && !connectionString.isEmpty()) {
-844 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+843 if (databaseUser != null && !databaseUser.isEmpty()) {
+844 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
845 }
-846 if (databaseUser != null && !databaseUser.isEmpty()) {
-847 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+846 if (databasePassword != null && !databasePassword.isEmpty()) {
+847 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
848 }
-849 if (databasePassword != null && !databasePassword.isEmpty()) {
-850 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
+849 if (zipExtensions != null && !zipExtensions.isEmpty()) {
+850 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
851 }
-852 if (zipExtensions != null && !zipExtensions.isEmpty()) {
-853 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
+852 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
+853 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
854 }
-855 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
-856 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
+855 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
+856 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
857 }
-858 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
-859 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
+858 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
+859 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
860 }
-861 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
-862 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
+861 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
+862 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
863 }
-864 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
-865 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
+864 if (pathToMono != null && !pathToMono.isEmpty()) {
+865 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
866 }
-867 if (pathToMono != null && !pathToMono.isEmpty()) {
-868 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
-869 }
-870 }
-871
-872
-873
-874
-875
-876
-877
-878 public void execute() throws ScanAgentException {
-879 Engine engine = null ;
-880 try {
-881 engine = executeDependencyCheck();
-882 generateExternalReports(engine, new File(this .reportOutputDirectory));
-883 if (this .showSummary) {
-884 showSummary(engine.getDependencies());
+867 }
+868
+869
+870
+871
+872
+873
+874
+875 public void execute() throws ScanAgentException {
+876 Engine engine = null ;
+877 try {
+878 engine = executeDependencyCheck();
+879 generateExternalReports(engine, new File(this .reportOutputDirectory));
+880 if (this .showSummary) {
+881 showSummary(engine.getDependencies());
+882 }
+883 if (this .failBuildOnCVSS <= 10) {
+884 checkForFailure(engine.getDependencies());
885 }
-886 if (this .failBuildOnCVSS <= 10) {
-887 checkForFailure(engine.getDependencies());
-888 }
-889 } catch (DatabaseException ex) {
-890 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.SEVERE,
-891 "Unable to connect to the dependency-check database; analysis has stopped" );
-892 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.FINE, "" , ex);
-893 } finally {
-894 if (engine != null ) {
-895 engine.cleanup();
-896 }
-897 }
-898 }
-899
-900
-901
-902
-903
-904
-905
-906
-907
-908 private void checkForFailure(List<Dependency> dependencies) throws ScanAgentException {
-909 final StringBuilder ids = new StringBuilder();
-910 for (Dependency d : dependencies) {
-911 boolean addName = true ;
-912 for (Vulnerability v : d.getVulnerabilities()) {
-913 if (v.getCvssScore() >= failBuildOnCVSS) {
-914 if (addName) {
-915 addName = false;
-916 ids.append(NEW_LINE).append(d.getFileName()).append(": " );
-917 ids.append(v.getName());
-918 } else {
-919 ids.append(", " ).append(v.getName());
-920 }
-921 }
-922 }
-923 }
-924 if (ids.length() > 0) {
-925 final String msg = String.format("%n%nDependency-Check Failure:%n"
-926 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
-927 + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
-928
-929 throw new ScanAgentException (msg);
-930 }
-931 }
-932
-933
-934
-935
-936
-937
-938 private void showSummary(List<Dependency> dependencies) {
-939 final StringBuilder summary = new StringBuilder();
-940 for (Dependency d : dependencies) {
-941 boolean firstEntry = true ;
-942 final StringBuilder ids = new StringBuilder();
-943 for (Vulnerability v : d.getVulnerabilities()) {
-944 if (firstEntry) {
-945 firstEntry = false;
-946 } else {
-947 ids.append(", " );
-948 }
-949 ids.append(v.getName());
-950 }
-951 if (ids.length() > 0) {
-952 summary.append(d.getFileName()).append(" (" );
-953 firstEntry = true ;
-954 for (Identifier id : d.getIdentifiers()) {
-955 if (firstEntry) {
-956 firstEntry = false;
-957 } else {
-958 summary.append(", " );
-959 }
-960 summary.append(id.getValue());
-961 }
-962 summary.append(") : " ).append(ids).append(NEW_LINE);
-963 }
-964 }
-965 if (summary.length() > 0) {
-966 final String msg = String.format("%n%n"
-967 + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
-968 + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString());
-969 Logger.getLogger(DependencyCheckScanAgent.class .getName()).log(Level.WARNING, msg);
-970 }
-971 }
-972
-973 }
+886 } catch (DatabaseException ex) {
+887 LOGGER.log(Level.SEVERE,
+888 "Unable to connect to the dependency-check database; analysis has stopped" );
+889 LOGGER.log(Level.FINE, "" , ex);
+890 } finally {
+891 Settings.cleanup();
+892 if (engine != null ) {
+893 engine.cleanup();
+894 }
+895 }
+896 }
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906 private void checkForFailure(List<Dependency> dependencies) throws ScanAgentException {
+907 final StringBuilder ids = new StringBuilder();
+908 for (Dependency d : dependencies) {
+909 boolean addName = true ;
+910 for (Vulnerability v : d.getVulnerabilities()) {
+911 if (v.getCvssScore() >= failBuildOnCVSS) {
+912 if (addName) {
+913 addName = false;
+914 ids.append(NEW_LINE).append(d.getFileName()).append(": " );
+915 ids.append(v.getName());
+916 } else {
+917 ids.append(", " ).append(v.getName());
+918 }
+919 }
+920 }
+921 }
+922 if (ids.length() > 0) {
+923 final String msg = String.format("%n%nDependency-Check Failure:%n"
+924 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
+925 + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
+926
+927 throw new ScanAgentException (msg);
+928 }
+929 }
+930
+931
+932
+933
+934
+935
+936 private void showSummary(List<Dependency> dependencies) {
+937 final StringBuilder summary = new StringBuilder();
+938 for (Dependency d : dependencies) {
+939 boolean firstEntry = true ;
+940 final StringBuilder ids = new StringBuilder();
+941 for (Vulnerability v : d.getVulnerabilities()) {
+942 if (firstEntry) {
+943 firstEntry = false;
+944 } else {
+945 ids.append(", " );
+946 }
+947 ids.append(v.getName());
+948 }
+949 if (ids.length() > 0) {
+950 summary.append(d.getFileName()).append(" (" );
+951 firstEntry = true ;
+952 for (Identifier id : d.getIdentifiers()) {
+953 if (firstEntry) {
+954 firstEntry = false;
+955 } else {
+956 summary.append(", " );
+957 }
+958 summary.append(id.getValue());
+959 }
+960 summary.append(") : " ).append(ids).append(NEW_LINE);
+961 }
+962 }
+963 if (summary.length() > 0) {
+964 final String msg = String.format("%n%n"
+965 + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
+966 + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString());
+967 LOGGER.log(Level.WARNING, msg);
+968 }
+969 }
+970
+971 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.agent
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.agent
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.agent
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.agent
45 try {
46 enabled = Settings.getBoolean(key, true );
47 } catch (InvalidSettingException ex) {
-48 String msg = String.format("Invalid settting for property '%s'" , key);
+48 String msg = String.format("Invalid setting for property '%s'" , key);
49 LOGGER.log(Level.WARNING, msg);
50 LOGGER.log(Level.FINE, "" , ex);
51 msg = String.format("%s has been disabled" , getName());
@@ -62,7 +62,7 @@
54 }
55
56
-57
+57
58
59
60
@@ -202,7 +202,7 @@
194 if (ext == null ) {
195 final String msg = String.format("The '%s' analyzer is misconfigured and does not have any file extensions;"
196 + " it will be disabled" , getName());
-197 Logger.getLogger(AbstractFileTypeAnalyzer.class .getName()).log(Level.SEVERE, msg);
+197 LOGGER.log(Level.SEVERE, msg);
198 return false;
199 } else {
200 final boolean match = ext.contains(extension);
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.html
index c8ecbbce0..8699e0d33 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.html
@@ -27,134 +27,157 @@
19
20 import java.io.File;
21 import java.io.IOException;
-22 import java.net.MalformedURLException;
-23 import java.net.URL;
-24 import java.util.List;
-25 import java.util.Set;
-26 import java.util.logging.Level;
-27 import java.util.logging.Logger;
-28 import java.util.regex.Pattern;
-29 import org.owasp.dependencycheck.suppression.SuppressionParseException;
-30 import org.owasp.dependencycheck.suppression.SuppressionParser;
-31 import org.owasp.dependencycheck.suppression.SuppressionRule;
-32 import org.owasp.dependencycheck.utils.DownloadFailedException;
-33 import org.owasp.dependencycheck.utils.Downloader;
-34 import org.owasp.dependencycheck.utils.FileUtils;
-35 import org.owasp.dependencycheck.utils.Settings;
-36
-37
-38
-39
-40
-41
-42 public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer {
-43
-44
+22 import java.io.InputStream;
+23 import java.net.MalformedURLException;
+24 import java.net.URL;
+25 import java.util.List;
+26 import java.util.Set;
+27 import java.util.logging.Level;
+28 import java.util.logging.Logger;
+29 import java.util.regex.Pattern;
+30 import org.owasp.dependencycheck.suppression.SuppressionParseException;
+31 import org.owasp.dependencycheck.suppression.SuppressionParser;
+32 import org.owasp.dependencycheck.suppression.SuppressionRule;
+33 import org.owasp.dependencycheck.utils.DownloadFailedException;
+34 import org.owasp.dependencycheck.utils.Downloader;
+35 import org.owasp.dependencycheck.utils.FileUtils;
+36 import org.owasp.dependencycheck.utils.Settings;
+37
+38
+39
+40
+41
+42
+43 public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer {
+44
45
-46
-47
-48
-49
-50 public Set<String> getSupportedExtensions() {
-51 return null ;
-52 }
-53
-54
-55
-56
-57
-58
-59
-60 @Override
-61 public void initialize() throws Exception {
-62 super .initialize();
-63 loadSuppressionData();
-64 }
-65
-66
-67
-68 private List<SuppressionRule> rules;
-69
-70
-71
-72
-73
+46
+47
+48 private static final Logger LOGGER = Logger.getLogger(AbstractSuppressionAnalyzer.class .getName());
+49
+50
+51
+52
+53
+54
+55
+56 public Set<String> getSupportedExtensions() {
+57 return null ;
+58 }
+59
+60
+61
+62
+63
+64
+65
+66 @Override
+67 public void initialize() throws Exception {
+68 super .initialize();
+69 loadSuppressionData();
+70 }
+71
+72
+73
74
-75 public List<SuppressionRule> getRules() {
-76 return rules;
-77 }
-78
-79
-80
-81
-82
-83
-84 public void setRules(List<SuppressionRule> rules) {
-85 this .rules = rules;
-86 }
-87
-88
-89
-90
-91
-92
-93 private void loadSuppressionData() throws SuppressionParseException {
-94 final String suppressionFilePath = Settings.getString(Settings.KEYS.SUPPRESSION_FILE);
-95 if (suppressionFilePath == null ) {
-96 return ;
-97 }
-98 File file = null ;
-99 boolean deleteTempFile = false;
-100 try {
-101 final Pattern uriRx = Pattern.compile("^(https?|file)\\:.*" , Pattern.CASE_INSENSITIVE);
-102 if (uriRx.matcher(suppressionFilePath).matches()) {
-103 deleteTempFile = true ;
-104 file = FileUtils.getTempFile("suppression" , "xml" );
-105 final URL url = new URL(suppressionFilePath);
-106 try {
-107 Downloader.fetchFile(url, file, false);
-108 } catch (DownloadFailedException ex) {
-109 Downloader.fetchFile(url, file, true );
-110 }
-111 } else {
-112 file = new File(suppressionFilePath);
-113 }
-114
-115 if (file != null ) {
-116 final SuppressionParser parser = new SuppressionParser ();
-117 try {
-118 rules = parser.parseSuppressionRules(file);
-119 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.FINE, rules.size() + " suppression rules were loaded." );
-120 } catch (SuppressionParseException ex) {
-121 final String msg = String.format("Unable to parse suppression xml file '%s'" , file.getPath());
-122 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.WARNING, msg);
-123 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.WARNING, ex.getMessage());
-124 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.FINE, "" , ex);
-125 throw ex;
-126 }
-127 }
-128 } catch (DownloadFailedException ex) {
-129 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.WARNING,
-130 "Unable to fetch the configured suppression file" );
-131 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.FINE, "" , ex);
-132 throw new SuppressionParseException ("Unable to fetch the configured suppression file" , ex);
-133 } catch (MalformedURLException ex) {
-134 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.WARNING,
-135 "Configured suppression file has an invalid URL" );
-136 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.FINE, "" , ex);
-137 throw new SuppressionParseException ("Configured suppression file has an invalid URL" , ex);
-138 } catch (IOException ex) {
-139 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.WARNING,
-140 "Unable to create temp file for suppressions" );
-141 Logger.getLogger(AbstractSuppressionAnalyzer.class .getName()).log(Level.FINE, "" , ex);
-142 throw new SuppressionParseException ("Unable to create temp file for suppressions" , ex);
-143 } finally {
-144 if (deleteTempFile && file != null ) {
-145 FileUtils.delete(file);
+75 private List<SuppressionRule> rules;
+76
+77
+78
+79
+80
+81
+82 public List<SuppressionRule> getRules() {
+83 return rules;
+84 }
+85
+86
+87
+88
+89
+90
+91 public void setRules(List<SuppressionRule> rules) {
+92 this .rules = rules;
+93 }
+94
+95
+96
+97
+98
+99
+100 private void loadSuppressionData() throws SuppressionParseException {
+101 final String suppressionFilePath = Settings.getString(Settings.KEYS.SUPPRESSION_FILE);
+102 if (suppressionFilePath == null ) {
+103 return ;
+104 }
+105 File file = null ;
+106 boolean deleteTempFile = false;
+107 try {
+108 final Pattern uriRx = Pattern.compile("^(https?|file)\\:.*" , Pattern.CASE_INSENSITIVE);
+109 if (uriRx.matcher(suppressionFilePath).matches()) {
+110 deleteTempFile = true ;
+111 file = FileUtils.getTempFile("suppression" , "xml" );
+112 final URL url = new URL(suppressionFilePath);
+113 try {
+114 Downloader.fetchFile(url, file, false);
+115 } catch (DownloadFailedException ex) {
+116 Downloader.fetchFile(url, file, true );
+117 }
+118 } else {
+119 file = new File(suppressionFilePath);
+120 if (!file.exists()) {
+121 final InputStream suppressionsFromClasspath = this .getClass().getClassLoader().getResourceAsStream(suppressionFilePath);
+122 if (suppressionsFromClasspath != null ) {
+123 deleteTempFile = true ;
+124 file = FileUtils.getTempFile("suppression" , "xml" );
+125 try {
+126 org.apache.commons.io.FileUtils.copyInputStreamToFile(suppressionsFromClasspath, file);
+127 } catch (IOException ex) {
+128 throwSuppressionParseException("Unable to locate suppressions file in classpath" , ex);
+129 }
+130 }
+131 }
+132 }
+133
+134 if (file != null ) {
+135 final SuppressionParser parser = new SuppressionParser ();
+136 try {
+137 rules = parser.parseSuppressionRules(file);
+138 LOGGER.log(Level.FINE, rules.size() + " suppression rules were loaded." );
+139 } catch (SuppressionParseException ex) {
+140 final String msg = String.format("Unable to parse suppression xml file '%s'" , file.getPath());
+141 LOGGER.log(Level.WARNING, msg);
+142 LOGGER.log(Level.WARNING, ex.getMessage());
+143 LOGGER.log(Level.FINE, "" , ex);
+144 throw ex;
+145 }
146 }
-147 }
-148 }
-149 }
+147 } catch (DownloadFailedException ex) {
+148 throwSuppressionParseException("Unable to fetch the configured suppression file" , ex);
+149 } catch (MalformedURLException ex) {
+150 throwSuppressionParseException("Configured suppression file has an invalid URL" , ex);
+151 } catch (IOException ex) {
+152 throwSuppressionParseException("Unable to create temp file for suppressions" , ex);
+153 } finally {
+154 if (deleteTempFile && file != null ) {
+155 FileUtils.delete(file);
+156 }
+157 }
+158 }
+159
+160
+161
+162
+163
+164
+165
+166
+167 private void throwSuppressionParseException(String message, Exception exception) throws SuppressionParseException {
+168 LOGGER.log(Level.WARNING, message);
+169 LOGGER.log(Level.FINE, "" , exception);
+170 throw new SuppressionParseException (message, exception);
+171 }
+172 }
21 import java.util.ServiceLoader;
22
23
-24
-25
-26
-27 public final class AnalyzerService {
-28
-29
-30
-31
-32 private static AnalyzerService service;
-33
-34
-35
-36 private final ServiceLoader<Analyzer> loader;
-37
-38
-39
+24
+25
+26
+27
+28
+29 public class AnalyzerService {
+30
+31
+32
+33
+34 private final ServiceLoader<Analyzer> loader;
+35
+36
+37
+38
+39
40
-41 private AnalyzerService () {
-42 loader = ServiceLoader.load(Analyzer.class );
+41 public AnalyzerService (ClassLoader classLoader) {
+42 loader = ServiceLoader.load(Analyzer.class , classLoader);
43 }
44
45
-46
+46
47
-48
+48
49
-50 public static synchronized AnalyzerService getInstance() {
-51 if (service == null ) {
-52 service = new AnalyzerService ();
-53 }
-54 return service;
-55 }
-56
-57
-58
-59
-60
-61
-62 public Iterator<Analyzer> getAnalyzers() {
-63 return loader.iterator();
-64 }
-65 }
+50 public Iterator<Analyzer> getAnalyzers() {
+51 return loader.iterator();
+52 }
+53 }
92
93
94
-95 private static final Set<String> ZIPPABLES = newHashSet("zip" , "ear" , "war" , "nupkg" );
+95 private static final Set<String> ZIPPABLES = newHashSet("zip" , "ear" , "war" , "jar" , "sar" , "apk" , "nupkg" );
96
97
98
@@ -165,270 +165,261 @@
157 @Override
158 public void initializeFileTypeAnalyzer() throws Exception {
159 final File baseDir = Settings.getTempDirectory();
-160 if (!baseDir.exists()) {
-161 if (!baseDir.mkdirs()) {
-162 final String msg = String.format("Unable to make a temporary folder '%s'" , baseDir.getPath());
-163 throw new AnalysisException (msg);
-164 }
-165 }
-166 tempFileLocation = File.createTempFile("check" , "tmp" , baseDir);
-167 if (!tempFileLocation.delete()) {
-168 final String msg = String.format("Unable to delete temporary file '%s'." , tempFileLocation.getAbsolutePath());
-169 throw new AnalysisException (msg);
-170 }
-171 if (!tempFileLocation.mkdirs()) {
-172 final String msg = String.format("Unable to create directory '%s'." , tempFileLocation.getAbsolutePath());
-173 throw new AnalysisException (msg);
-174 }
-175 }
-176
-177
-178
-179
-180
-181
-182 @Override
-183 public void close() throws Exception {
-184 if (tempFileLocation != null && tempFileLocation.exists()) {
-185 LOGGER.log(Level.FINE, "Attempting to delete temporary files" );
-186 final boolean success = FileUtils.delete(tempFileLocation);
-187 if (!success) {
-188 LOGGER.log(Level.WARNING, "Failed to delete some temporary files, see the log for more details" );
-189 }
-190 }
-191 }
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201 @Override
-202 public void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException {
-203 final File f = new File(dependency.getActualFilePath());
-204 final File tmpDir = getNextTempDirectory();
-205 extractFiles(f, tmpDir, engine);
-206
-207
-208 final List<Dependency> dependencies = new ArrayList<Dependency>(engine.getDependencies());
-209 engine.scan(tmpDir);
-210 final List<Dependency> newDependencies = engine.getDependencies();
-211 if (dependencies.size() != newDependencies.size()) {
-212
-213 final Set<Dependency> dependencySet = new HashSet<Dependency>();
-214 dependencySet.addAll(newDependencies);
-215 dependencySet.removeAll(dependencies);
-216
-217 for (Dependency d : dependencySet) {
-218
-219 final String displayPath = String.format("%s%s" ,
-220 dependency.getFilePath(),
-221 d.getActualFilePath().substring(tmpDir.getAbsolutePath().length()));
-222 final String displayName = String.format("%s%s%s" ,
-223 dependency.getFileName(),
-224 File.separator,
-225 d.getFileName());
-226 d.setFilePath(displayPath);
-227 d.setFileName(displayName);
-228
-229
-230
-231 if (this .supportsExtension(d.getFileExtension()) && scanDepth < MAX_SCAN_DEPTH) {
-232 scanDepth += 1;
-233 analyze(d, engine);
-234 scanDepth -= 1;
-235 }
-236 }
-237 }
-238 Collections.sort(engine.getDependencies());
-239 }
-240
-241
-242
-243
-244
-245
-246
-247 private File getNextTempDirectory() throws AnalysisException {
-248 dirCount += 1;
-249 final File directory = new File(tempFileLocation, String.valueOf(dirCount));
-250
-251 if (directory.exists()) {
-252 return getNextTempDirectory();
-253 }
-254 if (!directory.mkdirs()) {
-255 final String msg = String.format("Unable to create temp directory '%s'." , directory.getAbsolutePath());
-256 throw new AnalysisException (msg);
-257 }
-258 return directory;
-259 }
-260
-261
-262
-263
-264
-265
-266
-267
-268
-269 private void extractFiles(File archive, File destination, Engine engine) throws AnalysisException {
-270 if (archive == null || destination == null ) {
-271 return ;
-272 }
-273
-274 FileInputStream fis = null ;
-275 try {
-276 fis = new FileInputStream(archive);
-277 } catch (FileNotFoundException ex) {
-278 LOGGER.log(Level.FINE, null , ex);
-279 throw new AnalysisException ("Archive file was not found." , ex);
-280 }
-281 final String archiveExt = FileUtils.getFileExtension(archive.getName()).toLowerCase();
-282 try {
-283 if (ZIPPABLES.contains(archiveExt)) {
-284 extractArchive(new ZipArchiveInputStream(new BufferedInputStream(fis)), destination, engine);
-285 } else if ("tar" .equals(archiveExt)) {
-286 extractArchive(new TarArchiveInputStream(new BufferedInputStream(fis)), destination, engine);
-287 } else if ("gz" .equals(archiveExt) || "tgz" .equals(archiveExt)) {
-288 final String uncompressedName = GzipUtils.getUncompressedFilename(archive.getName());
-289 final String uncompressedExt = FileUtils.getFileExtension(uncompressedName).toLowerCase();
-290 if (engine.supportsExtension(uncompressedExt)) {
-291 decompressFile(new GzipCompressorInputStream(new BufferedInputStream(fis)), new File(destination, uncompressedName));
-292 }
-293 }
-294 } catch (ArchiveExtractionException ex) {
-295 final String msg = String.format("Exception extracting archive '%s'." , archive.getName());
-296 LOGGER.log(Level.WARNING, msg);
-297 LOGGER.log(Level.FINE, null , ex);
-298 } catch (IOException ex) {
-299 final String msg = String.format("Exception reading archive '%s'." , archive.getName());
-300 LOGGER.log(Level.WARNING, msg);
-301 LOGGER.log(Level.FINE, null , ex);
-302 } finally {
-303 try {
-304 fis.close();
-305 } catch (IOException ex) {
-306 LOGGER.log(Level.FINEST, null , ex);
-307 }
-308 }
-309 }
-310
-311
-312
-313
-314
-315
-316
-317
-318
-319 private void extractArchive(ArchiveInputStream input, File destination, Engine engine) throws ArchiveExtractionException {
-320 ArchiveEntry entry;
-321 try {
-322 while ((entry = input.getNextEntry()) != null ) {
-323 if (entry.isDirectory()) {
-324 final File d = new File(destination, entry.getName());
-325 if (!d.exists()) {
-326 if (!d.mkdirs()) {
-327 final String msg = String.format("Unable to create directory '%s'." , d.getAbsolutePath());
-328 throw new AnalysisException (msg);
-329 }
-330 }
-331 } else {
-332 final File file = new File(destination, entry.getName());
-333 final String ext = FileUtils.getFileExtension(file.getName());
-334 if (engine.supportsExtension(ext)) {
-335 BufferedOutputStream bos = null ;
-336 FileOutputStream fos;
-337 try {
-338 final File parent = file.getParentFile();
-339 if (!parent.isDirectory()) {
-340 if (!parent.mkdirs()) {
-341 final String msg = String.format("Unable to build directory '%s'." , parent.getAbsolutePath());
-342 throw new AnalysisException (msg);
-343 }
-344 }
-345 fos = new FileOutputStream(file);
-346 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
-347 int count;
-348 final byte data[] = new byte[BUFFER_SIZE];
-349 while ((count = input.read(data, 0, BUFFER_SIZE)) != -1) {
-350 bos.write(data, 0, count);
-351 }
-352 bos.flush();
-353 } catch (FileNotFoundException ex) {
-354 Logger.getLogger(ArchiveAnalyzer.class
-355 .getName()).log(Level.FINE, null , ex);
-356 final String msg = String.format("Unable to find file '%s'." , file.getName());
-357 throw new AnalysisException (msg, ex);
-358 } catch (IOException ex) {
-359 Logger.getLogger(ArchiveAnalyzer.class
-360 .getName()).log(Level.FINE, null , ex);
-361 final String msg = String.format("IO Exception while parsing file '%s'." , file.getName());
-362 throw new AnalysisException (msg, ex);
-363 } finally {
-364 if (bos != null ) {
-365 try {
-366 bos.close();
-367 } catch (IOException ex) {
-368 Logger.getLogger(ArchiveAnalyzer.class
-369 .getName()).log(Level.FINEST, null , ex);
-370 }
-371 }
-372 }
-373 }
-374 }
-375 }
-376 } catch (IOException ex) {
-377 throw new ArchiveExtractionException (ex);
-378 } catch (Throwable ex) {
-379 throw new ArchiveExtractionException (ex);
-380 } finally {
-381 if (input != null ) {
-382 try {
-383 input.close();
-384 } catch (IOException ex) {
-385 LOGGER.log(Level.FINEST, null , ex);
-386 }
-387 }
-388 }
-389 }
-390
-391
-392
-393
-394
-395
-396
-397
-398 private void decompressFile(CompressorInputStream inputStream, File outputFile) throws ArchiveExtractionException {
-399 FileOutputStream out = null ;
-400 try {
-401 out = new FileOutputStream(outputFile);
-402 final byte[] buffer = new byte[BUFFER_SIZE];
-403 int n = 0;
-404 while (-1 != (n = inputStream.read(buffer))) {
-405 out.write(buffer, 0, n);
-406 }
-407 } catch (FileNotFoundException ex) {
-408 LOGGER.log(Level.FINE, null , ex);
-409 throw new ArchiveExtractionException (ex);
-410 } catch (IOException ex) {
-411 LOGGER.log(Level.FINE, null , ex);
-412 throw new ArchiveExtractionException (ex);
-413 } finally {
-414 if (out != null ) {
-415 try {
-416 out.close();
-417 } catch (IOException ex) {
-418 LOGGER.log(Level.FINEST, null , ex);
-419 }
-420 }
-421 }
-422 }
-423 }
+160 tempFileLocation = File.createTempFile("check" , "tmp" , baseDir);
+161 if (!tempFileLocation.delete()) {
+162 final String msg = String.format("Unable to delete temporary file '%s'." , tempFileLocation.getAbsolutePath());
+163 throw new AnalysisException (msg);
+164 }
+165 if (!tempFileLocation.mkdirs()) {
+166 final String msg = String.format("Unable to create directory '%s'." , tempFileLocation.getAbsolutePath());
+167 throw new AnalysisException (msg);
+168 }
+169 }
+170
+171
+172
+173
+174
+175
+176 @Override
+177 public void close() throws Exception {
+178 if (tempFileLocation != null && tempFileLocation.exists()) {
+179 LOGGER.log(Level.FINE, "Attempting to delete temporary files" );
+180 final boolean success = FileUtils.delete(tempFileLocation);
+181 if (!success) {
+182 LOGGER.log(Level.WARNING, "Failed to delete some temporary files, see the log for more details" );
+183 }
+184 }
+185 }
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195 @Override
+196 public void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException {
+197 final File f = new File(dependency.getActualFilePath());
+198 final File tmpDir = getNextTempDirectory();
+199 extractFiles(f, tmpDir, engine);
+200
+201
+202 final List<Dependency> dependencies = new ArrayList<Dependency>(engine.getDependencies());
+203 engine.scan(tmpDir);
+204 final List<Dependency> newDependencies = engine.getDependencies();
+205 if (dependencies.size() != newDependencies.size()) {
+206
+207 final Set<Dependency> dependencySet = new HashSet<Dependency>();
+208 dependencySet.addAll(newDependencies);
+209 dependencySet.removeAll(dependencies);
+210
+211 for (Dependency d : dependencySet) {
+212
+213 final String displayPath = String.format("%s%s" ,
+214 dependency.getFilePath(),
+215 d.getActualFilePath().substring(tmpDir.getAbsolutePath().length()));
+216 final String displayName = String.format("%s%s%s" ,
+217 dependency.getFileName(),
+218 File.separator,
+219 d.getFileName());
+220 d.setFilePath(displayPath);
+221 d.setFileName(displayName);
+222
+223
+224
+225 if (this .supportsExtension(d.getFileExtension()) && scanDepth < MAX_SCAN_DEPTH) {
+226 scanDepth += 1;
+227 analyze(d, engine);
+228 scanDepth -= 1;
+229 }
+230 }
+231 }
+232 Collections.sort(engine.getDependencies());
+233 }
+234
+235
+236
+237
+238
+239
+240
+241 private File getNextTempDirectory() throws AnalysisException {
+242 dirCount += 1;
+243 final File directory = new File(tempFileLocation, String.valueOf(dirCount));
+244
+245 if (directory.exists()) {
+246 return getNextTempDirectory();
+247 }
+248 if (!directory.mkdirs()) {
+249 final String msg = String.format("Unable to create temp directory '%s'." , directory.getAbsolutePath());
+250 throw new AnalysisException (msg);
+251 }
+252 return directory;
+253 }
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263 private void extractFiles(File archive, File destination, Engine engine) throws AnalysisException {
+264 if (archive == null || destination == null ) {
+265 return ;
+266 }
+267
+268 FileInputStream fis = null ;
+269 try {
+270 fis = new FileInputStream(archive);
+271 } catch (FileNotFoundException ex) {
+272 LOGGER.log(Level.FINE, null , ex);
+273 throw new AnalysisException ("Archive file was not found." , ex);
+274 }
+275 final String archiveExt = FileUtils.getFileExtension(archive.getName()).toLowerCase();
+276 try {
+277 if (ZIPPABLES.contains(archiveExt)) {
+278 extractArchive(new ZipArchiveInputStream(new BufferedInputStream(fis)), destination, engine);
+279 } else if ("tar" .equals(archiveExt)) {
+280 extractArchive(new TarArchiveInputStream(new BufferedInputStream(fis)), destination, engine);
+281 } else if ("gz" .equals(archiveExt) || "tgz" .equals(archiveExt)) {
+282 final String uncompressedName = GzipUtils.getUncompressedFilename(archive.getName());
+283 final String uncompressedExt = FileUtils.getFileExtension(uncompressedName).toLowerCase();
+284 if (engine.supportsExtension(uncompressedExt)) {
+285 decompressFile(new GzipCompressorInputStream(new BufferedInputStream(fis)), new File(destination, uncompressedName));
+286 }
+287 }
+288 } catch (ArchiveExtractionException ex) {
+289 final String msg = String.format("Exception extracting archive '%s'." , archive.getName());
+290 LOGGER.log(Level.WARNING, msg);
+291 LOGGER.log(Level.FINE, null , ex);
+292 } catch (IOException ex) {
+293 final String msg = String.format("Exception reading archive '%s'." , archive.getName());
+294 LOGGER.log(Level.WARNING, msg);
+295 LOGGER.log(Level.FINE, null , ex);
+296 } finally {
+297 try {
+298 fis.close();
+299 } catch (IOException ex) {
+300 LOGGER.log(Level.FINEST, null , ex);
+301 }
+302 }
+303 }
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313 private void extractArchive(ArchiveInputStream input, File destination, Engine engine) throws ArchiveExtractionException {
+314 ArchiveEntry entry;
+315 try {
+316 while ((entry = input.getNextEntry()) != null ) {
+317 if (entry.isDirectory()) {
+318 final File d = new File(destination, entry.getName());
+319 if (!d.exists()) {
+320 if (!d.mkdirs()) {
+321 final String msg = String.format("Unable to create directory '%s'." , d.getAbsolutePath());
+322 throw new AnalysisException (msg);
+323 }
+324 }
+325 } else {
+326 final File file = new File(destination, entry.getName());
+327 final String ext = FileUtils.getFileExtension(file.getName());
+328 if (engine.supportsExtension(ext)) {
+329 BufferedOutputStream bos = null ;
+330 FileOutputStream fos;
+331 try {
+332 final File parent = file.getParentFile();
+333 if (!parent.isDirectory()) {
+334 if (!parent.mkdirs()) {
+335 final String msg = String.format("Unable to build directory '%s'." , parent.getAbsolutePath());
+336 throw new AnalysisException (msg);
+337 }
+338 }
+339 fos = new FileOutputStream(file);
+340 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
+341 int count;
+342 final byte data[] = new byte[BUFFER_SIZE];
+343 while ((count = input.read(data, 0, BUFFER_SIZE)) != -1) {
+344 bos.write(data, 0, count);
+345 }
+346 bos.flush();
+347 } catch (FileNotFoundException ex) {
+348 LOGGER.log(Level.FINE, null , ex);
+349 final String msg = String.format("Unable to find file '%s'." , file.getName());
+350 throw new AnalysisException (msg, ex);
+351 } catch (IOException ex) {
+352 LOGGER.log(Level.FINE, null , ex);
+353 final String msg = String.format("IO Exception while parsing file '%s'." , file.getName());
+354 throw new AnalysisException (msg, ex);
+355 } finally {
+356 if (bos != null ) {
+357 try {
+358 bos.close();
+359 } catch (IOException ex) {
+360 LOGGER.log(Level.FINEST, null , ex);
+361 }
+362 }
+363 }
+364 }
+365 }
+366 }
+367 } catch (IOException ex) {
+368 throw new ArchiveExtractionException (ex);
+369 } catch (Throwable ex) {
+370 throw new ArchiveExtractionException (ex);
+371 } finally {
+372 if (input != null ) {
+373 try {
+374 input.close();
+375 } catch (IOException ex) {
+376 LOGGER.log(Level.FINEST, null , ex);
+377 }
+378 }
+379 }
+380 }
+381
+382
+383
+384
+385
+386
+387
+388
+389 private void decompressFile(CompressorInputStream inputStream, File outputFile) throws ArchiveExtractionException {
+390 FileOutputStream out = null ;
+391 try {
+392 out = new FileOutputStream(outputFile);
+393 final byte[] buffer = new byte[BUFFER_SIZE];
+394 int n = 0;
+395 while (-1 != (n = inputStream.read(buffer))) {
+396 out.write(buffer, 0, n);
+397 }
+398 } catch (FileNotFoundException ex) {
+399 LOGGER.log(Level.FINE, null , ex);
+400 throw new ArchiveExtractionException (ex);
+401 } catch (IOException ex) {
+402 LOGGER.log(Level.FINE, null , ex);
+403 throw new ArchiveExtractionException (ex);
+404 } finally {
+405 if (out != null ) {
+406 try {
+407 out.close();
+408 } catch (IOException ex) {
+409 LOGGER.log(Level.FINEST, null , ex);
+410 }
+411 }
+412 }
+413 }
+414 }
61
62
63
-64 private static final Set<String> SUPORTED_EXTENSIONS = newHashSet("dll" , "exe" );
+64 private static final Set<String> SUPPORTED_EXTENSIONS = newHashSet("dll" , "exe" );
65
66
67
@@ -81,7 +81,7 @@
73
74
75
-76 private static final Logger LOG = Logger.getLogger(AssemblyAnalyzer.class .getName());
+76 private static final Logger LOGGER = Logger.getLogger(AssemblyAnalyzer.class .getName());
77
78
79
@@ -114,7 +114,7 @@
106 public void analyzeFileType(Dependency dependency, Engine engine)
107 throws AnalysisException {
108 if (grokAssemblyExe == null ) {
-109 LOG.warning("GrokAssembly didn't get deployed" );
+109 LOGGER.warning("GrokAssembly didn't get deployed" );
110 return ;
111 }
112
@@ -125,10 +125,10 @@
117 try {
118 final Process proc = pb.start();
119
-120 rdr = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
+120 rdr = new BufferedReader(new InputStreamReader(proc.getErrorStream(), "UTF-8" ));
121 String line = null ;
122 while (rdr.ready() && (line = rdr.readLine()) != null ) {
-123 LOG.log(Level.WARNING, "Error from GrokAssembly: {0}" , line);
+123 LOGGER.log(Level.WARNING, "Error from GrokAssembly: {0}" , line);
124 }
125 int rc = 0;
126 final Document doc = builder.parse(proc.getInputStream());
@@ -164,10 +164,10 @@
156 return ;
157 }
158 if (rc == 3) {
-159 LOG.log(Level.INFO, "{0} is not a valid assembly" , dependency.getActualFilePath());
+159 LOGGER.log(Level.INFO, "{0} is not a valid assembly" , dependency.getActualFilePath());
160 return ;
161 } else if (rc != 0) {
-162 LOG.log(Level.WARNING, "Return code {0} from GrokAssembly" , rc);
+162 LOGGER.log(Level.WARNING, "Return code {0} from GrokAssembly" , rc);
163 }
164
165 } catch (IOException ioe) {
@@ -182,7 +182,7 @@
174 try {
175 rdr.close();
176 } catch (IOException ex) {
-177 Logger.getLogger(AssemblyAnalyzer.class .getName()).log(Level.FINEST, "ignore" , ex);
+177 LOGGER.log(Level.FINEST, "ignore" , ex);
178 }
179 }
180 }
@@ -209,23 +209,23 @@
201 grokAssemblyExe = tempFile;
202
203 grokAssemblyExe.deleteOnExit();
-204 LOG.log(Level.FINE, "Extracted GrokAssembly.exe to {0}" , grokAssemblyExe.getPath());
+204 LOGGER.log(Level.FINE, "Extracted GrokAssembly.exe to {0}" , grokAssemblyExe.getPath());
205 } catch (IOException ioe) {
-206 LOG.log(Level.WARNING, "Could not extract GrokAssembly.exe: {0}" , ioe.getMessage());
+206 LOGGER.log(Level.WARNING, "Could not extract GrokAssembly.exe: {0}" , ioe.getMessage());
207 throw new AnalysisException ("Could not extract GrokAssembly.exe" , ioe);
208 } finally {
209 if (fos != null ) {
210 try {
211 fos.close();
212 } catch (Throwable e) {
-213 LOG.fine("Error closing output stream" );
+213 LOGGER.fine("Error closing output stream" );
214 }
215 }
216 if (is != null ) {
217 try {
218 is.close();
219 } catch (Throwable e) {
-220 LOG.fine("Error closing input stream" );
+220 LOGGER.fine("Error closing input stream" );
221 }
222 }
223 }
@@ -237,90 +237,93 @@
229 final ProcessBuilder pb = new ProcessBuilder(args);
230 final Process p = pb.start();
231
-232 rdr = new BufferedReader(new InputStreamReader(p.getErrorStream()));
-233 String line;
-234 while (rdr.ready() && (line = rdr.readLine()) != null ) {
-235
-236 }
-237 final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(p.getInputStream());
-238 final XPath xpath = XPathFactory.newInstance().newXPath();
-239 final String error = xpath.evaluate("/assembly/error" , doc);
-240 if (p.waitFor() != 1 || error == null || "" .equals(error)) {
-241 LOG.warning("An error occured with the .NET AssemblyAnalyzer, please see the log for more details." );
-242 LOG.fine("GrokAssembly.exe is not working properly" );
-243 grokAssemblyExe = null ;
-244 throw new AnalysisException ("Could not execute .NET AssemblyAnalyzer" );
-245 }
-246 } catch (Throwable e) {
-247 LOG.warning("An error occured with the .NET AssemblyAnalyzer; "
-248 + "this can be ignored unless you are scanning .NET dlls. Please see the log for more details." );
-249 LOG.log(Level.FINE, "Could not execute GrokAssembly {0}" , e.getMessage());
-250 throw new AnalysisException ("An error occured with the .NET AssemblyAnalyzer" , e);
-251 } finally {
-252 if (rdr != null ) {
-253 try {
-254 rdr.close();
-255 } catch (IOException ex) {
-256 Logger.getLogger(AssemblyAnalyzer.class .getName()).log(Level.FINEST, "ignore" , ex);
-257 }
-258 }
-259 }
-260
-261 builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-262 }
+232 rdr = new BufferedReader(new InputStreamReader(p.getErrorStream(), "UTF-8" ));
+233 while (rdr.ready() && rdr.readLine() != null ) {
+234
+235 }
+236 final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(p.getInputStream());
+237 final XPath xpath = XPathFactory.newInstance().newXPath();
+238 final String error = xpath.evaluate("/assembly/error" , doc);
+239 if (p.waitFor() != 1 || error == null || "" .equals(error)) {
+240 LOGGER.warning("An error occurred with the .NET AssemblyAnalyzer, please see the log for more details." );
+241 LOGGER.fine("GrokAssembly.exe is not working properly" );
+242 grokAssemblyExe = null ;
+243 throw new AnalysisException ("Could not execute .NET AssemblyAnalyzer" );
+244 }
+245 } catch (Throwable e) {
+246 if (e instanceof AnalysisException) {
+247 throw (AnalysisException) e;
+248 } else {
+249 LOGGER.warning("An error occured with the .NET AssemblyAnalyzer; "
+250 + "this can be ignored unless you are scanning .NET DLLs. Please see the log for more details." );
+251 LOGGER.log(Level.FINE, "Could not execute GrokAssembly {0}" , e.getMessage());
+252 throw new AnalysisException ("An error occured with the .NET AssemblyAnalyzer" , e);
+253 }
+254 } finally {
+255 if (rdr != null ) {
+256 try {
+257 rdr.close();
+258 } catch (IOException ex) {
+259 LOGGER.log(Level.FINEST, "ignore" , ex);
+260 }
+261 }
+262 }
263
-264 @Override
-265 public void close() throws Exception {
-266 super .close();
-267 try {
-268 if (grokAssemblyExe != null && !grokAssemblyExe.delete()) {
-269 grokAssemblyExe.deleteOnExit();
-270 }
-271 } catch (SecurityException se) {
-272 LOG.fine("Can't delete temporary GrokAssembly.exe" );
-273 }
-274 }
-275
-276
-277
-278
-279
-280
-281 @Override
-282 public Set<String> getSupportedExtensions() {
-283 return SUPORTED_EXTENSIONS;
-284 }
-285
-286
-287
-288
-289
-290
-291 @Override
-292 public String getName() {
-293 return ANALYZER_NAME;
-294 }
-295
-296
-297
-298
-299
-300
-301 @Override
-302 public AnalysisPhase getAnalysisPhase() {
-303 return ANALYSIS_PHASE;
-304 }
-305
-306
-307
-308
-309
-310
-311 @Override
-312 protected String getAnalyzerEnabledSettingKey() {
-313 return Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED;
-314 }
-315 }
+264 builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+265 }
+266
+267 @Override
+268 public void close() throws Exception {
+269 super .close();
+270 try {
+271 if (grokAssemblyExe != null && !grokAssemblyExe.delete()) {
+272 grokAssemblyExe.deleteOnExit();
+273 }
+274 } catch (SecurityException se) {
+275 LOGGER.fine("Can't delete temporary GrokAssembly.exe" );
+276 }
+277 }
+278
+279
+280
+281
+282
+283
+284 @Override
+285 public Set<String> getSupportedExtensions() {
+286 return SUPPORTED_EXTENSIONS;
+287 }
+288
+289
+290
+291
+292
+293
+294 @Override
+295 public String getName() {
+296 return ANALYZER_NAME;
+297 }
+298
+299
+300
+301
+302
+303
+304 @Override
+305 public AnalysisPhase getAnalysisPhase() {
+306 return ANALYSIS_PHASE;
+307 }
+308
+309
+310
+311
+312
+313
+314 @Override
+315 protected String getAnalyzerEnabledSettingKey() {
+316 return Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED;
+317 }
+318 }
57
58
59 public class CPEAnalyzer implements Analyzer {
-60
-61
-62
-63
-64 static final int MAX_QUERY_RESULTS = 25;
-65
-66
-67
-68 static final String WEIGHTING_BOOST = "^5" ;
-69
-70
-71
-72 static final String CLEANSE_CHARACTER_RX = "[^A-Za-z0-9 ._-]" ;
-73
-74
-75
-76 static final String CLEANSE_NONALPHA_RX = "[^A-Za-z]*" ;
-77
-78
-79
-80 static final int STRING_BUILDER_BUFFER = 20;
-81
-82
-83
-84 private CpeMemoryIndex cpe;
-85
-86
-87
-88 private CveDB cve;
-89
-90
-91
-92
-93
-94
-95 @Override
-96 public String getName() {
-97 return "CPE Analyzer" ;
-98 }
-99
-100
-101
-102
-103
-104
-105 @Override
-106 public AnalysisPhase getAnalysisPhase() {
-107 return AnalysisPhase.IDENTIFIER_ANALYSIS;
-108 }
-109
-110
-111
-112
-113
-114
-115 @Override
-116 public void initialize() throws Exception {
-117 this .open();
-118 }
-119
-120
-121
-122
-123
-124
-125
-126
-127 public void open() throws IOException, DatabaseException {
-128 Logger.getLogger(CPEAnalyzer.class .getName()).log(Level.FINE, "Opening the CVE Database" );
-129 cve = new CveDB ();
-130 cve.open();
-131 Logger.getLogger(CPEAnalyzer.class .getName()).log(Level.FINE, "Creating the Lucene CPE Index" );
-132 cpe = CpeMemoryIndex.getInstance();
-133 try {
-134 cpe.open(cve);
-135 } catch (IndexException ex) {
-136 Logger.getLogger(CPEAnalyzer.class .getName()).log(Level.FINE, "IndexException" , ex);
-137 throw new DatabaseException (ex);
-138 }
-139 }
-140
-141
-142
-143
-144 @Override
-145 public void close() {
-146 if (cpe != null ) {
-147 cpe.close();
-148 }
-149 if (cve != null ) {
-150 cve.close();
+60
+61
+62
+63 private static final Logger LOGGER = Logger.getLogger(CPEAnalyzer.class .getName());
+64
+65
+66
+67 static final int MAX_QUERY_RESULTS = 25;
+68
+69
+70
+71 static final String WEIGHTING_BOOST = "^5" ;
+72
+73
+74
+75 static final String CLEANSE_CHARACTER_RX = "[^A-Za-z0-9 ._-]" ;
+76
+77
+78
+79 static final String CLEANSE_NONALPHA_RX = "[^A-Za-z]*" ;
+80
+81
+82
+83 static final int STRING_BUILDER_BUFFER = 20;
+84
+85
+86
+87 private CpeMemoryIndex cpe;
+88
+89
+90
+91 private CveDB cve;
+92
+93
+94
+95
+96
+97
+98 @Override
+99 public String getName() {
+100 return "CPE Analyzer" ;
+101 }
+102
+103
+104
+105
+106
+107
+108 @Override
+109 public AnalysisPhase getAnalysisPhase() {
+110 return AnalysisPhase.IDENTIFIER_ANALYSIS;
+111 }
+112
+113
+114
+115
+116
+117
+118 @Override
+119 public void initialize() throws Exception {
+120 this .open();
+121 }
+122
+123
+124
+125
+126
+127
+128
+129
+130 public void open() throws IOException, DatabaseException {
+131 LOGGER.log(Level.FINE, "Opening the CVE Database" );
+132 cve = new CveDB ();
+133 cve.open();
+134 LOGGER.log(Level.FINE, "Creating the Lucene CPE Index" );
+135 cpe = CpeMemoryIndex.getInstance();
+136 try {
+137 cpe.open(cve);
+138 } catch (IndexException ex) {
+139 LOGGER.log(Level.FINE, "IndexException" , ex);
+140 throw new DatabaseException (ex);
+141 }
+142 }
+143
+144
+145
+146
+147 @Override
+148 public void close() {
+149 if (cpe != null ) {
+150 cpe.close();
151 }
-152 }
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163 protected void determineCPE(Dependency dependency) throws CorruptIndexException, IOException, ParseException {
-164 Confidence confidence = Confidence.HIGHEST;
-165
-166 String vendors = addEvidenceWithoutDuplicateTerms("" , dependency.getVendorEvidence(), confidence);
-167 String products = addEvidenceWithoutDuplicateTerms("" , dependency.getProductEvidence(), confidence);
-168
-169
-170 addEvidenceWithoutDuplicateTerms("" , dependency.getVersionEvidence(), confidence);
-171
-172 int ctr = 0;
-173 do {
-174 if (!vendors.isEmpty() && !products.isEmpty()) {
-175 final List<IndexEntry> entries = searchCPE(vendors, products, dependency.getProductEvidence().getWeighting(),
-176 dependency.getVendorEvidence().getWeighting());
-177
-178 for (IndexEntry e : entries) {
-179 if (verifyEntry(e, dependency)) {
-180 final String vendor = e.getVendor();
-181 final String product = e.getProduct();
-182 determineIdentifiers(dependency, vendor, product);
-183 }
-184 }
-185 }
-186 confidence = reduceConfidence(confidence);
-187 if (dependency.getVendorEvidence().contains(confidence)) {
-188 vendors = addEvidenceWithoutDuplicateTerms(vendors, dependency.getVendorEvidence(), confidence);
-189 }
-190 if (dependency.getProductEvidence().contains(confidence)) {
-191 products = addEvidenceWithoutDuplicateTerms(products, dependency.getProductEvidence(), confidence);
+152 if (cve != null ) {
+153 cve.close();
+154 }
+155 }
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166 protected void determineCPE(Dependency dependency) throws CorruptIndexException, IOException, ParseException {
+167 Confidence confidence = Confidence.HIGHEST;
+168
+169 String vendors = addEvidenceWithoutDuplicateTerms("" , dependency.getVendorEvidence(), confidence);
+170 String products = addEvidenceWithoutDuplicateTerms("" , dependency.getProductEvidence(), confidence);
+171
+172
+173 addEvidenceWithoutDuplicateTerms("" , dependency.getVersionEvidence(), confidence);
+174
+175 int ctr = 0;
+176 do {
+177 if (!vendors.isEmpty() && !products.isEmpty()) {
+178 final List<IndexEntry> entries = searchCPE(vendors, products, dependency.getProductEvidence().getWeighting(),
+179 dependency.getVendorEvidence().getWeighting());
+180
+181 for (IndexEntry e : entries) {
+182 if (verifyEntry(e, dependency)) {
+183 final String vendor = e.getVendor();
+184 final String product = e.getProduct();
+185 determineIdentifiers(dependency, vendor, product);
+186 }
+187 }
+188 }
+189 confidence = reduceConfidence(confidence);
+190 if (dependency.getVendorEvidence().contains(confidence)) {
+191 vendors = addEvidenceWithoutDuplicateTerms(vendors, dependency.getVendorEvidence(), confidence);
192 }
-193
-194
-195 if (dependency.getVersionEvidence().contains(confidence)) {
-196 addEvidenceWithoutDuplicateTerms("" , dependency.getVersionEvidence(), confidence);
-197 }
-198 } while ((++ctr) < 4);
-199 }
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211 private String addEvidenceWithoutDuplicateTerms(final String text, final EvidenceCollection ec, Confidence confidenceFilter) {
-212 final String txt = (text == null ) ? "" : text;
-213 final StringBuilder sb = new StringBuilder(txt.length() + (20 * ec.size()));
-214 sb.append(' ').append(txt).append(' ');
-215 for (Evidence e : ec.iterator(confidenceFilter)) {
-216 String value = e.getValue();
-217
-218
-219
-220 if (value.startsWith("http://" )) {
-221 value = value.substring(7).replaceAll("\\." , " " );
-222 }
-223 if (value.startsWith("https://" )) {
-224 value = value.substring(8).replaceAll("\\." , " " );
+193 if (dependency.getProductEvidence().contains(confidence)) {
+194 products = addEvidenceWithoutDuplicateTerms(products, dependency.getProductEvidence(), confidence);
+195 }
+196
+197
+198 if (dependency.getVersionEvidence().contains(confidence)) {
+199 addEvidenceWithoutDuplicateTerms("" , dependency.getVersionEvidence(), confidence);
+200 }
+201 } while ((++ctr) < 4);
+202 }
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214 private String addEvidenceWithoutDuplicateTerms(final String text, final EvidenceCollection ec, Confidence confidenceFilter) {
+215 final String txt = (text == null ) ? "" : text;
+216 final StringBuilder sb = new StringBuilder(txt.length() + (20 * ec.size()));
+217 sb.append(' ').append(txt).append(' ');
+218 for (Evidence e : ec.iterator(confidenceFilter)) {
+219 String value = e.getValue();
+220
+221
+222
+223 if (value.startsWith("http://" )) {
+224 value = value.substring(7).replaceAll("\\." , " " );
225 }
-226 if (sb.indexOf(" " + value + " " ) < 0) {
-227 sb.append(value).append(' ');
+226 if (value.startsWith("https://" )) {
+227 value = value.substring(8).replaceAll("\\." , " " );
228 }
-229 }
-230 return sb.toString().trim();
-231 }
-232
-233
-234
-235
-236
-237
-238
-239 private Confidence reduceConfidence(final Confidence c) {
-240 if (c == Confidence.HIGHEST) {
-241 return Confidence.HIGH;
-242 } else if (c == Confidence.HIGH) {
-243 return Confidence.MEDIUM;
-244 } else {
-245 return Confidence.LOW;
-246 }
-247 }
-248
-249
-250
-251
-252
-253
-254
-255
-256
-257
-258
-259
-260
-261
-262
-263
-264
-265
-266
-267 protected List<IndexEntry> searchCPE(String vendor, String product,
-268 Set<String> vendorWeightings, Set<String> productWeightings)
-269 throws CorruptIndexException, IOException, ParseException {
-270 final ArrayList<IndexEntry> ret = new ArrayList<IndexEntry>(MAX_QUERY_RESULTS);
-271
-272 final String searchString = buildSearch(vendor, product, vendorWeightings, productWeightings);
-273 if (searchString == null ) {
-274 return ret;
-275 }
-276
-277 final TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);
-278 for (ScoreDoc d : docs.scoreDocs) {
-279 if (d.score >= 0.08) {
-280 final Document doc = cpe.getDocument(d.doc);
-281 final IndexEntry entry = new IndexEntry ();
-282 entry.setVendor(doc.get(Fields.VENDOR));
-283 entry.setProduct(doc.get(Fields.PRODUCT));
-284
-285
-286
-287
-288
-289
-290
-291 entry.setSearchScore(d.score);
-292 if (!ret.contains(entry)) {
-293 ret.add(entry);
-294 }
-295 }
-296 }
-297 return ret;
-298 }
-299
-300
-301
-302
-303
+229 if (sb.indexOf(" " + value + " " ) < 0) {
+230 sb.append(value).append(' ');
+231 }
+232 }
+233 return sb.toString().trim();
+234 }
+235
+236
+237
+238
+239
+240
+241
+242 private Confidence reduceConfidence(final Confidence c) {
+243 if (c == Confidence.HIGHEST) {
+244 return Confidence.HIGH;
+245 } else if (c == Confidence.HIGH) {
+246 return Confidence.MEDIUM;
+247 } else {
+248 return Confidence.LOW;
+249 }
+250 }
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270 protected List<IndexEntry> searchCPE(String vendor, String product,
+271 Set<String> vendorWeightings, Set<String> productWeightings)
+272 throws CorruptIndexException, IOException, ParseException {
+273 final ArrayList<IndexEntry> ret = new ArrayList<IndexEntry>(MAX_QUERY_RESULTS);
+274
+275 final String searchString = buildSearch(vendor, product, vendorWeightings, productWeightings);
+276 if (searchString == null ) {
+277 return ret;
+278 }
+279
+280 final TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);
+281 for (ScoreDoc d : docs.scoreDocs) {
+282 if (d.score >= 0.08) {
+283 final Document doc = cpe.getDocument(d.doc);
+284 final IndexEntry entry = new IndexEntry ();
+285 entry.setVendor(doc.get(Fields.VENDOR));
+286 entry.setProduct(doc.get(Fields.PRODUCT));
+287
+288
+289
+290
+291
+292
+293
+294 entry.setSearchScore(d.score);
+295 if (!ret.contains(entry)) {
+296 ret.add(entry);
+297 }
+298 }
+299 }
+300 return ret;
+301 }
+302
+303
304
-305
-306
-307
-308
-309
-310
-311
-312
-313
-314 protected String buildSearch(String vendor, String product,
-315 Set<String> vendorWeighting, Set<String> productWeightings) {
-316 final String v = vendor;
-317 final String p = product;
-318 final StringBuilder sb = new StringBuilder(v.length() + p.length()
-319 + Fields.PRODUCT.length() + Fields.VENDOR.length() + STRING_BUILDER_BUFFER);
-320
-321 if (!appendWeightedSearch(sb, Fields.PRODUCT, p, productWeightings)) {
-322 return null ;
-323 }
-324 sb.append(" AND " );
-325 if (!appendWeightedSearch(sb, Fields.VENDOR, v, vendorWeighting)) {
-326 return null ;
-327 }
-328 return sb.toString();
-329 }
-330
-331
-332
-333
-334
-335
-336
-337
-338
-339
-340
-341
-342 private boolean appendWeightedSearch(StringBuilder sb, String field, String searchText, Set<String> weightedText) {
-343 sb.append(" " ).append(field).append(":( " );
-344
-345 final String cleanText = cleanseText(searchText);
-346
-347 if ("" .equals(cleanText)) {
-348 return false;
-349 }
-350
-351 if (weightedText == null || weightedText.isEmpty()) {
-352 LuceneUtils.appendEscapedLuceneQuery(sb, cleanText);
-353 } else {
-354 final StringTokenizer tokens = new StringTokenizer(cleanText);
-355 while (tokens.hasMoreElements()) {
-356 final String word = tokens.nextToken();
-357 String temp = null ;
-358 for (String weighted : weightedText) {
-359 final String weightedStr = cleanseText(weighted);
-360 if (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {
-361 temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;
-362 if (!word.equalsIgnoreCase(weightedStr)) {
-363 temp += " " + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;
-364 }
-365 }
-366 }
-367 if (temp == null ) {
-368 temp = LuceneUtils.escapeLuceneQuery(word);
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317 protected String buildSearch(String vendor, String product,
+318 Set<String> vendorWeighting, Set<String> productWeightings) {
+319 final String v = vendor;
+320 final String p = product;
+321 final StringBuilder sb = new StringBuilder(v.length() + p.length()
+322 + Fields.PRODUCT.length() + Fields.VENDOR.length() + STRING_BUILDER_BUFFER);
+323
+324 if (!appendWeightedSearch(sb, Fields.PRODUCT, p, productWeightings)) {
+325 return null ;
+326 }
+327 sb.append(" AND " );
+328 if (!appendWeightedSearch(sb, Fields.VENDOR, v, vendorWeighting)) {
+329 return null ;
+330 }
+331 return sb.toString();
+332 }
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345 private boolean appendWeightedSearch(StringBuilder sb, String field, String searchText, Set<String> weightedText) {
+346 sb.append(" " ).append(field).append(":( " );
+347
+348 final String cleanText = cleanseText(searchText);
+349
+350 if ("" .equals(cleanText)) {
+351 return false;
+352 }
+353
+354 if (weightedText == null || weightedText.isEmpty()) {
+355 LuceneUtils.appendEscapedLuceneQuery(sb, cleanText);
+356 } else {
+357 final StringTokenizer tokens = new StringTokenizer(cleanText);
+358 while (tokens.hasMoreElements()) {
+359 final String word = tokens.nextToken();
+360 String temp = null ;
+361 for (String weighted : weightedText) {
+362 final String weightedStr = cleanseText(weighted);
+363 if (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {
+364 temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;
+365 if (!word.equalsIgnoreCase(weightedStr)) {
+366 temp += " " + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;
+367 }
+368 }
369 }
-370 sb.append(" " ).append(temp);
-371 }
-372 }
-373 sb.append(" ) " );
-374 return true ;
-375 }
-376
-377
-378
-379
-380
-381
-382
-383 private String cleanseText(String text) {
-384 return text.replaceAll(CLEANSE_CHARACTER_RX, " " );
-385 }
-386
-387
-388
-389
-390
-391
-392
-393
-394 private boolean equalsIgnoreCaseAndNonAlpha(String l, String r) {
-395 if (l == null || r == null ) {
-396 return false;
-397 }
-398
-399 final String left = l.replaceAll(CLEANSE_NONALPHA_RX, "" );
-400 final String right = r.replaceAll(CLEANSE_NONALPHA_RX, "" );
-401 return left.equalsIgnoreCase(right);
-402 }
-403
-404
-405
-406
-407
-408
-409
-410
-411
-412 private boolean verifyEntry(final IndexEntry entry, final Dependency dependency) {
-413 boolean isValid = false;
-414
-415 if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
-416 && collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {
-417
-418 isValid = true ;
-419 }
-420 return isValid;
-421 }
-422
-423
-424
-425
-426
-427
-428
-429
-430 private boolean collectionContainsString(EvidenceCollection ec, String text) {
-431
-432
-433
-434
-435
-436
-437
-438
-439
-440
-441
-442
-443 if (text == null ) {
-444 return false;
-445 }
-446 final String[] words = text.split("[\\s_-]" );
-447 final List<String> list = new ArrayList<String>();
-448 String tempWord = null ;
-449 for (String word : words) {
-450
-451
-452
-453
-454 if (tempWord != null ) {
-455 list.add(tempWord + word);
-456 tempWord = null ;
-457 } else if (word.length() <= 2) {
-458 tempWord = word;
-459 } else {
-460 list.add(word);
-461 }
-462 }
-463 if (tempWord != null && !list.isEmpty()) {
-464 final String tmp = list.get(list.size() - 1) + tempWord;
-465 list.add(tmp);
-466 }
-467 boolean contains = true ;
-468 for (String word : list) {
-469 contains &= ec.containsUsedString(word);
-470 }
-471 return contains;
-472 }
-473
-474
-475
-476
-477
-478
-479
-480
-481 @Override
-482 public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
-483 try {
-484 determineCPE(dependency);
-485 } catch (CorruptIndexException ex) {
-486 throw new AnalysisException ("CPE Index is corrupt." , ex);
-487 } catch (IOException ex) {
-488 throw new AnalysisException ("Failure opening the CPE Index." , ex);
-489 } catch (ParseException ex) {
-490 throw new AnalysisException ("Unable to parse the generated Lucene query for this dependency." , ex);
-491 }
-492 }
-493
-494
-495
-496
-497
-498
-499
-500
-501
-502
-503
-504 private void determineIdentifiers(Dependency dependency, String vendor, String product) throws UnsupportedEncodingException {
-505 final Set<VulnerableSoftware> cpes = cve.getCPEs(vendor, product);
-506 DependencyVersion bestGuess = new DependencyVersion ("-" );
-507 Confidence bestGuessConf = null ;
-508 final List<IdentifierMatch> collected = new ArrayList<IdentifierMatch>();
-509 for (Confidence conf : Confidence.values()) {
-510 for (Evidence evidence : dependency.getVersionEvidence().iterator(conf)) {
-511 final DependencyVersion evVer = DependencyVersionUtil.parseVersion(evidence.getValue());
-512 if (evVer == null ) {
-513 continue ;
-514 }
-515 for (VulnerableSoftware vs : cpes) {
-516 DependencyVersion dbVer;
-517 if (vs.getRevision() != null && !vs.getRevision().isEmpty()) {
-518 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + "." + vs.getRevision());
-519 } else {
-520 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion());
-521 }
-522 if (dbVer == null
-523 || evVer.equals(dbVer)) {
-524 final String url = String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(vs.getName(), "UTF-8" ));
-525 final IdentifierMatch match = new IdentifierMatch ("cpe" , vs.getName(), url, IdentifierConfidence.EXACT_MATCH, conf);
-526 collected.add(match);
-527 } else {
-528
-529 if (evVer.getVersionParts().size() <= dbVer.getVersionParts().size()
-530 && evVer.matchesAtLeastThreeLevels(dbVer)) {
-531 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
-532 if (bestGuess.getVersionParts().size() < dbVer.getVersionParts().size()) {
-533 bestGuess = dbVer;
-534 bestGuessConf = conf;
-535 }
-536 }
-537 }
-538 }
-539 }
-540 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
-541 if (bestGuess.getVersionParts().size() < evVer.getVersionParts().size()) {
-542 bestGuess = evVer;
-543 bestGuessConf = conf;
-544 }
-545 }
-546 }
-547 }
-548 final String cpeName = String.format("cpe:/a:%s:%s:%s" , vendor, product, bestGuess.toString());
-549 final String url = null ;
-550 if (bestGuessConf == null ) {
-551 bestGuessConf = Confidence.LOW;
-552 }
-553 final IdentifierMatch match = new IdentifierMatch ("cpe" , cpeName, url, IdentifierConfidence.BEST_GUESS, bestGuessConf);
-554 collected.add(match);
-555
-556 Collections.sort(collected);
-557 final IdentifierConfidence bestIdentifierQuality = collected.get(0).getConfidence();
-558 final Confidence bestEvidenceQuality = collected.get(0).getEvidenceConfidence();
-559 for (IdentifierMatch m : collected) {
-560 if (bestIdentifierQuality.equals(m.getConfidence())
-561 && bestEvidenceQuality.equals(m.getEvidenceConfidence())) {
-562 final Identifier i = m.getIdentifier();
-563 if (bestIdentifierQuality == IdentifierConfidence.BEST_GUESS) {
-564 i.setConfidence(Confidence.LOW);
-565 } else {
-566 i.setConfidence(bestEvidenceQuality);
-567 }
-568 dependency.addIdentifier(i);
-569 }
-570 }
-571 }
-572
-573
-574
-575
-576 private enum IdentifierConfidence {
-577
-578
-579
-580
-581 EXACT_MATCH,
-582
-583
-584
-585 BEST_GUESS
-586 }
-587
-588
-589
-590
-591 private static class IdentifierMatch implements Comparable<IdentifierMatch> {
-592
-593
-594
-595
-596
-597
-598
-599
-600
-601
-602 IdentifierMatch (String type, String value, String url, IdentifierConfidence identifierConfidence, Confidence evidenceConfidence) {
-603 this .identifier = new Identifier (type, value, url);
-604 this .confidence = identifierConfidence;
-605 this .evidenceConfidence = evidenceConfidence;
-606 }
-607
-608
-609
-610
-611 private Confidence evidenceConfidence;
-612
-613
-614
-615
-616
-617
-618 public Confidence getEvidenceConfidence() {
-619 return evidenceConfidence;
-620 }
-621
-622
-623
-624
-625
-626
-627 public void setEvidenceConfidence(Confidence evidenceConfidence) {
-628 this .evidenceConfidence = evidenceConfidence;
-629 }
-630
-631
-632
-633 private IdentifierConfidence confidence;
-634
-635
-636
-637
-638
-639
-640 public IdentifierConfidence getConfidence() {
-641 return confidence;
-642 }
-643
-644
-645
-646
-647
-648
-649 public void setConfidence(IdentifierConfidence confidence) {
-650 this .confidence = confidence;
-651 }
-652
-653
-654
-655 private Identifier identifier;
-656
-657
-658
-659
-660
-661
-662 public Identifier getIdentifier() {
-663 return identifier;
-664 }
-665
-666
-667
-668
-669
-670
-671 public void setIdentifier(Identifier identifier) {
-672 this .identifier = identifier;
-673 }
-674
-675
-676
-677
-678
-679
-680
-681
-682 @Override
-683 public String toString() {
-684 return "IdentifierMatch{" + "evidenceConfidence=" + evidenceConfidence
-685 + ", confidence=" + confidence + ", identifier=" + identifier + '}';
-686 }
-687
-688
-689
-690
-691
-692
-693 @Override
-694 public int hashCode() {
-695 int hash = 5;
-696 hash = 97 * hash + (this .evidenceConfidence != null ? this .evidenceConfidence.hashCode() : 0);
-697 hash = 97 * hash + (this .confidence != null ? this .confidence.hashCode() : 0);
-698 hash = 97 * hash + (this .identifier != null ? this .identifier.hashCode() : 0);
-699 return hash;
-700 }
-701
-702
-703
-704
-705
-706
-707
-708 @Override
-709 public boolean equals(Object obj) {
-710 if (obj == null ) {
-711 return false;
-712 }
-713 if (getClass() != obj.getClass()) {
+370 if (temp == null ) {
+371 temp = LuceneUtils.escapeLuceneQuery(word);
+372 }
+373 sb.append(" " ).append(temp);
+374 }
+375 }
+376 sb.append(" ) " );
+377 return true ;
+378 }
+379
+380
+381
+382
+383
+384
+385
+386 private String cleanseText(String text) {
+387 return text.replaceAll(CLEANSE_CHARACTER_RX, " " );
+388 }
+389
+390
+391
+392
+393
+394
+395
+396
+397 private boolean equalsIgnoreCaseAndNonAlpha(String l, String r) {
+398 if (l == null || r == null ) {
+399 return false;
+400 }
+401
+402 final String left = l.replaceAll(CLEANSE_NONALPHA_RX, "" );
+403 final String right = r.replaceAll(CLEANSE_NONALPHA_RX, "" );
+404 return left.equalsIgnoreCase(right);
+405 }
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415 private boolean verifyEntry(final IndexEntry entry, final Dependency dependency) {
+416 boolean isValid = false;
+417
+418 if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
+419 && collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {
+420
+421 isValid = true ;
+422 }
+423 return isValid;
+424 }
+425
+426
+427
+428
+429
+430
+431
+432
+433 private boolean collectionContainsString(EvidenceCollection ec, String text) {
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446 if (text == null ) {
+447 return false;
+448 }
+449 final String[] words = text.split("[\\s_-]" );
+450 final List<String> list = new ArrayList<String>();
+451 String tempWord = null ;
+452 for (String word : words) {
+453
+454
+455
+456
+457 if (tempWord != null ) {
+458 list.add(tempWord + word);
+459 tempWord = null ;
+460 } else if (word.length() <= 2) {
+461 tempWord = word;
+462 } else {
+463 list.add(word);
+464 }
+465 }
+466 if (tempWord != null && !list.isEmpty()) {
+467 final String tmp = list.get(list.size() - 1) + tempWord;
+468 list.add(tmp);
+469 }
+470 boolean contains = true ;
+471 for (String word : list) {
+472 contains &= ec.containsUsedString(word);
+473 }
+474 return contains;
+475 }
+476
+477
+478
+479
+480
+481
+482
+483
+484 @Override
+485 public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
+486 try {
+487 determineCPE(dependency);
+488 } catch (CorruptIndexException ex) {
+489 throw new AnalysisException ("CPE Index is corrupt." , ex);
+490 } catch (IOException ex) {
+491 throw new AnalysisException ("Failure opening the CPE Index." , ex);
+492 } catch (ParseException ex) {
+493 throw new AnalysisException ("Unable to parse the generated Lucene query for this dependency." , ex);
+494 }
+495 }
+496
+497
+498
+499
+500
+501
+502
+503
+504
+505
+506
+507 private void determineIdentifiers(Dependency dependency, String vendor, String product) throws UnsupportedEncodingException {
+508 final Set<VulnerableSoftware> cpes = cve.getCPEs(vendor, product);
+509 DependencyVersion bestGuess = new DependencyVersion ("-" );
+510 Confidence bestGuessConf = null ;
+511 final List<IdentifierMatch> collected = new ArrayList<IdentifierMatch>();
+512 for (Confidence conf : Confidence.values()) {
+513 for (Evidence evidence : dependency.getVersionEvidence().iterator(conf)) {
+514 final DependencyVersion evVer = DependencyVersionUtil.parseVersion(evidence.getValue());
+515 if (evVer == null ) {
+516 continue ;
+517 }
+518 for (VulnerableSoftware vs : cpes) {
+519 DependencyVersion dbVer;
+520 if (vs.getRevision() != null && !vs.getRevision().isEmpty()) {
+521 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + "." + vs.getRevision());
+522 } else {
+523 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion());
+524 }
+525 if (dbVer == null
+526 || evVer.equals(dbVer)) {
+527 final String url = String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(vs.getName(), "UTF-8" ));
+528 final IdentifierMatch match = new IdentifierMatch ("cpe" , vs.getName(), url, IdentifierConfidence.EXACT_MATCH, conf);
+529 collected.add(match);
+530 } else {
+531
+532 if (evVer.getVersionParts().size() <= dbVer.getVersionParts().size()
+533 && evVer.matchesAtLeastThreeLevels(dbVer)) {
+534 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
+535 if (bestGuess.getVersionParts().size() < dbVer.getVersionParts().size()) {
+536 bestGuess = dbVer;
+537 bestGuessConf = conf;
+538 }
+539 }
+540 }
+541 }
+542 }
+543 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
+544 if (bestGuess.getVersionParts().size() < evVer.getVersionParts().size()) {
+545 bestGuess = evVer;
+546 bestGuessConf = conf;
+547 }
+548 }
+549 }
+550 }
+551 final String cpeName = String.format("cpe:/a:%s:%s:%s" , vendor, product, bestGuess.toString());
+552 final String url = null ;
+553 if (bestGuessConf == null ) {
+554 bestGuessConf = Confidence.LOW;
+555 }
+556 final IdentifierMatch match = new IdentifierMatch ("cpe" , cpeName, url, IdentifierConfidence.BEST_GUESS, bestGuessConf);
+557 collected.add(match);
+558
+559 Collections.sort(collected);
+560 final IdentifierConfidence bestIdentifierQuality = collected.get(0).getConfidence();
+561 final Confidence bestEvidenceQuality = collected.get(0).getEvidenceConfidence();
+562 for (IdentifierMatch m : collected) {
+563 if (bestIdentifierQuality.equals(m.getConfidence())
+564 && bestEvidenceQuality.equals(m.getEvidenceConfidence())) {
+565 final Identifier i = m.getIdentifier();
+566 if (bestIdentifierQuality == IdentifierConfidence.BEST_GUESS) {
+567 i.setConfidence(Confidence.LOW);
+568 } else {
+569 i.setConfidence(bestEvidenceQuality);
+570 }
+571 dependency.addIdentifier(i);
+572 }
+573 }
+574 }
+575
+576
+577
+578
+579 private enum IdentifierConfidence {
+580
+581
+582
+583
+584 EXACT_MATCH,
+585
+586
+587
+588 BEST_GUESS
+589 }
+590
+591
+592
+593
+594 private static class IdentifierMatch implements Comparable<IdentifierMatch> {
+595
+596
+597
+598
+599
+600
+601
+602
+603
+604
+605 IdentifierMatch (String type, String value, String url, IdentifierConfidence identifierConfidence, Confidence evidenceConfidence) {
+606 this .identifier = new Identifier (type, value, url);
+607 this .confidence = identifierConfidence;
+608 this .evidenceConfidence = evidenceConfidence;
+609 }
+610
+611
+612
+613
+614 private Confidence evidenceConfidence;
+615
+616
+617
+618
+619
+620
+621 public Confidence getEvidenceConfidence() {
+622 return evidenceConfidence;
+623 }
+624
+625
+626
+627
+628
+629
+630 public void setEvidenceConfidence(Confidence evidenceConfidence) {
+631 this .evidenceConfidence = evidenceConfidence;
+632 }
+633
+634
+635
+636 private IdentifierConfidence confidence;
+637
+638
+639
+640
+641
+642
+643 public IdentifierConfidence getConfidence() {
+644 return confidence;
+645 }
+646
+647
+648
+649
+650
+651
+652 public void setConfidence(IdentifierConfidence confidence) {
+653 this .confidence = confidence;
+654 }
+655
+656
+657
+658 private Identifier identifier;
+659
+660
+661
+662
+663
+664
+665 public Identifier getIdentifier() {
+666 return identifier;
+667 }
+668
+669
+670
+671
+672
+673
+674 public void setIdentifier(Identifier identifier) {
+675 this .identifier = identifier;
+676 }
+677
+678
+679
+680
+681
+682
+683
+684
+685 @Override
+686 public String toString() {
+687 return "IdentifierMatch{" + "evidenceConfidence=" + evidenceConfidence
+688 + ", confidence=" + confidence + ", identifier=" + identifier + '}';
+689 }
+690
+691
+692
+693
+694
+695
+696 @Override
+697 public int hashCode() {
+698 int hash = 5;
+699 hash = 97 * hash + (this .evidenceConfidence != null ? this .evidenceConfidence.hashCode() : 0);
+700 hash = 97 * hash + (this .confidence != null ? this .confidence.hashCode() : 0);
+701 hash = 97 * hash + (this .identifier != null ? this .identifier.hashCode() : 0);
+702 return hash;
+703 }
+704
+705
+706
+707
+708
+709
+710
+711 @Override
+712 public boolean equals(Object obj) {
+713 if (obj == null ) {
714 return false;
715 }
-716 final IdentifierMatch other = (IdentifierMatch) obj;
-717 if (this .evidenceConfidence != other.evidenceConfidence) {
-718 return false;
-719 }
-720 if (this .confidence != other.confidence) {
+716 if (getClass() != obj.getClass()) {
+717 return false;
+718 }
+719 final IdentifierMatch other = (IdentifierMatch) obj;
+720 if (this .evidenceConfidence != other.evidenceConfidence) {
721 return false;
722 }
-723 if (this .identifier != other.identifier && (this .identifier == null || !this .identifier.equals(other.identifier))) {
+723 if (this .confidence != other.confidence) {
724 return false;
725 }
-726 return true ;
-727 }
-728
-729
-730
-731
-732
-733
-734
-735
-736
-737 @Override
-738 public int compareTo(IdentifierMatch o) {
-739 int conf = this .confidence.compareTo(o.confidence);
-740 if (conf == 0) {
-741 conf = this .evidenceConfidence.compareTo(o.evidenceConfidence);
-742 if (conf == 0) {
-743 conf = identifier.compareTo(o.identifier);
-744 }
-745 }
-746 return conf;
-747 }
-748 }
-749 }
+726 if (this .identifier != other.identifier && (this .identifier == null || !this .identifier.equals(other.identifier))) {
+727 return false;
+728 }
+729 return true ;
+730 }
+731
+732
+733
+734
+735
+736
+737
+738
+739
+740 @Override
+741 public int compareTo(IdentifierMatch o) {
+742 int conf = this .confidence.compareTo(o.confidence);
+743 if (conf == 0) {
+744 conf = this .evidenceConfidence.compareTo(o.evidenceConfidence);
+745 if (conf == 0) {
+746 conf = identifier.compareTo(o.identifier);
+747 }
+748 }
+749 return conf;
+750 }
+751 }
+752 }
30
31 public class CpeSuppressionAnalyzer extends AbstractSuppressionAnalyzer {
32
-33
+33
34
35
36
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html
index 6385c3980..6d9281523 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html
@@ -54,346 +54,351 @@
46
47 public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Analyzer {
48
-49
-50
-51
-52
-53 private static final Pattern STARTING_TEXT_PATTERN = Pattern.compile("^[a-zA-Z]*" );
-54
-55
-56
-57 private boolean analyzed = false;
-58
-59
-60
-61
-62
-63 private static final String ANALYZER_NAME = "Dependency Bundling Analyzer" ;
-64
-65
-66
-67 private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.PRE_FINDING_ANALYSIS;
-68
+49
+50
+51
+52 private static final Logger LOGGER = Logger.getLogger(DependencyBundlingAnalyzer.class .getName());
+53
+54
+55
+56
+57
+58 private static final Pattern STARTING_TEXT_PATTERN = Pattern.compile("^[a-zA-Z]*" );
+59
+60
+61
+62 private boolean analyzed = false;
+63
+64
+65
+66
+67
+68 private static final String ANALYZER_NAME = "Dependency Bundling Analyzer" ;
69
-70
-71
-72
-73
-74 public String getName() {
-75 return ANALYZER_NAME;
-76 }
-77
-78
-79
-80
-81
-82
-83 public AnalysisPhase getAnalysisPhase() {
-84 return ANALYSIS_PHASE;
-85 }
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96 @Override
-97 public void analyze(Dependency ignore, Engine engine) throws AnalysisException {
-98 if (!analyzed) {
-99 analyzed = true ;
-100 final Set<Dependency> dependenciesToRemove = new HashSet<Dependency>();
-101 final ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator();
-102
-103 while (mainIterator.hasNext()) {
-104 final Dependency dependency = mainIterator.next();
-105 if (mainIterator.hasNext()) {
-106 final ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex());
-107 while (subIterator.hasNext()) {
-108 final Dependency nextDependency = subIterator.next();
-109 if (isShadedJar(dependency, nextDependency)) {
-110 if (dependency.getFileName().toLowerCase().endsWith("pom.xml" )) {
-111 dependenciesToRemove.add(dependency);
-112 } else {
-113 dependenciesToRemove.add(nextDependency);
-114 }
-115 } else if (hashesMatch(dependency, nextDependency)) {
-116 if (isCore(dependency, nextDependency)) {
-117 mergeDependencies(dependency, nextDependency, dependenciesToRemove);
-118 } else {
-119 mergeDependencies(nextDependency, dependency, dependenciesToRemove);
-120 }
-121 } else if (cpeIdentifiersMatch(dependency, nextDependency)
-122 && hasSameBasePath(dependency, nextDependency)
-123 && fileNameMatch(dependency, nextDependency)) {
-124
-125 if (isCore(dependency, nextDependency)) {
-126 mergeDependencies(dependency, nextDependency, dependenciesToRemove);
-127 } else {
-128 mergeDependencies(nextDependency, dependency, dependenciesToRemove);
-129 }
-130 }
-131 }
-132 }
-133 }
-134
-135
-136 for (Dependency d : dependenciesToRemove) {
-137 engine.getDependencies().remove(d);
+70
+71
+72 private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.PRE_FINDING_ANALYSIS;
+73
+74
+75
+76
+77
+78
+79 public String getName() {
+80 return ANALYZER_NAME;
+81 }
+82
+83
+84
+85
+86
+87
+88 public AnalysisPhase getAnalysisPhase() {
+89 return ANALYSIS_PHASE;
+90 }
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101 @Override
+102 public void analyze(Dependency ignore, Engine engine) throws AnalysisException {
+103 if (!analyzed) {
+104 analyzed = true ;
+105 final Set<Dependency> dependenciesToRemove = new HashSet<Dependency>();
+106 final ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator();
+107
+108 while (mainIterator.hasNext()) {
+109 final Dependency dependency = mainIterator.next();
+110 if (mainIterator.hasNext()) {
+111 final ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex());
+112 while (subIterator.hasNext()) {
+113 final Dependency nextDependency = subIterator.next();
+114 if (hashesMatch(dependency, nextDependency)) {
+115 if (isCore(dependency, nextDependency)) {
+116 mergeDependencies(dependency, nextDependency, dependenciesToRemove);
+117 } else {
+118 mergeDependencies(nextDependency, dependency, dependenciesToRemove);
+119 }
+120 } else if (isShadedJar(dependency, nextDependency)) {
+121 if (dependency.getFileName().toLowerCase().endsWith("pom.xml" )) {
+122 dependenciesToRemove.add(dependency);
+123 } else {
+124 dependenciesToRemove.add(nextDependency);
+125 }
+126 } else if (cpeIdentifiersMatch(dependency, nextDependency)
+127 && hasSameBasePath(dependency, nextDependency)
+128 && fileNameMatch(dependency, nextDependency)) {
+129
+130 if (isCore(dependency, nextDependency)) {
+131 mergeDependencies(dependency, nextDependency, dependenciesToRemove);
+132 } else {
+133 mergeDependencies(nextDependency, dependency, dependenciesToRemove);
+134 }
+135 }
+136 }
+137 }
138 }
-139 }
-140 }
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151 private void mergeDependencies(final Dependency dependency, final Dependency relatedDependency, final Set<Dependency> dependenciesToRemove) {
-152 dependency.addRelatedDependency(relatedDependency);
-153 final Iterator<Dependency> i = relatedDependency.getRelatedDependencies().iterator();
-154 while (i.hasNext()) {
-155 dependency.addRelatedDependency(i.next());
-156 i.remove();
-157 }
-158 dependenciesToRemove.add(relatedDependency);
-159 }
-160
-161
-162
-163
-164
-165
-166
-167
-168 private String getBaseRepoPath(final String path) {
-169 int pos = path.indexOf("repository" + File.separator) + 11;
-170 if (pos < 0) {
-171 return path;
-172 }
-173 int tmp = path.indexOf(File.separator, pos);
-174 if (tmp <= 0) {
-175 return path;
-176 }
-177 if (tmp > 0) {
-178 pos = tmp + 1;
-179 }
-180 tmp = path.indexOf(File.separator, pos);
-181 if (tmp > 0) {
-182 pos = tmp + 1;
-183 }
-184 return path.substring(0, pos);
-185 }
-186
-187
-188
-189
-190
-191
-192
-193
-194 private boolean fileNameMatch(Dependency dependency1, Dependency dependency2) {
-195 if (dependency1 == null || dependency1.getFileName() == null
-196 || dependency2 == null || dependency2.getFileName() == null ) {
-197 return false;
-198 }
-199 String fileName1 = dependency1.getFileName();
-200 String fileName2 = dependency2.getFileName();
-201
-202
-203
-204 final File one = new File(fileName1);
-205 final File two = new File(fileName2);
-206 final String oneParent = one.getParent();
-207 final String twoParent = two.getParent();
-208 if (oneParent != null ) {
-209 if (oneParent.equals(twoParent)) {
-210 fileName1 = one.getName();
-211 fileName2 = two.getName();
-212 } else {
-213 return false;
-214 }
-215 } else if (twoParent != null ) {
-216 return false;
-217 }
-218
-219
-220 final DependencyVersion version1 = DependencyVersionUtil.parseVersion(fileName1);
-221 final DependencyVersion version2 = DependencyVersionUtil.parseVersion(fileName2);
-222 if (version1 != null && version2 != null ) {
-223 if (!version1.equals(version2)) {
-224 return false;
-225 }
-226 }
-227
-228
-229 final Matcher match1 = STARTING_TEXT_PATTERN.matcher(fileName1);
-230 final Matcher match2 = STARTING_TEXT_PATTERN.matcher(fileName2);
-231 if (match1.find() && match2.find()) {
-232 return match1.group().equals(match2.group());
-233 }
-234
-235 return false;
-236 }
-237
-238
-239
-240
-241
-242
-243
-244
-245 private boolean cpeIdentifiersMatch(Dependency dependency1, Dependency dependency2) {
-246 if (dependency1 == null || dependency1.getIdentifiers() == null
-247 || dependency2 == null || dependency2.getIdentifiers() == null ) {
-248 return false;
-249 }
-250 boolean matches = false;
-251 int cpeCount1 = 0;
-252 int cpeCount2 = 0;
-253 for (Identifier i : dependency1.getIdentifiers()) {
-254 if ("cpe" .equals(i.getType())) {
-255 cpeCount1 += 1;
-256 }
-257 }
-258 for (Identifier i : dependency2.getIdentifiers()) {
+139
+140
+141 for (Dependency d : dependenciesToRemove) {
+142 engine.getDependencies().remove(d);
+143 }
+144 }
+145 }
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156 private void mergeDependencies(final Dependency dependency, final Dependency relatedDependency, final Set<Dependency> dependenciesToRemove) {
+157 dependency.addRelatedDependency(relatedDependency);
+158 final Iterator<Dependency> i = relatedDependency.getRelatedDependencies().iterator();
+159 while (i.hasNext()) {
+160 dependency.addRelatedDependency(i.next());
+161 i.remove();
+162 }
+163 dependenciesToRemove.add(relatedDependency);
+164 }
+165
+166
+167
+168
+169
+170
+171
+172
+173 private String getBaseRepoPath(final String path) {
+174 int pos = path.indexOf("repository" + File.separator) + 11;
+175 if (pos < 0) {
+176 return path;
+177 }
+178 int tmp = path.indexOf(File.separator, pos);
+179 if (tmp <= 0) {
+180 return path;
+181 }
+182 if (tmp > 0) {
+183 pos = tmp + 1;
+184 }
+185 tmp = path.indexOf(File.separator, pos);
+186 if (tmp > 0) {
+187 pos = tmp + 1;
+188 }
+189 return path.substring(0, pos);
+190 }
+191
+192
+193
+194
+195
+196
+197
+198
+199 private boolean fileNameMatch(Dependency dependency1, Dependency dependency2) {
+200 if (dependency1 == null || dependency1.getFileName() == null
+201 || dependency2 == null || dependency2.getFileName() == null ) {
+202 return false;
+203 }
+204 String fileName1 = dependency1.getFileName();
+205 String fileName2 = dependency2.getFileName();
+206
+207
+208
+209 final File one = new File(fileName1);
+210 final File two = new File(fileName2);
+211 final String oneParent = one.getParent();
+212 final String twoParent = two.getParent();
+213 if (oneParent != null ) {
+214 if (oneParent.equals(twoParent)) {
+215 fileName1 = one.getName();
+216 fileName2 = two.getName();
+217 } else {
+218 return false;
+219 }
+220 } else if (twoParent != null ) {
+221 return false;
+222 }
+223
+224
+225 final DependencyVersion version1 = DependencyVersionUtil.parseVersion(fileName1);
+226 final DependencyVersion version2 = DependencyVersionUtil.parseVersion(fileName2);
+227 if (version1 != null && version2 != null ) {
+228 if (!version1.equals(version2)) {
+229 return false;
+230 }
+231 }
+232
+233
+234 final Matcher match1 = STARTING_TEXT_PATTERN.matcher(fileName1);
+235 final Matcher match2 = STARTING_TEXT_PATTERN.matcher(fileName2);
+236 if (match1.find() && match2.find()) {
+237 return match1.group().equals(match2.group());
+238 }
+239
+240 return false;
+241 }
+242
+243
+244
+245
+246
+247
+248
+249
+250 private boolean cpeIdentifiersMatch(Dependency dependency1, Dependency dependency2) {
+251 if (dependency1 == null || dependency1.getIdentifiers() == null
+252 || dependency2 == null || dependency2.getIdentifiers() == null ) {
+253 return false;
+254 }
+255 boolean matches = false;
+256 int cpeCount1 = 0;
+257 int cpeCount2 = 0;
+258 for (Identifier i : dependency1.getIdentifiers()) {
259 if ("cpe" .equals(i.getType())) {
-260 cpeCount2 += 1;
+260 cpeCount1 += 1;
261 }
262 }
-263 if (cpeCount1 > 0 && cpeCount1 == cpeCount2) {
-264 for (Identifier i : dependency1.getIdentifiers()) {
-265 matches |= dependency2.getIdentifiers().contains(i);
-266 if (!matches) {
-267 break ;
-268 }
-269 }
-270 }
-271 if (LogUtils.isVerboseLoggingEnabled()) {
-272 final String msg = String.format("IdentifiersMatch=%s (%s, %s)" , matches, dependency1.getFileName(), dependency2.getFileName());
-273 Logger.getLogger(DependencyBundlingAnalyzer.class .getName()).log(Level.FINE, msg);
-274 }
-275 return matches;
-276 }
-277
-278
-279
-280
-281
-282
-283
-284
-285 private boolean hasSameBasePath(Dependency dependency1, Dependency dependency2) {
-286 if (dependency1 == null || dependency2 == null ) {
-287 return false;
-288 }
-289 final File lFile = new File(dependency1.getFilePath());
-290 String left = lFile.getParent();
-291 final File rFile = new File(dependency2.getFilePath());
-292 String right = rFile.getParent();
-293 if (left == null ) {
-294 return right == null ;
-295 }
-296 if (left.equalsIgnoreCase(right)) {
-297 return true ;
-298 }
-299 if (left.matches(".*[/\\\\]repository[/\\\\].*" ) && right.matches(".*[/\\\\]repository[/\\\\].*" )) {
-300 left = getBaseRepoPath(left);
-301 right = getBaseRepoPath(right);
-302 }
-303 if (left.equalsIgnoreCase(right)) {
-304 return true ;
-305 }
-306
-307 for (Dependency child : dependency2.getRelatedDependencies()) {
-308 if (hasSameBasePath(dependency1, child)) {
-309 return true ;
-310 }
-311 }
-312 return false;
-313 }
-314
-315
-316
-317
-318
-319
-320
-321
-322
-323 boolean isCore(Dependency left, Dependency right) {
-324 final String leftName = left.getFileName().toLowerCase();
-325 final String rightName = right.getFileName().toLowerCase();
-326
-327 final boolean returnVal;
-328 if (!rightName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" ) && leftName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" )
-329 || rightName.contains("core" ) && !leftName.contains("core" )
-330 || rightName.contains("kernel" ) && !leftName.contains("kernel" )) {
-331 returnVal = false;
-332 } else if (rightName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" ) && !leftName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" )
-333 || !rightName.contains("core" ) && leftName.contains("core" )
-334 || !rightName.contains("kernel" ) && leftName.contains("kernel" )) {
-335 returnVal = true ;
-336 } else {
-337
-338
-339
-340
-341
-342
-343
-344
-345
-346 returnVal = leftName.length() <= rightName.length();
-347 }
-348 if (LogUtils.isVerboseLoggingEnabled()) {
-349 final String msg = String.format("IsCore=%s (%s, %s)" , returnVal, left.getFileName(), right.getFileName());
-350 Logger.getLogger(DependencyBundlingAnalyzer.class .getName()).log(Level.FINE, msg);
-351 }
-352 return returnVal;
-353 }
-354
-355
-356
-357
-358
-359
-360
-361
-362 private boolean hashesMatch(Dependency dependency1, Dependency dependency2) {
-363 if (dependency1 == null || dependency2 == null || dependency1.getSha1sum() == null || dependency2.getSha1sum() == null ) {
-364 return false;
-365 }
-366 return dependency1.getSha1sum().equals(dependency2.getSha1sum());
-367 }
-368
-369
-370
-371
-372
-373
-374
-375
-376
-377
-378 private boolean isShadedJar(Dependency dependency, Dependency nextDependency) {
-379 final String mainName = dependency.getFileName().toLowerCase();
-380 final String nextName = nextDependency.getFileName().toLowerCase();
-381 if (mainName.endsWith(".jar" ) && nextName.endsWith("pom.xml" )) {
-382 return dependency.getIdentifiers().containsAll(nextDependency.getIdentifiers());
-383 } else if (nextName.endsWith(".jar" ) && mainName.endsWith("pom.xml" )) {
-384 return nextDependency.getIdentifiers().containsAll(dependency.getIdentifiers());
-385 }
-386 return false;
-387 }
-388 }
+263 for (Identifier i : dependency2.getIdentifiers()) {
+264 if ("cpe" .equals(i.getType())) {
+265 cpeCount2 += 1;
+266 }
+267 }
+268 if (cpeCount1 > 0 && cpeCount1 == cpeCount2) {
+269 for (Identifier i : dependency1.getIdentifiers()) {
+270 matches |= dependency2.getIdentifiers().contains(i);
+271 if (!matches) {
+272 break ;
+273 }
+274 }
+275 }
+276 if (LogUtils.isVerboseLoggingEnabled()) {
+277 final String msg = String.format("IdentifiersMatch=%s (%s, %s)" , matches, dependency1.getFileName(), dependency2.getFileName());
+278 LOGGER.log(Level.FINE, msg);
+279 }
+280 return matches;
+281 }
+282
+283
+284
+285
+286
+287
+288
+289
+290 private boolean hasSameBasePath(Dependency dependency1, Dependency dependency2) {
+291 if (dependency1 == null || dependency2 == null ) {
+292 return false;
+293 }
+294 final File lFile = new File(dependency1.getFilePath());
+295 String left = lFile.getParent();
+296 final File rFile = new File(dependency2.getFilePath());
+297 String right = rFile.getParent();
+298 if (left == null ) {
+299 return right == null ;
+300 }
+301 if (left.equalsIgnoreCase(right)) {
+302 return true ;
+303 }
+304 if (left.matches(".*[/\\\\]repository[/\\\\].*" ) && right.matches(".*[/\\\\]repository[/\\\\].*" )) {
+305 left = getBaseRepoPath(left);
+306 right = getBaseRepoPath(right);
+307 }
+308 if (left.equalsIgnoreCase(right)) {
+309 return true ;
+310 }
+311
+312 for (Dependency child : dependency2.getRelatedDependencies()) {
+313 if (hasSameBasePath(dependency1, child)) {
+314 return true ;
+315 }
+316 }
+317 return false;
+318 }
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328 boolean isCore(Dependency left, Dependency right) {
+329 final String leftName = left.getFileName().toLowerCase();
+330 final String rightName = right.getFileName().toLowerCase();
+331
+332 final boolean returnVal;
+333 if (!rightName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" ) && leftName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" )
+334 || rightName.contains("core" ) && !leftName.contains("core" )
+335 || rightName.contains("kernel" ) && !leftName.contains("kernel" )) {
+336 returnVal = false;
+337 } else if (rightName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" ) && !leftName.matches(".*\\.(tar|tgz|gz|zip|ear|war).+" )
+338 || !rightName.contains("core" ) && leftName.contains("core" )
+339 || !rightName.contains("kernel" ) && leftName.contains("kernel" )) {
+340 returnVal = true ;
+341 } else {
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351 returnVal = leftName.length() <= rightName.length();
+352 }
+353 if (LogUtils.isVerboseLoggingEnabled()) {
+354 final String msg = String.format("IsCore=%s (%s, %s)" , returnVal, left.getFileName(), right.getFileName());
+355 LOGGER.log(Level.FINE, msg);
+356 }
+357 return returnVal;
+358 }
+359
+360
+361
+362
+363
+364
+365
+366
+367 private boolean hashesMatch(Dependency dependency1, Dependency dependency2) {
+368 if (dependency1 == null || dependency2 == null || dependency1.getSha1sum() == null || dependency2.getSha1sum() == null ) {
+369 return false;
+370 }
+371 return dependency1.getSha1sum().equals(dependency2.getSha1sum());
+372 }
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383 private boolean isShadedJar(Dependency dependency, Dependency nextDependency) {
+384 final String mainName = dependency.getFileName().toLowerCase();
+385 final String nextName = nextDependency.getFileName().toLowerCase();
+386 if (mainName.endsWith(".jar" ) && nextName.endsWith("pom.xml" )) {
+387 return dependency.getIdentifiers().containsAll(nextDependency.getIdentifiers());
+388 } else if (nextName.endsWith(".jar" ) && mainName.endsWith("pom.xml" )) {
+389 return nextDependency.getIdentifiers().containsAll(dependency.getIdentifiers());
+390 }
+391 return false;
+392 }
+393 }
42
43 public class FalsePositiveAnalyzer extends AbstractAnalyzer {
44
-45
-46
-47
-48
-49 private static final String ANALYZER_NAME = "False Positive Analyzer" ;
+45
+46
+47
+48 private static final Logger LOGGER = Logger.getLogger(FalsePositiveAnalyzer.class .getName());
+49
50
-51
+51
52
-53 private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;
-54
-55
-56
-57
-58
-59
-60 public String getName() {
-61 return ANALYZER_NAME;
-62 }
-63
-64
-65
-66
-67
-68
-69 public AnalysisPhase getAnalysisPhase() {
-70 return ANALYSIS_PHASE;
-71 }
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81 @Override
-82 public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
-83 removeJreEntries(dependency);
-84 removeBadMatches(dependency);
-85 removeWrongVersionMatches(dependency);
-86 removeSpuriousCPE(dependency);
-87 addFalseNegativeCPEs(dependency);
-88 }
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108 @SuppressWarnings("null" )
-109 private void removeSpuriousCPE(Dependency dependency) {
-110 final List<Identifier> ids = new ArrayList<Identifier>();
-111 ids.addAll(dependency.getIdentifiers());
-112 Collections.sort(ids);
-113 final ListIterator<Identifier> mainItr = ids.listIterator();
-114 while (mainItr.hasNext()) {
-115 final Identifier currentId = mainItr.next();
-116 final VulnerableSoftware currentCpe = parseCpe(currentId.getType(), currentId.getValue());
-117 if (currentCpe == null ) {
-118 continue ;
-119 }
-120 final ListIterator<Identifier> subItr = ids.listIterator(mainItr.nextIndex());
-121 while (subItr.hasNext()) {
-122 final Identifier nextId = subItr.next();
-123 final VulnerableSoftware nextCpe = parseCpe(nextId.getType(), nextId.getValue());
-124 if (nextCpe == null ) {
-125 continue ;
-126 }
-127
-128 if (currentCpe.getVendor().equals(nextCpe.getVendor())) {
-129 if (currentCpe.getProduct().equals(nextCpe.getProduct())) {
-130
-131 final String currentVersion = currentCpe.getVersion();
-132 final String nextVersion = nextCpe.getVersion();
-133 if (currentVersion == null && nextVersion == null ) {
-134
-135 Logger.getLogger(FalsePositiveAnalyzer.class
-136 .getName()).log(Level.FINE, "currentVersion and nextVersion are both null?" );
-137 } else if (currentVersion == null && nextVersion != null ) {
-138 dependency.getIdentifiers().remove(currentId);
-139 } else if (nextVersion == null && currentVersion != null ) {
-140 dependency.getIdentifiers().remove(nextId);
-141 } else if (currentVersion.length() < nextVersion.length()) {
-142 if (nextVersion.startsWith(currentVersion) || "-" .equals(currentVersion)) {
-143 dependency.getIdentifiers().remove(currentId);
-144 }
-145 } else {
-146 if (currentVersion.startsWith(nextVersion) || "-" .equals(nextVersion)) {
-147 dependency.getIdentifiers().remove(nextId);
-148 }
-149 }
-150 }
-151 }
-152 }
-153 }
-154 }
-155
-156
-157
-158 public static final Pattern CORE_JAVA = Pattern.compile("^cpe:/a:(sun|oracle|ibm):(j2[ems]e|"
-159 + "java(_platfrom_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|"
-160 + "jdk|jre|jsf|jsse)($|:.*)" );
-161
-162
-163
-164 public static final Pattern CORE_FILES = Pattern.compile("^((alt[-])?rt|jsf[-].*|jsse|jfxrt|jfr|jce|javaws|deploy|charsets)\\.jar$" );
-165
-166
-167
-168
-169
-170
-171 private void removeJreEntries(Dependency dependency) {
-172 final Set<Identifier> identifiers = dependency.getIdentifiers();
-173 final Iterator<Identifier> itr = identifiers.iterator();
-174 while (itr.hasNext()) {
-175 final Identifier i = itr.next();
-176 final Matcher coreCPE = CORE_JAVA.matcher(i.getValue());
-177 final Matcher coreFiles = CORE_FILES.matcher(dependency.getFileName());
-178 if (coreCPE.matches() && !coreFiles.matches()) {
-179 itr.remove();
-180 }
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202 }
-203 }
-204
-205
-206
-207
-208
-209
-210
-211
-212 private VulnerableSoftware parseCpe(String type, String value) {
-213 if (!"cpe" .equals(type)) {
-214 return null ;
-215 }
-216 final VulnerableSoftware cpe = new VulnerableSoftware ();
-217 try {
-218 cpe.parseName(value);
-219 } catch (UnsupportedEncodingException ex) {
-220 Logger.getLogger(FalsePositiveAnalyzer.class .getName()).log(Level.FINEST, null , ex);
-221 return null ;
-222 }
-223 return cpe;
-224 }
-225
-226
-227
-228
-229
-230
-231
-232 private void removeBadMatches(Dependency dependency) {
-233 final Set<Identifier> identifiers = dependency.getIdentifiers();
-234 final Iterator<Identifier> itr = identifiers.iterator();
-235
-236
-237
-238
-239
-240
-241
-242
-243 while (itr.hasNext()) {
-244 final Identifier i = itr.next();
-245
-246 if ("cpe" .equals(i.getType())) {
-247 if ((i.getValue().matches(".*c\\+\\+.*" )
-248 || i.getValue().startsWith("cpe:/a:jquery:jquery" )
-249 || i.getValue().startsWith("cpe:/a:prototypejs:prototype" )
-250 || i.getValue().startsWith("cpe:/a:yahoo:yui" )
-251 || i.getValue().startsWith("cpe:/a:file:file" )
-252 || i.getValue().startsWith("cpe:/a:mozilla:mozilla" )
-253 || i.getValue().startsWith("cpe:/a:cvs:cvs" )
-254 || i.getValue().startsWith("cpe:/a:ftp:ftp" )
-255 || i.getValue().startsWith("cpe:/a:ssh:ssh" ))
-256 && (dependency.getFileName().toLowerCase().endsWith(".jar" )
-257 || dependency.getFileName().toLowerCase().endsWith("pom.xml" ))) {
-258 itr.remove();
-259 } else if (i.getValue().startsWith("cpe:/a:apache:maven" )
-260 && !dependency.getFileName().toLowerCase().matches("maven-core-[\\d\\.]+\\.jar" )) {
+53 private static final String ANALYZER_NAME = "False Positive Analyzer" ;
+54
+55
+56
+57 private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.POST_IDENTIFIER_ANALYSIS;
+58
+59
+60
+61
+62
+63
+64 public String getName() {
+65 return ANALYZER_NAME;
+66 }
+67
+68
+69
+70
+71
+72
+73 public AnalysisPhase getAnalysisPhase() {
+74 return ANALYSIS_PHASE;
+75 }
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85 @Override
+86 public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
+87 removeJreEntries(dependency);
+88 removeBadMatches(dependency);
+89 removeWrongVersionMatches(dependency);
+90 removeSpuriousCPE(dependency);
+91 addFalseNegativeCPEs(dependency);
+92 }
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112 @SuppressWarnings("null" )
+113 private void removeSpuriousCPE(Dependency dependency) {
+114 final List<Identifier> ids = new ArrayList<Identifier>();
+115 ids.addAll(dependency.getIdentifiers());
+116 Collections.sort(ids);
+117 final ListIterator<Identifier> mainItr = ids.listIterator();
+118 while (mainItr.hasNext()) {
+119 final Identifier currentId = mainItr.next();
+120 final VulnerableSoftware currentCpe = parseCpe(currentId.getType(), currentId.getValue());
+121 if (currentCpe == null ) {
+122 continue ;
+123 }
+124 final ListIterator<Identifier> subItr = ids.listIterator(mainItr.nextIndex());
+125 while (subItr.hasNext()) {
+126 final Identifier nextId = subItr.next();
+127 final VulnerableSoftware nextCpe = parseCpe(nextId.getType(), nextId.getValue());
+128 if (nextCpe == null ) {
+129 continue ;
+130 }
+131
+132 if (currentCpe.getVendor().equals(nextCpe.getVendor())) {
+133 if (currentCpe.getProduct().equals(nextCpe.getProduct())) {
+134
+135 final String currentVersion = currentCpe.getVersion();
+136 final String nextVersion = nextCpe.getVersion();
+137 if (currentVersion == null && nextVersion == null ) {
+138
+139 LOGGER.log(Level.FINE, "currentVersion and nextVersion are both null?" );
+140 } else if (currentVersion == null && nextVersion != null ) {
+141 dependency.getIdentifiers().remove(currentId);
+142 } else if (nextVersion == null && currentVersion != null ) {
+143 dependency.getIdentifiers().remove(nextId);
+144 } else if (currentVersion.length() < nextVersion.length()) {
+145 if (nextVersion.startsWith(currentVersion) || "-" .equals(currentVersion)) {
+146 dependency.getIdentifiers().remove(currentId);
+147 }
+148 } else {
+149 if (currentVersion.startsWith(nextVersion) || "-" .equals(nextVersion)) {
+150 dependency.getIdentifiers().remove(nextId);
+151 }
+152 }
+153 }
+154 }
+155 }
+156 }
+157 }
+158
+159
+160
+161 public static final Pattern CORE_JAVA = Pattern.compile("^cpe:/a:(sun|oracle|ibm):(j2[ems]e|"
+162 + "java(_platform_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|"
+163 + "jdk|jre|jsf|jsse)($|:.*)" );
+164
+165
+166
+167 public static final Pattern CORE_FILES = Pattern.compile("^((alt[-])?rt|jsf[-].*|jsse|jfxrt|jfr|jce|javaws|deploy|charsets)\\.jar$" );
+168
+169
+170
+171
+172
+173
+174 private void removeJreEntries(Dependency dependency) {
+175 final Set<Identifier> identifiers = dependency.getIdentifiers();
+176 final Iterator<Identifier> itr = identifiers.iterator();
+177 while (itr.hasNext()) {
+178 final Identifier i = itr.next();
+179 final Matcher coreCPE = CORE_JAVA.matcher(i.getValue());
+180 final Matcher coreFiles = CORE_FILES.matcher(dependency.getFileName());
+181 if (coreCPE.matches() && !coreFiles.matches()) {
+182 itr.remove();
+183 }
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205 }
+206 }
+207
+208
+209
+210
+211
+212
+213
+214
+215 private VulnerableSoftware parseCpe(String type, String value) {
+216 if (!"cpe" .equals(type)) {
+217 return null ;
+218 }
+219 final VulnerableSoftware cpe = new VulnerableSoftware ();
+220 try {
+221 cpe.parseName(value);
+222 } catch (UnsupportedEncodingException ex) {
+223 LOGGER.log(Level.FINEST, null , ex);
+224 return null ;
+225 }
+226 return cpe;
+227 }
+228
+229
+230
+231
+232
+233
+234
+235 private void removeBadMatches(Dependency dependency) {
+236 final Set<Identifier> identifiers = dependency.getIdentifiers();
+237 final Iterator<Identifier> itr = identifiers.iterator();
+238
+239
+240
+241
+242
+243
+244
+245
+246 while (itr.hasNext()) {
+247 final Identifier i = itr.next();
+248
+249 if ("cpe" .equals(i.getType())) {
+250 if ((i.getValue().matches(".*c\\+\\+.*" )
+251 || i.getValue().startsWith("cpe:/a:jquery:jquery" )
+252 || i.getValue().startsWith("cpe:/a:prototypejs:prototype" )
+253 || i.getValue().startsWith("cpe:/a:yahoo:yui" )
+254 || i.getValue().startsWith("cpe:/a:file:file" )
+255 || i.getValue().startsWith("cpe:/a:mozilla:mozilla" )
+256 || i.getValue().startsWith("cpe:/a:cvs:cvs" )
+257 || i.getValue().startsWith("cpe:/a:ftp:ftp" )
+258 || i.getValue().startsWith("cpe:/a:ssh:ssh" ))
+259 && (dependency.getFileName().toLowerCase().endsWith(".jar" )
+260 || dependency.getFileName().toLowerCase().endsWith("pom.xml" ))) {
261 itr.remove();
-262 } else if (i.getValue().startsWith("cpe:/a:m-core:m-core" )
-263 && !dependency.getEvidenceUsed().containsUsedString("m-core" )) {
+262 } else if (i.getValue().startsWith("cpe:/a:apache:maven" )
+263 && !dependency.getFileName().toLowerCase().matches("maven-core-[\\d\\.]+\\.jar" )) {
264 itr.remove();
-265 } else if (i.getValue().startsWith("cpe:/a:jboss:jboss" )
-266 && !dependency.getFileName().toLowerCase().matches("jboss-[\\d\\.]+(GA)?\\.jar" )) {
+265 } else if (i.getValue().startsWith("cpe:/a:m-core:m-core" )
+266 && !dependency.getEvidenceUsed().containsUsedString("m-core" )) {
267 itr.remove();
-268 }
-269 }
-270 }
-271 }
-272
-273
-274
-275
-276
-277
-278 private void removeWrongVersionMatches(Dependency dependency) {
-279 final Set<Identifier> identifiers = dependency.getIdentifiers();
-280 final Iterator<Identifier> itr = identifiers.iterator();
-281
-282 final String fileName = dependency.getFileName();
-283 if (fileName != null && fileName.contains("axis2" )) {
-284 while (itr.hasNext()) {
-285 final Identifier i = itr.next();
-286 if ("cpe" .equals(i.getType())) {
-287 final String cpe = i.getValue();
-288 if (cpe != null && (cpe.startsWith("cpe:/a:apache:axis:" ) || "cpe:/a:apache:axis" .equals(cpe))) {
-289 itr.remove();
-290 }
-291 }
-292 }
-293 } else if (fileName != null && fileName.contains("axis" )) {
-294 while (itr.hasNext()) {
-295 final Identifier i = itr.next();
-296 if ("cpe" .equals(i.getType())) {
-297 final String cpe = i.getValue();
-298 if (cpe != null && (cpe.startsWith("cpe:/a:apache:axis2:" ) || "cpe:/a:apache:axis2" .equals(cpe))) {
-299 itr.remove();
-300 }
-301 }
-302 }
-303 }
-304 }
-305
-306
-307
-308
-309
-310
-311
-312
-313 private void addFalseNegativeCPEs(Dependency dependency) {
-314 final Iterator<Identifier> itr = dependency.getIdentifiers().iterator();
-315 while (itr.hasNext()) {
-316 final Identifier i = itr.next();
-317 if ("cpe" .equals(i.getType()) && i.getValue() != null
-318 && (i.getValue().startsWith("cpe:/a:oracle:opensso:" )
-319 || i.getValue().startsWith("cpe:/a:oracle:opensso_enterprise:" )
-320 || i.getValue().startsWith("cpe:/a:sun:opensso_enterprise:" )
-321 || i.getValue().startsWith("cpe:/a:sun:opensso:" ))) {
-322 final String newCpe = String.format("cpe:/a:sun:opensso_enterprise:%s" , i.getValue().substring(22));
-323 final String newCpe2 = String.format("cpe:/a:oracle:opensso_enterprise:%s" , i.getValue().substring(22));
-324 final String newCpe3 = String.format("cpe:/a:sun:opensso:%s" , i.getValue().substring(22));
-325 final String newCpe4 = String.format("cpe:/a:oracle:opensso:%s" , i.getValue().substring(22));
-326 try {
-327 dependency.addIdentifier("cpe" ,
-328 newCpe,
-329 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe, "UTF-8" )));
+268 } else if (i.getValue().startsWith("cpe:/a:jboss:jboss" )
+269 && !dependency.getFileName().toLowerCase().matches("jboss-[\\d\\.]+(GA)?\\.jar" )) {
+270 itr.remove();
+271 }
+272 }
+273 }
+274 }
+275
+276
+277
+278
+279
+280
+281 private void removeWrongVersionMatches(Dependency dependency) {
+282 final Set<Identifier> identifiers = dependency.getIdentifiers();
+283 final Iterator<Identifier> itr = identifiers.iterator();
+284
+285 final String fileName = dependency.getFileName();
+286 if (fileName != null && fileName.contains("axis2" )) {
+287 while (itr.hasNext()) {
+288 final Identifier i = itr.next();
+289 if ("cpe" .equals(i.getType())) {
+290 final String cpe = i.getValue();
+291 if (cpe != null && (cpe.startsWith("cpe:/a:apache:axis:" ) || "cpe:/a:apache:axis" .equals(cpe))) {
+292 itr.remove();
+293 }
+294 }
+295 }
+296 } else if (fileName != null && fileName.contains("axis" )) {
+297 while (itr.hasNext()) {
+298 final Identifier i = itr.next();
+299 if ("cpe" .equals(i.getType())) {
+300 final String cpe = i.getValue();
+301 if (cpe != null && (cpe.startsWith("cpe:/a:apache:axis2:" ) || "cpe:/a:apache:axis2" .equals(cpe))) {
+302 itr.remove();
+303 }
+304 }
+305 }
+306 }
+307 }
+308
+309
+310
+311
+312
+313
+314
+315
+316 private void addFalseNegativeCPEs(Dependency dependency) {
+317 final Iterator<Identifier> itr = dependency.getIdentifiers().iterator();
+318 while (itr.hasNext()) {
+319 final Identifier i = itr.next();
+320 if ("cpe" .equals(i.getType()) && i.getValue() != null
+321 && (i.getValue().startsWith("cpe:/a:oracle:opensso:" )
+322 || i.getValue().startsWith("cpe:/a:oracle:opensso_enterprise:" )
+323 || i.getValue().startsWith("cpe:/a:sun:opensso_enterprise:" )
+324 || i.getValue().startsWith("cpe:/a:sun:opensso:" ))) {
+325 final String newCpe = String.format("cpe:/a:sun:opensso_enterprise:%s" , i.getValue().substring(22));
+326 final String newCpe2 = String.format("cpe:/a:oracle:opensso_enterprise:%s" , i.getValue().substring(22));
+327 final String newCpe3 = String.format("cpe:/a:sun:opensso:%s" , i.getValue().substring(22));
+328 final String newCpe4 = String.format("cpe:/a:oracle:opensso:%s" , i.getValue().substring(22));
+329 try {
330 dependency.addIdentifier("cpe" ,
-331 newCpe2,
-332 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe2, "UTF-8" )));
+331 newCpe,
+332 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe, "UTF-8" )));
333 dependency.addIdentifier("cpe" ,
-334 newCpe3,
-335 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe3, "UTF-8" )));
+334 newCpe2,
+335 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe2, "UTF-8" )));
336 dependency.addIdentifier("cpe" ,
-337 newCpe4,
-338 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe4, "UTF-8" )));
-339 } catch (UnsupportedEncodingException ex) {
-340 Logger.getLogger(FalsePositiveAnalyzer.class
-341 .getName()).log(Level.FINE, null , ex);
-342 }
-343 }
-344 }
-345 }
-346 }
+337 newCpe3,
+338 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe3, "UTF-8" )));
+339 dependency.addIdentifier("cpe" ,
+340 newCpe4,
+341 String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe4, "UTF-8" )));
+342 } catch (UnsupportedEncodingException ex) {
+343 LOGGER.log(Level.FINE, null , ex);
+344 }
+345 }
+346 }
+347 }
+348 }
33
34 public class FileNameAnalyzer extends AbstractAnalyzer implements Analyzer {
35
-36
+36
37
38
39
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/HintAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/HintAnalyzer.html
index 1f598a589..c3676be6c 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/HintAnalyzer.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/HintAnalyzer.html
@@ -40,7 +40,7 @@
32
33 public class HintAnalyzer extends AbstractAnalyzer implements Analyzer {
34
-35
+35
36
37
38
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/JarAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/JarAnalyzer.html
index 3c2a3205d..74a4513e7 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/JarAnalyzer.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/JarAnalyzer.html
@@ -372,7 +372,7 @@
364
365
366
-367
+367
368
369 private List<String> retrievePomListing(final JarFile jar) throws IOException {
370 final List<String> pomEntries = new ArrayList<String>();
@@ -416,7 +416,7 @@
408 bos.flush();
409 dependency.setActualFilePath(file.getAbsolutePath());
410 } catch (IOException ex) {
-411 final String msg = String.format("An error occured reading '%s' from '%s'." , path, dependency.getFilePath());
+411 final String msg = String.format("An error occurred reading '%s' from '%s'." , path, dependency.getFilePath());
412 LOGGER.warning(msg);
413 LOGGER.log(Level.SEVERE, "" , ex);
414 } finally {
@@ -504,891 +504,878 @@
496 model = readPom(source);
497 } catch (SecurityException ex) {
498 final String msg = String.format("Unable to parse pom '%s' in jar '%s'; invalid signature" , path, jar.getName());
-499 Logger
-500 .getLogger(JarAnalyzer.class
-501 .getName()).log(Level.WARNING, msg);
-502 Logger.getLogger(JarAnalyzer.class
-503 .getName()).log(Level.FINE, null , ex);
-504 throw new AnalysisException (ex);
-505 } catch (IOException ex) {
-506 final String msg = String.format("Unable to parse pom '%s' in jar '%s' (IO Exception)" , path, jar.getName());
-507 LOGGER.log(Level.WARNING, msg);
-508 LOGGER.log(Level.FINE, "" , ex);
-509 throw new AnalysisException (ex);
-510 } catch (Throwable ex) {
-511 final String msg = String.format("Unexpected error during parsing of the pom '%s' in jar '%s'" , path, jar.getName());
-512 LOGGER.log(Level.WARNING, msg);
-513 LOGGER.log(Level.FINE, "" , ex);
-514 throw new AnalysisException (ex);
-515 }
-516 }
-517 return model;
-518 }
-519
-520
-521
-522
-523
-524
-525
-526
-527
-528 private Model readPom(SAXSource source) throws AnalysisException {
-529 Model model = null ;
-530 try {
-531 final XMLFilter filter = new MavenNamespaceFilter ();
-532 final SAXParserFactory spf = SAXParserFactory.newInstance();
-533 final SAXParser sp = spf.newSAXParser();
-534 final XMLReader xr = sp.getXMLReader();
-535 filter.setParent(xr);
-536 final JAXBElement<Model> el = pomUnmarshaller.unmarshal(source, Model.class );
-537 model = el.getValue();
-538 } catch (SecurityException ex) {
-539 throw new AnalysisException (ex);
-540 } catch (ParserConfigurationException ex) {
-541 throw new AnalysisException (ex);
-542 } catch (SAXException ex) {
-543 throw new AnalysisException (ex);
-544 } catch (JAXBException ex) {
-545 throw new AnalysisException (ex);
-546 } catch (Throwable ex) {
-547 throw new AnalysisException (ex);
-548 }
-549 return model;
-550 }
-551
-552
-553
-554
-555
-556
-557
-558
-559
-560
-561
-562 private boolean setPomEvidence(Dependency dependency, Model pom, Properties pomProperties, ArrayList<ClassNameInformation> classes) {
-563 boolean foundSomething = false;
-564 if (pom == null ) {
-565 return foundSomething;
-566 }
-567 String groupid = interpolateString(pom.getGroupId(), pomProperties);
-568 if (groupid != null && !groupid.isEmpty()) {
-569 if (groupid.startsWith("org." ) || groupid.startsWith("com." )) {
-570 groupid = groupid.substring(4);
-571 }
-572 foundSomething = true ;
-573 dependency.getVendorEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.HIGH);
-574 dependency.getProductEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.LOW);
-575 addMatchingValues(classes, groupid, dependency.getVendorEvidence());
-576 addMatchingValues(classes, groupid, dependency.getProductEvidence());
-577 }
-578 String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
-579 if (artifactid != null && !artifactid.isEmpty()) {
-580 if (artifactid.startsWith("org." ) || artifactid.startsWith("com." )) {
-581 artifactid = artifactid.substring(4);
-582 }
-583 foundSomething = true ;
-584 dependency.getProductEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.HIGH);
-585 dependency.getVendorEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.LOW);
-586 addMatchingValues(classes, artifactid, dependency.getVendorEvidence());
-587 addMatchingValues(classes, artifactid, dependency.getProductEvidence());
-588 }
-589
-590 final String version = interpolateString(pom.getVersion(), pomProperties);
-591 if (version != null && !version.isEmpty()) {
-592 foundSomething = true ;
-593 dependency.getVersionEvidence().addEvidence("pom" , "version" , version, Confidence.HIGHEST);
-594 }
-595
-596 final Organization org = pom.getOrganization();
-597 if (org != null && org.getName() != null ) {
-598 foundSomething = true ;
-599 final String orgName = interpolateString(org.getName(), pomProperties);
-600 if (orgName != null && !orgName.isEmpty()) {
-601 dependency.getVendorEvidence().addEvidence("pom" , "organization name" , orgName, Confidence.HIGH);
-602 addMatchingValues(classes, orgName, dependency.getVendorEvidence());
-603 }
-604 }
-605
-606 final String pomName = interpolateString(pom.getName(), pomProperties);
-607 if (pomName != null && !pomName.isEmpty()) {
-608 foundSomething = true ;
-609 dependency.getProductEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
-610 dependency.getVendorEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
-611 addMatchingValues(classes, pomName, dependency.getVendorEvidence());
-612 addMatchingValues(classes, pomName, dependency.getProductEvidence());
-613 }
-614
-615
-616 if (pom.getDescription() != null ) {
-617 foundSomething = true ;
-618 final String description = interpolateString(pom.getDescription(), pomProperties);
-619 if (description != null && !description.isEmpty()) {
-620 final String trimmedDescription = addDescription(dependency, description, "pom" , "description" );
-621 addMatchingValues(classes, trimmedDescription, dependency.getVendorEvidence());
-622 addMatchingValues(classes, trimmedDescription, dependency.getProductEvidence());
-623 }
-624 }
-625 extractLicense(pom, pomProperties, dependency);
-626 return foundSomething;
-627 }
-628
-629
-630
-631
-632
-633
-634
-635
-636
-637 protected void analyzePackageNames(ArrayList<ClassNameInformation> classNames,
-638 Dependency dependency, boolean addPackagesAsEvidence) {
-639 final HashMap<String, Integer> vendorIdentifiers = new HashMap<String, Integer>();
-640 final HashMap<String, Integer> productIdentifiers = new HashMap<String, Integer>();
-641 analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);
-642
-643 final int classCount = classNames.size();
-644 final EvidenceCollection vendor = dependency.getVendorEvidence();
-645 final EvidenceCollection product = dependency.getProductEvidence();
-646
-647 for (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {
-648 final float ratio = entry.getValue() / (float ) classCount;
-649 if (ratio > 0.5) {
-650
-651 vendor.addWeighting(entry.getKey());
-652 if (addPackagesAsEvidence && entry.getKey().length() > 1) {
-653 vendor.addEvidence("jar" , "package" , entry.getKey(), Confidence.LOW);
-654 }
-655 }
-656 }
-657 for (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {
-658 final float ratio = entry.getValue() / (float ) classCount;
-659 if (ratio > 0.5) {
-660 product.addWeighting(entry.getKey());
-661 if (addPackagesAsEvidence && entry.getKey().length() > 1) {
-662 product.addEvidence("jar" , "package" , entry.getKey(), Confidence.LOW);
-663 }
-664 }
-665 }
-666 }
-667
-668
-669
-670
-671
-672
-673
-674
-675
-676
-677
-678
-679
-680
-681
-682 protected boolean parseManifest(Dependency dependency, ArrayList<ClassNameInformation> classInformation) throws IOException {
-683 boolean foundSomething = false;
-684 JarFile jar = null ;
-685 try {
-686 jar = new JarFile(dependency.getActualFilePath());
-687
-688 final Manifest manifest = jar.getManifest();
-689
-690 if (manifest == null ) {
-691
-692 if (!dependency.getFileName().toLowerCase().endsWith("-sources.jar" )
-693 && !dependency.getFileName().toLowerCase().endsWith("-javadoc.jar" )
-694 && !dependency.getFileName().toLowerCase().endsWith("-src.jar" )
-695 && !dependency.getFileName().toLowerCase().endsWith("-doc.jar" )) {
-696 Logger.getLogger(JarAnalyzer.class
-697 .getName()).log(Level.INFO,
-698 String.format("Jar file '%s' does not contain a manifest." ,
-699 dependency.getFileName()));
-700 }
-701 return false;
-702 }
-703 final Attributes atts = manifest.getMainAttributes();
+499 LOGGER.log(Level.WARNING, msg);
+500 LOGGER.log(Level.FINE, null , ex);
+501 throw new AnalysisException (ex);
+502 } catch (IOException ex) {
+503 final String msg = String.format("Unable to parse pom '%s' in jar '%s' (IO Exception)" , path, jar.getName());
+504 LOGGER.log(Level.WARNING, msg);
+505 LOGGER.log(Level.FINE, "" , ex);
+506 throw new AnalysisException (ex);
+507 } catch (Throwable ex) {
+508 final String msg = String.format("Unexpected error during parsing of the pom '%s' in jar '%s'" , path, jar.getName());
+509 LOGGER.log(Level.WARNING, msg);
+510 LOGGER.log(Level.FINE, "" , ex);
+511 throw new AnalysisException (ex);
+512 }
+513 }
+514 return model;
+515 }
+516
+517
+518
+519
+520
+521
+522
+523
+524
+525 private Model readPom(SAXSource source) throws AnalysisException {
+526 Model model = null ;
+527 try {
+528 final XMLFilter filter = new MavenNamespaceFilter ();
+529 final SAXParserFactory spf = SAXParserFactory.newInstance();
+530 final SAXParser sp = spf.newSAXParser();
+531 final XMLReader xr = sp.getXMLReader();
+532 filter.setParent(xr);
+533 final JAXBElement<Model> el = pomUnmarshaller.unmarshal(source, Model.class );
+534 model = el.getValue();
+535 } catch (SecurityException ex) {
+536 throw new AnalysisException (ex);
+537 } catch (ParserConfigurationException ex) {
+538 throw new AnalysisException (ex);
+539 } catch (SAXException ex) {
+540 throw new AnalysisException (ex);
+541 } catch (JAXBException ex) {
+542 throw new AnalysisException (ex);
+543 } catch (Throwable ex) {
+544 throw new AnalysisException (ex);
+545 }
+546 return model;
+547 }
+548
+549
+550
+551
+552
+553
+554
+555
+556
+557
+558
+559 private boolean setPomEvidence(Dependency dependency, Model pom, Properties pomProperties, ArrayList<ClassNameInformation> classes) {
+560 boolean foundSomething = false;
+561 if (pom == null ) {
+562 return foundSomething;
+563 }
+564 String groupid = interpolateString(pom.getGroupId(), pomProperties);
+565 if (groupid != null && !groupid.isEmpty()) {
+566 if (groupid.startsWith("org." ) || groupid.startsWith("com." )) {
+567 groupid = groupid.substring(4);
+568 }
+569 foundSomething = true ;
+570 dependency.getVendorEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.HIGH);
+571 dependency.getProductEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.LOW);
+572 addMatchingValues(classes, groupid, dependency.getVendorEvidence());
+573 addMatchingValues(classes, groupid, dependency.getProductEvidence());
+574 }
+575 String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
+576 if (artifactid != null && !artifactid.isEmpty()) {
+577 if (artifactid.startsWith("org." ) || artifactid.startsWith("com." )) {
+578 artifactid = artifactid.substring(4);
+579 }
+580 foundSomething = true ;
+581 dependency.getProductEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.HIGH);
+582 dependency.getVendorEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.LOW);
+583 addMatchingValues(classes, artifactid, dependency.getVendorEvidence());
+584 addMatchingValues(classes, artifactid, dependency.getProductEvidence());
+585 }
+586
+587 final String version = interpolateString(pom.getVersion(), pomProperties);
+588 if (version != null && !version.isEmpty()) {
+589 foundSomething = true ;
+590 dependency.getVersionEvidence().addEvidence("pom" , "version" , version, Confidence.HIGHEST);
+591 }
+592
+593 final Organization org = pom.getOrganization();
+594 if (org != null && org.getName() != null ) {
+595 foundSomething = true ;
+596 final String orgName = interpolateString(org.getName(), pomProperties);
+597 if (orgName != null && !orgName.isEmpty()) {
+598 dependency.getVendorEvidence().addEvidence("pom" , "organization name" , orgName, Confidence.HIGH);
+599 addMatchingValues(classes, orgName, dependency.getVendorEvidence());
+600 }
+601 }
+602
+603 final String pomName = interpolateString(pom.getName(), pomProperties);
+604 if (pomName != null && !pomName.isEmpty()) {
+605 foundSomething = true ;
+606 dependency.getProductEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
+607 dependency.getVendorEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
+608 addMatchingValues(classes, pomName, dependency.getVendorEvidence());
+609 addMatchingValues(classes, pomName, dependency.getProductEvidence());
+610 }
+611
+612
+613 if (pom.getDescription() != null ) {
+614 foundSomething = true ;
+615 final String description = interpolateString(pom.getDescription(), pomProperties);
+616 if (description != null && !description.isEmpty()) {
+617 final String trimmedDescription = addDescription(dependency, description, "pom" , "description" );
+618 addMatchingValues(classes, trimmedDescription, dependency.getVendorEvidence());
+619 addMatchingValues(classes, trimmedDescription, dependency.getProductEvidence());
+620 }
+621 }
+622 extractLicense(pom, pomProperties, dependency);
+623 return foundSomething;
+624 }
+625
+626
+627
+628
+629
+630
+631
+632
+633
+634 protected void analyzePackageNames(ArrayList<ClassNameInformation> classNames,
+635 Dependency dependency, boolean addPackagesAsEvidence) {
+636 final HashMap<String, Integer> vendorIdentifiers = new HashMap<String, Integer>();
+637 final HashMap<String, Integer> productIdentifiers = new HashMap<String, Integer>();
+638 analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);
+639
+640 final int classCount = classNames.size();
+641 final EvidenceCollection vendor = dependency.getVendorEvidence();
+642 final EvidenceCollection product = dependency.getProductEvidence();
+643
+644 for (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {
+645 final float ratio = entry.getValue() / (float ) classCount;
+646 if (ratio > 0.5) {
+647
+648 vendor.addWeighting(entry.getKey());
+649 if (addPackagesAsEvidence && entry.getKey().length() > 1) {
+650 vendor.addEvidence("jar" , "package" , entry.getKey(), Confidence.LOW);
+651 }
+652 }
+653 }
+654 for (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {
+655 final float ratio = entry.getValue() / (float ) classCount;
+656 if (ratio > 0.5) {
+657 product.addWeighting(entry.getKey());
+658 if (addPackagesAsEvidence && entry.getKey().length() > 1) {
+659 product.addEvidence("jar" , "package" , entry.getKey(), Confidence.LOW);
+660 }
+661 }
+662 }
+663 }
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679 protected boolean parseManifest(Dependency dependency, ArrayList<ClassNameInformation> classInformation) throws IOException {
+680 boolean foundSomething = false;
+681 JarFile jar = null ;
+682 try {
+683 jar = new JarFile(dependency.getActualFilePath());
+684
+685 final Manifest manifest = jar.getManifest();
+686
+687 if (manifest == null ) {
+688
+689 if (!dependency.getFileName().toLowerCase().endsWith("-sources.jar" )
+690 && !dependency.getFileName().toLowerCase().endsWith("-javadoc.jar" )
+691 && !dependency.getFileName().toLowerCase().endsWith("-src.jar" )
+692 && !dependency.getFileName().toLowerCase().endsWith("-doc.jar" )) {
+693 LOGGER.log(Level.INFO,
+694 String.format("Jar file '%s' does not contain a manifest." ,
+695 dependency.getFileName()));
+696 }
+697 return false;
+698 }
+699 final Attributes atts = manifest.getMainAttributes();
+700
+701 final EvidenceCollection vendorEvidence = dependency.getVendorEvidence();
+702 final EvidenceCollection productEvidence = dependency.getProductEvidence();
+703 final EvidenceCollection versionEvidence = dependency.getVersionEvidence();
704
-705 final EvidenceCollection vendorEvidence = dependency.getVendorEvidence();
-706 final EvidenceCollection productEvidence = dependency.getProductEvidence();
-707 final EvidenceCollection versionEvidence = dependency.getVersionEvidence();
-708
-709 final String source = "Manifest" ;
-710
-711 for (Entry<Object, Object> entry : atts.entrySet()) {
-712 String key = entry.getKey().toString();
-713 String value = atts.getValue(key);
-714 if (HTML_DETECTION_PATTERN.matcher(value).find()) {
-715 value = Jsoup.parse(value).text();
-716 }
-717 if (IGNORE_VALUES.contains(value)) {
-718 continue ;
-719 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {
+705 final String source = "Manifest" ;
+706
+707 for (Entry<Object, Object> entry : atts.entrySet()) {
+708 String key = entry.getKey().toString();
+709 String value = atts.getValue(key);
+710 if (HTML_DETECTION_PATTERN.matcher(value).find()) {
+711 value = Jsoup.parse(value).text();
+712 }
+713 if (IGNORE_VALUES.contains(value)) {
+714 continue ;
+715 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {
+716 foundSomething = true ;
+717 productEvidence.addEvidence(source, key, value, Confidence.HIGH);
+718 addMatchingValues(classInformation, value, productEvidence);
+719 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {
720 foundSomething = true ;
-721 productEvidence.addEvidence(source, key, value, Confidence.HIGH);
-722 addMatchingValues(classInformation, value, productEvidence);
-723 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {
-724 foundSomething = true ;
-725 versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
-726 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {
+721 versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
+722 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {
+723 foundSomething = true ;
+724 vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
+725 addMatchingValues(classInformation, value, vendorEvidence);
+726 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {
727 foundSomething = true ;
-728 vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
+728 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
729 addMatchingValues(classInformation, value, vendorEvidence);
-730 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {
+730 } else if (key.equalsIgnoreCase(BUNDLE_DESCRIPTION)) {
731 foundSomething = true ;
-732 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-733 addMatchingValues(classInformation, value, vendorEvidence);
-734 } else if (key.equalsIgnoreCase(BUNDLE_DESCRIPTION)) {
-735 foundSomething = true ;
-736 addDescription(dependency, value, "manifest" , key);
-737
+732 addDescription(dependency, value, "manifest" , key);
+733
+734 addMatchingValues(classInformation, value, productEvidence);
+735 } else if (key.equalsIgnoreCase(BUNDLE_NAME)) {
+736 foundSomething = true ;
+737 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
738 addMatchingValues(classInformation, value, productEvidence);
-739 } else if (key.equalsIgnoreCase(BUNDLE_NAME)) {
+739 } else if (key.equalsIgnoreCase(BUNDLE_VENDOR)) {
740 foundSomething = true ;
-741 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-742 addMatchingValues(classInformation, value, productEvidence);
-743 } else if (key.equalsIgnoreCase(BUNDLE_VENDOR)) {
+741 vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
+742 addMatchingValues(classInformation, value, vendorEvidence);
+743 } else if (key.equalsIgnoreCase(BUNDLE_VERSION)) {
744 foundSomething = true ;
-745 vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
-746 addMatchingValues(classInformation, value, vendorEvidence);
-747 } else if (key.equalsIgnoreCase(BUNDLE_VERSION)) {
-748 foundSomething = true ;
-749 versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
-750 } else if (key.equalsIgnoreCase(Attributes.Name.MAIN_CLASS.toString())) {
-751 continue ;
-752
-753
-754
-755
-756
-757
-758
-759
-760 } else {
-761 key = key.toLowerCase();
-762
-763 if (!IGNORE_KEYS.contains(key)
-764 && !key.endsWith("jdk" )
-765 && !key.contains("lastmodified" )
-766 && !key.endsWith("package" )
-767 && !key.endsWith("classpath" )
-768 && !key.endsWith("class-path" )
-769 && !key.endsWith("-scm" )
-770 && !key.startsWith("scm-" )
-771 && !isImportPackage(key, value)
-772 && !isPackage(key, value)) {
-773
-774 foundSomething = true ;
-775 if (key.contains("version" )) {
-776 if (key.contains("specification" )) {
-777 versionEvidence.addEvidence(source, key, value, Confidence.LOW);
-778 } else {
-779 versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-780 }
-781 } else if ("build-id" .equals(key)) {
-782 int pos = value.indexOf('(');
+745 versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
+746 } else if (key.equalsIgnoreCase(Attributes.Name.MAIN_CLASS.toString())) {
+747 continue ;
+748
+749
+750
+751
+752
+753
+754
+755
+756 } else {
+757 key = key.toLowerCase();
+758
+759 if (!IGNORE_KEYS.contains(key)
+760 && !key.endsWith("jdk" )
+761 && !key.contains("lastmodified" )
+762 && !key.endsWith("package" )
+763 && !key.endsWith("classpath" )
+764 && !key.endsWith("class-path" )
+765 && !key.endsWith("-scm" )
+766 && !key.startsWith("scm-" )
+767 && !isImportPackage(key, value)
+768 && !isPackage(key, value)) {
+769
+770 foundSomething = true ;
+771 if (key.contains("version" )) {
+772 if (key.contains("specification" )) {
+773 versionEvidence.addEvidence(source, key, value, Confidence.LOW);
+774 } else {
+775 versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
+776 }
+777 } else if ("build-id" .equals(key)) {
+778 int pos = value.indexOf('(');
+779 if (pos >= 0) {
+780 value = value.substring(0, pos - 1);
+781 }
+782 pos = value.indexOf('[');
783 if (pos >= 0) {
784 value = value.substring(0, pos - 1);
785 }
-786 pos = value.indexOf('[');
-787 if (pos >= 0) {
-788 value = value.substring(0, pos - 1);
-789 }
-790 versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-791 } else if (key.contains("title" )) {
-792 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-793 addMatchingValues(classInformation, value, productEvidence);
-794 } else if (key.contains("vendor" )) {
-795 if (key.contains("specification" )) {
-796 vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
-797 } else {
-798 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-799 addMatchingValues(classInformation, value, vendorEvidence);
-800 }
-801 } else if (key.contains("name" )) {
-802 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-803 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
-804 addMatchingValues(classInformation, value, vendorEvidence);
-805 addMatchingValues(classInformation, value, productEvidence);
-806 } else if (key.contains("license" )) {
-807 addLicense(dependency, value);
-808 } else {
-809 if (key.contains("description" )) {
-810 addDescription(dependency, value, "manifest" , key);
-811 } else {
-812 productEvidence.addEvidence(source, key, value, Confidence.LOW);
-813 vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
-814 addMatchingValues(classInformation, value, vendorEvidence);
-815 addMatchingValues(classInformation, value, productEvidence);
-816 if (value.matches(".*\\d.*" )) {
-817 final StringTokenizer tokenizer = new StringTokenizer(value, " " );
-818 while (tokenizer.hasMoreElements()) {
-819 final String s = tokenizer.nextToken();
-820 if (s.matches("^[0-9.]+$" )) {
-821 versionEvidence.addEvidence(source, key, s, Confidence.LOW);
-822 }
-823 }
-824 }
-825 }
-826 }
-827 }
-828 }
+786 versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
+787 } else if (key.contains("title" )) {
+788 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
+789 addMatchingValues(classInformation, value, productEvidence);
+790 } else if (key.contains("vendor" )) {
+791 if (key.contains("specification" )) {
+792 vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
+793 } else {
+794 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
+795 addMatchingValues(classInformation, value, vendorEvidence);
+796 }
+797 } else if (key.contains("name" )) {
+798 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
+799 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
+800 addMatchingValues(classInformation, value, vendorEvidence);
+801 addMatchingValues(classInformation, value, productEvidence);
+802 } else if (key.contains("license" )) {
+803 addLicense(dependency, value);
+804 } else {
+805 if (key.contains("description" )) {
+806 addDescription(dependency, value, "manifest" , key);
+807 } else {
+808 productEvidence.addEvidence(source, key, value, Confidence.LOW);
+809 vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
+810 addMatchingValues(classInformation, value, vendorEvidence);
+811 addMatchingValues(classInformation, value, productEvidence);
+812 if (value.matches(".*\\d.*" )) {
+813 final StringTokenizer tokenizer = new StringTokenizer(value, " " );
+814 while (tokenizer.hasMoreElements()) {
+815 final String s = tokenizer.nextToken();
+816 if (s.matches("^[0-9.]+$" )) {
+817 versionEvidence.addEvidence(source, key, s, Confidence.LOW);
+818 }
+819 }
+820 }
+821 }
+822 }
+823 }
+824 }
+825 }
+826 } finally {
+827 if (jar != null ) {
+828 jar.close();
829 }
-830 } finally {
-831 if (jar != null ) {
-832 jar.close();
-833 }
-834 }
-835 return foundSomething;
-836 }
-837
-838
-839
-840
-841
-842
-843
-844
-845
-846
-847
-848
-849
-850 private String addDescription(Dependency dependency, String description, String source, String key) {
-851 if (dependency.getDescription() == null ) {
-852 dependency.setDescription(description);
-853 }
-854 String desc;
-855 if (HTML_DETECTION_PATTERN.matcher(description).find()) {
-856 desc = Jsoup.parse(description).text();
-857 } else {
-858 desc = description;
-859 }
-860 dependency.setDescription(desc);
-861 if (desc.length() > 100) {
-862 desc = desc.replaceAll("\\s\\s+" , " " );
-863 final int posSuchAs = desc.toLowerCase().indexOf("such as " , 100);
-864 final int posLike = desc.toLowerCase().indexOf("like " , 100);
-865 final int posWillUse = desc.toLowerCase().indexOf("will use " , 100);
-866 final int posUses = desc.toLowerCase().indexOf(" uses " , 100);
-867 int pos = -1;
-868 pos = Math.max(pos, posSuchAs);
-869 if (pos >= 0 && posLike >= 0) {
-870 pos = Math.min(pos, posLike);
-871 } else {
-872 pos = Math.max(pos, posLike);
-873 }
-874 if (pos >= 0 && posWillUse >= 0) {
-875 pos = Math.min(pos, posWillUse);
-876 } else {
-877 pos = Math.max(pos, posWillUse);
-878 }
-879 if (pos >= 0 && posUses >= 0) {
-880 pos = Math.min(pos, posUses);
-881 } else {
-882 pos = Math.max(pos, posUses);
-883 }
-884
-885 if (pos > 0) {
-886 final StringBuilder sb = new StringBuilder(pos + 3);
-887 sb.append(desc.substring(0, pos));
-888 sb.append("..." );
-889 desc = sb.toString();
-890 }
-891 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.LOW);
-892 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.LOW);
-893 } else {
-894 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
-895 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
-896 }
-897 return desc;
-898 }
-899
-900
-901
-902
-903
-904
-905
-906 private void addLicense(Dependency d, String license) {
-907 if (d.getLicense() == null ) {
-908 d.setLicense(license);
-909 } else if (!d.getLicense().contains(license)) {
-910 d.setLicense(d.getLicense() + NEWLINE + license);
-911 }
-912 }
-913
-914
-915
-916
-917 private File tempFileLocation = null ;
-918
-919
-920
-921
-922
-923
-924 @Override
-925 public void initializeFileTypeAnalyzer() throws Exception {
-926 final File baseDir = Settings.getTempDirectory();
-927 if (!baseDir.exists()) {
-928 if (!baseDir.mkdirs()) {
-929 final String msg = String.format("Unable to make a temporary folder '%s'" , baseDir.getPath());
-930 throw new AnalysisException (msg);
-931 }
-932 }
-933 tempFileLocation = File.createTempFile("check" , "tmp" , baseDir);
-934 if (!tempFileLocation.delete()) {
-935 final String msg = String.format("Unable to delete temporary file '%s'." , tempFileLocation.getAbsolutePath());
-936 throw new AnalysisException (msg);
-937 }
-938 if (!tempFileLocation.mkdirs()) {
-939 final String msg = String.format("Unable to create directory '%s'." , tempFileLocation.getAbsolutePath());
-940 throw new AnalysisException (msg);
-941 }
-942 }
-943
-944
-945
-946
-947 @Override
-948 public void close() {
-949 if (tempFileLocation != null && tempFileLocation.exists()) {
-950 LOGGER.log(Level.FINE, "Attempting to delete temporary files" );
-951 final boolean success = FileUtils.delete(tempFileLocation);
-952 if (!success) {
-953 LOGGER.log(Level.WARNING,
-954 "Failed to delete some temporary files, see the log for more details" );
-955 }
-956 }
-957 }
-958
-959
-960
-961
-962
-963
-964
-965
-966
-967
-968
-969
-970
-971
-972
-973
-974
-975
-976
-977
-978
-979
-980
-981
-982
-983
-984
-985
-986 protected String interpolateString(String text, Properties properties) {
-987 Properties props = properties;
-988 if (text == null ) {
-989 return text;
-990 }
-991 if (props == null ) {
-992 props = new Properties ();
-993 }
-994
-995 final int pos = text.indexOf("${" );
-996 if (pos < 0) {
-997 return text;
+830 }
+831 return foundSomething;
+832 }
+833
+834
+835
+836
+837
+838
+839
+840
+841
+842
+843
+844
+845
+846 private String addDescription(Dependency dependency, String description, String source, String key) {
+847 if (dependency.getDescription() == null ) {
+848 dependency.setDescription(description);
+849 }
+850 String desc;
+851 if (HTML_DETECTION_PATTERN.matcher(description).find()) {
+852 desc = Jsoup.parse(description).text();
+853 } else {
+854 desc = description;
+855 }
+856 dependency.setDescription(desc);
+857 if (desc.length() > 100) {
+858 desc = desc.replaceAll("\\s\\s+" , " " );
+859 final int posSuchAs = desc.toLowerCase().indexOf("such as " , 100);
+860 final int posLike = desc.toLowerCase().indexOf("like " , 100);
+861 final int posWillUse = desc.toLowerCase().indexOf("will use " , 100);
+862 final int posUses = desc.toLowerCase().indexOf(" uses " , 100);
+863 int pos = -1;
+864 pos = Math.max(pos, posSuchAs);
+865 if (pos >= 0 && posLike >= 0) {
+866 pos = Math.min(pos, posLike);
+867 } else {
+868 pos = Math.max(pos, posLike);
+869 }
+870 if (pos >= 0 && posWillUse >= 0) {
+871 pos = Math.min(pos, posWillUse);
+872 } else {
+873 pos = Math.max(pos, posWillUse);
+874 }
+875 if (pos >= 0 && posUses >= 0) {
+876 pos = Math.min(pos, posUses);
+877 } else {
+878 pos = Math.max(pos, posUses);
+879 }
+880
+881 if (pos > 0) {
+882 final StringBuilder sb = new StringBuilder(pos + 3);
+883 sb.append(desc.substring(0, pos));
+884 sb.append("..." );
+885 desc = sb.toString();
+886 }
+887 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.LOW);
+888 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.LOW);
+889 } else {
+890 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
+891 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
+892 }
+893 return desc;
+894 }
+895
+896
+897
+898
+899
+900
+901
+902 private void addLicense(Dependency d, String license) {
+903 if (d.getLicense() == null ) {
+904 d.setLicense(license);
+905 } else if (!d.getLicense().contains(license)) {
+906 d.setLicense(d.getLicense() + NEWLINE + license);
+907 }
+908 }
+909
+910
+911
+912
+913 private File tempFileLocation = null ;
+914
+915
+916
+917
+918
+919
+920 @Override
+921 public void initializeFileTypeAnalyzer() throws Exception {
+922 final File baseDir = Settings.getTempDirectory();
+923 tempFileLocation = File.createTempFile("check" , "tmp" , baseDir);
+924 if (!tempFileLocation.delete()) {
+925 final String msg = String.format("Unable to delete temporary file '%s'." , tempFileLocation.getAbsolutePath());
+926 throw new AnalysisException (msg);
+927 }
+928 if (!tempFileLocation.mkdirs()) {
+929 final String msg = String.format("Unable to create directory '%s'." , tempFileLocation.getAbsolutePath());
+930 throw new AnalysisException (msg);
+931 }
+932 }
+933
+934
+935
+936
+937 @Override
+938 public void close() {
+939 if (tempFileLocation != null && tempFileLocation.exists()) {
+940 LOGGER.log(Level.FINE, "Attempting to delete temporary files" );
+941 final boolean success = FileUtils.delete(tempFileLocation);
+942 if (!success) {
+943 LOGGER.log(Level.WARNING,
+944 "Failed to delete some temporary files, see the log for more details" );
+945 }
+946 }
+947 }
+948
+949
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964
+965
+966
+967
+968
+969
+970
+971
+972
+973
+974
+975
+976 protected String interpolateString(String text, Properties properties) {
+977 Properties props = properties;
+978 if (text == null ) {
+979 return text;
+980 }
+981 if (props == null ) {
+982 props = new Properties ();
+983 }
+984
+985 final int pos = text.indexOf("${" );
+986 if (pos < 0) {
+987 return text;
+988 }
+989 final int end = text.indexOf("}" );
+990 if (end < pos) {
+991 return text;
+992 }
+993
+994 final String propName = text.substring(pos + 2, end);
+995 String propValue = interpolateString(props.getProperty(propName), props);
+996 if (propValue == null ) {
+997 propValue = "" ;
998 }
-999 final int end = text.indexOf("}" );
-1000 if (end < pos) {
-1001 return text;
-1002 }
-1003
-1004 final String propName = text.substring(pos + 2, end);
-1005 String propValue = interpolateString(props.getProperty(propName), props);
-1006 if (propValue == null ) {
-1007 propValue = "" ;
-1008 }
-1009 final StringBuilder sb = new StringBuilder(propValue.length() + text.length());
-1010 sb.append(text.subSequence(0, pos));
-1011 sb.append(propValue);
-1012 sb.append(text.substring(end + 1));
-1013 return interpolateString(sb.toString(), props);
-1014 }
-1015
-1016
-1017
-1018
-1019
-1020
-1021
-1022
-1023 private boolean isImportPackage(String key, String value) {
-1024 final Pattern packageRx = Pattern.compile("^([a-zA-Z0-9_#\\$\\*\\.]+\\s*[,;]\\s*)+([a-zA-Z0-9_#\\$\\*\\.]+\\s*)?$" );
-1025 final boolean matches = packageRx.matcher(value).matches();
-1026 return matches && (key.contains("import" ) || key.contains("include" ) || value.length() > 10);
-1027 }
-1028
-1029
-1030
-1031
-1032
-1033
-1034
-1035
-1036 private ArrayList<ClassNameInformation> collectClassNames(Dependency dependency) {
-1037 final ArrayList<ClassNameInformation> classNames = new ArrayList<ClassNameInformation>();
-1038 JarFile jar = null ;
-1039 try {
-1040 jar = new JarFile(dependency.getActualFilePath());
-1041 final Enumeration entries = jar.entries();
-1042 while (entries.hasMoreElements()) {
-1043 final JarEntry entry = (JarEntry) entries.nextElement();
-1044 final String name = entry.getName().toLowerCase();
-1045
-1046 if (name.endsWith(".class" ) && !name.matches("^javax?\\..*$" )) {
-1047 final ClassNameInformation className = new ClassNameInformation (name.substring(0, name.length() - 6));
-1048 classNames.add(className);
-1049 }
-1050 }
-1051 } catch (IOException ex) {
-1052 final String msg = String.format("Unable to open jar file '%s'." , dependency.getFileName());
-1053 Logger
-1054 .getLogger(JarAnalyzer.class
-1055 .getName()).log(Level.WARNING, msg);
-1056 Logger.getLogger(JarAnalyzer.class
-1057 .getName()).log(Level.FINE, null , ex);
-1058 } finally {
-1059 if (jar != null ) {
-1060 try {
-1061 jar.close();
-1062 } catch (IOException ex) {
-1063 LOGGER.log(Level.FINEST, null , ex);
-1064 }
-1065 }
-1066 }
-1067 return classNames;
-1068 }
-1069
-1070
-1071
-1072
-1073
-1074
-1075
-1076
-1077
-1078 private void analyzeFullyQualifiedClassNames(ArrayList<ClassNameInformation> classNames,
-1079 HashMap<String, Integer> vendor, HashMap<String, Integer> product) {
-1080 for (ClassNameInformation entry : classNames) {
-1081 final ArrayList<String> list = entry.getPackageStructure();
-1082 addEntry(vendor, list.get(0));
-1083
-1084 if (list.size() == 2) {
-1085 addEntry(product, list.get(1));
-1086 }
-1087 if (list.size() == 3) {
-1088 addEntry(vendor, list.get(1));
-1089 addEntry(product, list.get(1));
-1090 addEntry(product, list.get(2));
-1091 }
-1092 if (list.size() >= 4) {
-1093 addEntry(vendor, list.get(1));
-1094 addEntry(vendor, list.get(2));
-1095 addEntry(product, list.get(1));
-1096 addEntry(product, list.get(2));
-1097 addEntry(product, list.get(3));
-1098 }
-1099 }
-1100 }
-1101
-1102
-1103
-1104
-1105
-1106
-1107
-1108
-1109 private void addEntry(HashMap<String, Integer> collection, String key) {
-1110 if (collection.containsKey(key)) {
-1111 collection.put(key, collection.get(key) + 1);
-1112 } else {
-1113 collection.put(key, 1);
-1114 }
-1115 }
-1116
-1117
-1118
-1119
-1120
-1121
-1122
-1123
-1124
-1125
-1126 private void addMatchingValues(ArrayList<ClassNameInformation> classes, String value, EvidenceCollection evidence) {
-1127 if (value == null || value.isEmpty()) {
-1128 return ;
-1129 }
-1130 final String text = value.toLowerCase();
-1131 for (ClassNameInformation cni : classes) {
-1132 for (String key : cni.getPackageStructure()) {
-1133 if (text.contains(key)) {
-1134 evidence.addEvidence("jar" , "package name" , key, Confidence.HIGHEST);
-1135 }
-1136 }
-1137 }
-1138 }
-1139
-1140
-1141
-1142
-1143
-1144
-1145
-1146
-1147 private boolean isPackage(String key, String value) {
-1148
-1149 return !key.matches(".*(version|title|vendor|name|license|description).*" )
-1150 && value.matches("^([a-zA-Z_][a-zA-Z0-9_\\$]*(\\.[a-zA-Z_][a-zA-Z0-9_\\$]*)*)?$" );
-1151
-1152 }
-1153
-1154
-1155
-1156
-1157
-1158
-1159
-1160
-1161
-1162 private void addPomEvidence(Dependency dependency, Model pom, Properties pomProperties) {
-1163 if (pom == null ) {
-1164 return ;
-1165 }
-1166 String groupid = interpolateString(pom.getGroupId(), pomProperties);
-1167 if (groupid != null && !groupid.isEmpty()) {
-1168 if (groupid.startsWith("org." ) || groupid.startsWith("com." )) {
-1169 groupid = groupid.substring(4);
-1170 }
-1171 dependency.getVendorEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.HIGH);
-1172 dependency.getProductEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.LOW);
-1173 }
-1174 String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
-1175 if (artifactid != null && !artifactid.isEmpty()) {
-1176 if (artifactid.startsWith("org." ) || artifactid.startsWith("com." )) {
-1177 artifactid = artifactid.substring(4);
-1178 }
-1179 dependency.getProductEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.HIGH);
-1180 dependency.getVendorEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.LOW);
-1181 }
-1182 final String version = interpolateString(pom.getVersion(), pomProperties);
-1183 if (version != null && !version.isEmpty()) {
-1184 dependency.getVersionEvidence().addEvidence("pom" , "version" , version, Confidence.HIGHEST);
-1185 }
-1186
-1187 final Parent parent = pom.getParent();
-1188 if (parent != null ) {
-1189 final String parentGroupId = interpolateString(parent.getGroupId(), pomProperties);
-1190 if (parentGroupId != null && !parentGroupId.isEmpty()) {
-1191 if (groupid == null || groupid.isEmpty()) {
-1192 dependency.getVendorEvidence().addEvidence("pom" , "parent.groupid" , parentGroupId, Confidence.HIGH);
-1193 } else {
-1194 dependency.getVendorEvidence().addEvidence("pom" , "parent.groupid" , parentGroupId, Confidence.MEDIUM);
-1195 }
-1196 dependency.getProductEvidence().addEvidence("pom" , "parent.groupid" , parentGroupId, Confidence.LOW);
-1197 }
-1198 final String parentArtifactId = interpolateString(parent.getArtifactId(), pomProperties);
-1199 if (parentArtifactId != null && !parentArtifactId.isEmpty()) {
-1200 if (artifactid == null || artifactid.isEmpty()) {
-1201 dependency.getProductEvidence().addEvidence("pom" , "parent.artifactid" , parentArtifactId, Confidence.HIGH);
-1202 } else {
-1203 dependency.getProductEvidence().addEvidence("pom" , "parent.artifactid" , parentArtifactId, Confidence.MEDIUM);
-1204 }
-1205 dependency.getVendorEvidence().addEvidence("pom" , "parent.artifactid" , parentArtifactId, Confidence.LOW);
-1206 }
-1207 final String parentVersion = interpolateString(parent.getVersion(), pomProperties);
-1208 if (parentVersion != null && !parentVersion.isEmpty()) {
-1209 if (version == null || version.isEmpty()) {
-1210 dependency.getVersionEvidence().addEvidence("pom" , "parent.version" , parentVersion, Confidence.HIGH);
-1211 } else {
-1212 dependency.getVersionEvidence().addEvidence("pom" , "parent.version" , parentVersion, Confidence.LOW);
-1213 }
-1214 }
-1215 }
-1216
-1217 final Organization org = pom.getOrganization();
-1218 if (org != null && org.getName() != null ) {
-1219 final String orgName = interpolateString(org.getName(), pomProperties);
-1220 if (orgName != null && !orgName.isEmpty()) {
-1221 dependency.getVendorEvidence().addEvidence("pom" , "organization name" , orgName, Confidence.HIGH);
-1222 }
-1223 }
-1224
-1225 final String pomName = interpolateString(pom.getName(), pomProperties);
-1226 if (pomName != null && !pomName.isEmpty()) {
-1227 dependency.getProductEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
-1228 dependency.getVendorEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
-1229 }
-1230
-1231
-1232 if (pom.getDescription() != null ) {
-1233 final String description = interpolateString(pom.getDescription(), pomProperties);
-1234 if (description != null && !description.isEmpty()) {
-1235 addDescription(dependency, description, "pom" , "description" );
-1236 }
-1237 }
-1238 extractLicense(pom, pomProperties, dependency);
-1239 }
-1240
-1241
-1242
-1243
-1244
-1245
-1246
-1247
-1248 private void extractLicense(Model pom, Properties pomProperties, Dependency dependency) {
-1249
-1250 if (pom.getLicenses() != null ) {
-1251 String license = null ;
-1252 for (License lic : pom.getLicenses().getLicense()) {
-1253 String tmp = null ;
-1254 if (lic.getName() != null ) {
-1255 tmp = interpolateString(lic.getName(), pomProperties);
+999 final StringBuilder sb = new StringBuilder(propValue.length() + text.length());
+1000 sb.append(text.subSequence(0, pos));
+1001 sb.append(propValue);
+1002 sb.append(text.substring(end + 1));
+1003 return interpolateString(sb.toString(), props);
+1004 }
+1005
+1006
+1007
+1008
+1009
+1010
+1011
+1012
+1013 private boolean isImportPackage(String key, String value) {
+1014 final Pattern packageRx = Pattern.compile("^([a-zA-Z0-9_#\\$\\*\\.]+\\s*[,;]\\s*)+([a-zA-Z0-9_#\\$\\*\\.]+\\s*)?$" );
+1015 final boolean matches = packageRx.matcher(value).matches();
+1016 return matches && (key.contains("import" ) || key.contains("include" ) || value.length() > 10);
+1017 }
+1018
+1019
+1020
+1021
+1022
+1023
+1024
+1025
+1026 private ArrayList<ClassNameInformation> collectClassNames(Dependency dependency) {
+1027 final ArrayList<ClassNameInformation> classNames = new ArrayList<ClassNameInformation>();
+1028 JarFile jar = null ;
+1029 try {
+1030 jar = new JarFile(dependency.getActualFilePath());
+1031 final Enumeration entries = jar.entries();
+1032 while (entries.hasMoreElements()) {
+1033 final JarEntry entry = (JarEntry) entries.nextElement();
+1034 final String name = entry.getName().toLowerCase();
+1035
+1036 if (name.endsWith(".class" ) && !name.matches("^javax?\\..*$" )) {
+1037 final ClassNameInformation className = new ClassNameInformation (name.substring(0, name.length() - 6));
+1038 classNames.add(className);
+1039 }
+1040 }
+1041 } catch (IOException ex) {
+1042 final String msg = String.format("Unable to open jar file '%s'." , dependency.getFileName());
+1043 LOGGER.log(Level.WARNING, msg);
+1044 LOGGER.log(Level.FINE, null , ex);
+1045 } finally {
+1046 if (jar != null ) {
+1047 try {
+1048 jar.close();
+1049 } catch (IOException ex) {
+1050 LOGGER.log(Level.FINEST, null , ex);
+1051 }
+1052 }
+1053 }
+1054 return classNames;
+1055 }
+1056
+1057
+1058
+1059
+1060
+1061
+1062
+1063
+1064
+1065 private void analyzeFullyQualifiedClassNames(ArrayList<ClassNameInformation> classNames,
+1066 HashMap<String, Integer> vendor, HashMap<String, Integer> product) {
+1067 for (ClassNameInformation entry : classNames) {
+1068 final ArrayList<String> list = entry.getPackageStructure();
+1069 addEntry(vendor, list.get(0));
+1070
+1071 if (list.size() == 2) {
+1072 addEntry(product, list.get(1));
+1073 }
+1074 if (list.size() == 3) {
+1075 addEntry(vendor, list.get(1));
+1076 addEntry(product, list.get(1));
+1077 addEntry(product, list.get(2));
+1078 }
+1079 if (list.size() >= 4) {
+1080 addEntry(vendor, list.get(1));
+1081 addEntry(vendor, list.get(2));
+1082 addEntry(product, list.get(1));
+1083 addEntry(product, list.get(2));
+1084 addEntry(product, list.get(3));
+1085 }
+1086 }
+1087 }
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096 private void addEntry(HashMap<String, Integer> collection, String key) {
+1097 if (collection.containsKey(key)) {
+1098 collection.put(key, collection.get(key) + 1);
+1099 } else {
+1100 collection.put(key, 1);
+1101 }
+1102 }
+1103
+1104
+1105
+1106
+1107
+1108
+1109
+1110
+1111
+1112
+1113 private void addMatchingValues(ArrayList<ClassNameInformation> classes, String value, EvidenceCollection evidence) {
+1114 if (value == null || value.isEmpty()) {
+1115 return ;
+1116 }
+1117 final String text = value.toLowerCase();
+1118 for (ClassNameInformation cni : classes) {
+1119 for (String key : cni.getPackageStructure()) {
+1120 if (text.contains(key)) {
+1121 evidence.addEvidence("jar" , "package name" , key, Confidence.HIGHEST);
+1122 }
+1123 }
+1124 }
+1125 }
+1126
+1127
+1128
+1129
+1130
+1131
+1132
+1133
+1134 private boolean isPackage(String key, String value) {
+1135
+1136 return !key.matches(".*(version|title|vendor|name|license|description).*" )
+1137 && value.matches("^([a-zA-Z_][a-zA-Z0-9_\\$]*(\\.[a-zA-Z_][a-zA-Z0-9_\\$]*)*)?$" );
+1138
+1139 }
+1140
+1141
+1142
+1143
+1144
+1145
+1146
+1147
+1148
+1149 private void addPomEvidence(Dependency dependency, Model pom, Properties pomProperties) {
+1150 if (pom == null ) {
+1151 return ;
+1152 }
+1153 String groupid = interpolateString(pom.getGroupId(), pomProperties);
+1154 if (groupid != null && !groupid.isEmpty()) {
+1155 if (groupid.startsWith("org." ) || groupid.startsWith("com." )) {
+1156 groupid = groupid.substring(4);
+1157 }
+1158 dependency.getVendorEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.HIGH);
+1159 dependency.getProductEvidence().addEvidence("pom" , "groupid" , groupid, Confidence.LOW);
+1160 }
+1161 String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
+1162 if (artifactid != null && !artifactid.isEmpty()) {
+1163 if (artifactid.startsWith("org." ) || artifactid.startsWith("com." )) {
+1164 artifactid = artifactid.substring(4);
+1165 }
+1166 dependency.getProductEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.HIGH);
+1167 dependency.getVendorEvidence().addEvidence("pom" , "artifactid" , artifactid, Confidence.LOW);
+1168 }
+1169 final String version = interpolateString(pom.getVersion(), pomProperties);
+1170 if (version != null && !version.isEmpty()) {
+1171 dependency.getVersionEvidence().addEvidence("pom" , "version" , version, Confidence.HIGHEST);
+1172 }
+1173
+1174 final Parent parent = pom.getParent();
+1175 if (parent != null ) {
+1176 final String parentGroupId = interpolateString(parent.getGroupId(), pomProperties);
+1177 if (parentGroupId != null && !parentGroupId.isEmpty()) {
+1178 if (groupid == null || groupid.isEmpty()) {
+1179 dependency.getVendorEvidence().addEvidence("pom" , "parent.groupid" , parentGroupId, Confidence.HIGH);
+1180 } else {
+1181 dependency.getVendorEvidence().addEvidence("pom" , "parent.groupid" , parentGroupId, Confidence.MEDIUM);
+1182 }
+1183 dependency.getProductEvidence().addEvidence("pom" , "parent.groupid" , parentGroupId, Confidence.LOW);
+1184 }
+1185 final String parentArtifactId = interpolateString(parent.getArtifactId(), pomProperties);
+1186 if (parentArtifactId != null && !parentArtifactId.isEmpty()) {
+1187 if (artifactid == null || artifactid.isEmpty()) {
+1188 dependency.getProductEvidence().addEvidence("pom" , "parent.artifactid" , parentArtifactId, Confidence.HIGH);
+1189 } else {
+1190 dependency.getProductEvidence().addEvidence("pom" , "parent.artifactid" , parentArtifactId, Confidence.MEDIUM);
+1191 }
+1192 dependency.getVendorEvidence().addEvidence("pom" , "parent.artifactid" , parentArtifactId, Confidence.LOW);
+1193 }
+1194 final String parentVersion = interpolateString(parent.getVersion(), pomProperties);
+1195 if (parentVersion != null && !parentVersion.isEmpty()) {
+1196 if (version == null || version.isEmpty()) {
+1197 dependency.getVersionEvidence().addEvidence("pom" , "parent.version" , parentVersion, Confidence.HIGH);
+1198 } else {
+1199 dependency.getVersionEvidence().addEvidence("pom" , "parent.version" , parentVersion, Confidence.LOW);
+1200 }
+1201 }
+1202 }
+1203
+1204 final Organization org = pom.getOrganization();
+1205 if (org != null && org.getName() != null ) {
+1206 final String orgName = interpolateString(org.getName(), pomProperties);
+1207 if (orgName != null && !orgName.isEmpty()) {
+1208 dependency.getVendorEvidence().addEvidence("pom" , "organization name" , orgName, Confidence.HIGH);
+1209 }
+1210 }
+1211
+1212 final String pomName = interpolateString(pom.getName(), pomProperties);
+1213 if (pomName != null && !pomName.isEmpty()) {
+1214 dependency.getProductEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
+1215 dependency.getVendorEvidence().addEvidence("pom" , "name" , pomName, Confidence.HIGH);
+1216 }
+1217
+1218
+1219 if (pom.getDescription() != null ) {
+1220 final String description = interpolateString(pom.getDescription(), pomProperties);
+1221 if (description != null && !description.isEmpty()) {
+1222 addDescription(dependency, description, "pom" , "description" );
+1223 }
+1224 }
+1225 extractLicense(pom, pomProperties, dependency);
+1226 }
+1227
+1228
+1229
+1230
+1231
+1232
+1233
+1234
+1235 private void extractLicense(Model pom, Properties pomProperties, Dependency dependency) {
+1236
+1237 if (pom.getLicenses() != null ) {
+1238 String license = null ;
+1239 for (License lic : pom.getLicenses().getLicense()) {
+1240 String tmp = null ;
+1241 if (lic.getName() != null ) {
+1242 tmp = interpolateString(lic.getName(), pomProperties);
+1243 }
+1244 if (lic.getUrl() != null ) {
+1245 if (tmp == null ) {
+1246 tmp = interpolateString(lic.getUrl(), pomProperties);
+1247 } else {
+1248 tmp += ": " + interpolateString(lic.getUrl(), pomProperties);
+1249 }
+1250 }
+1251 if (tmp == null ) {
+1252 continue ;
+1253 }
+1254 if (HTML_DETECTION_PATTERN.matcher(tmp).find()) {
+1255 tmp = Jsoup.parse(tmp).text();
1256 }
-1257 if (lic.getUrl() != null ) {
-1258 if (tmp == null ) {
-1259 tmp = interpolateString(lic.getUrl(), pomProperties);
-1260 } else {
-1261 tmp += ": " + interpolateString(lic.getUrl(), pomProperties);
-1262 }
-1263 }
-1264 if (tmp == null ) {
-1265 continue ;
-1266 }
-1267 if (HTML_DETECTION_PATTERN.matcher(tmp).find()) {
-1268 tmp = Jsoup.parse(tmp).text();
-1269 }
-1270 if (license == null ) {
-1271 license = tmp;
-1272 } else {
-1273 license += "\n" + tmp;
-1274 }
-1275 }
-1276 if (license != null ) {
-1277 dependency.setLicense(license);
-1278 }
-1279 }
-1280 }
-1281
-1282
-1283
-1284
-1285 protected static class ClassNameInformation {
-1286
-1287
-1288
-1289
-1290
-1291
-1292
-1293
-1294
-1295
-1296
-1297
-1298
-1299
-1300
-1301
-1302
-1303
-1304
-1305
-1306
-1307 ClassNameInformation (String className) {
-1308 name = className;
-1309 if (name.contains("/" )) {
-1310 final String[] tmp = className.toLowerCase().split("/" );
-1311 int start = 0;
-1312 int end = 3;
-1313 if ("com" .equals(tmp[0]) || "org" .equals(tmp[0])) {
-1314 start = 1;
-1315 end = 4;
-1316 }
-1317 if (tmp.length <= end) {
-1318 end = tmp.length - 1;
-1319 }
-1320 for (int i = start; i <= end; i++) {
-1321 packageStructure.add(tmp[i]);
-1322 }
-1323 } else {
-1324 packageStructure.add(name);
-1325 }
+1257 if (license == null ) {
+1258 license = tmp;
+1259 } else {
+1260 license += "\n" + tmp;
+1261 }
+1262 }
+1263 if (license != null ) {
+1264 dependency.setLicense(license);
+1265 }
+1266 }
+1267 }
+1268
+1269
+1270
+1271
+1272 protected static class ClassNameInformation {
+1273
+1274
+1275
+1276
+1277
+1278
+1279
+1280
+1281
+1282
+1283
+1284
+1285
+1286
+1287
+1288
+1289
+1290
+1291
+1292
+1293
+1294 ClassNameInformation (String className) {
+1295 name = className;
+1296 if (name.contains("/" )) {
+1297 final String[] tmp = className.toLowerCase().split("/" );
+1298 int start = 0;
+1299 int end = 3;
+1300 if ("com" .equals(tmp[0]) || "org" .equals(tmp[0])) {
+1301 start = 1;
+1302 end = 4;
+1303 }
+1304 if (tmp.length <= end) {
+1305 end = tmp.length - 1;
+1306 }
+1307 for (int i = start; i <= end; i++) {
+1308 packageStructure.add(tmp[i]);
+1309 }
+1310 } else {
+1311 packageStructure.add(name);
+1312 }
+1313 }
+1314
+1315
+1316
+1317 private String name;
+1318
+1319
+1320
+1321
+1322
+1323
+1324 public String getName() {
+1325 return name;
1326 }
-1327
-1328
-1329
-1330 private String name;
-1331
-1332
-1333
-1334
-1335
-1336
-1337 public String getName() {
-1338 return name;
-1339 }
+1327
+1328
+1329
+1330
+1331
+1332
+1333 public void setName(String name) {
+1334 this .name = name;
+1335 }
+1336
+1337
+1338
+1339 private final ArrayList<String> packageStructure = new ArrayList<String>();
1340
1341
-1342
+1342
1343
-1344
+1344
1345
-1346 public void setName(String name) {
-1347 this .name = name;
+1346 public ArrayList<String> getPackageStructure() {
+1347 return packageStructure;
1348 }
-1349
-1350
-1351
-1352 private final ArrayList<String> packageStructure = new ArrayList<String>();
-1353
-1354
-1355
-1356
-1357
-1358
-1359 public ArrayList<String> getPackageStructure() {
-1360 return packageStructure;
-1361 }
-1362 }
-1363
-1364
-1365
-1366
-1367
-1368
-1369
-1370 private File getNextTempDirectory() throws AnalysisException {
-1371 dirCount += 1;
-1372 final File directory = new File(tempFileLocation, String.valueOf(dirCount));
-1373
-1374 if (directory.exists()) {
-1375 return getNextTempDirectory();
-1376 }
-1377 if (!directory.mkdirs()) {
-1378 final String msg = String.format("Unable to create temp directory '%s'." , directory.getAbsolutePath());
-1379 throw new AnalysisException (msg);
-1380 }
-1381 return directory;
-1382 }
-1383 }
+1349 }
+1350
+1351
+1352
+1353
+1354
+1355
+1356
+1357 private File getNextTempDirectory() throws AnalysisException {
+1358 dirCount += 1;
+1359 final File directory = new File(tempFileLocation, String.valueOf(dirCount));
+1360
+1361 if (directory.exists()) {
+1362 return getNextTempDirectory();
+1363 }
+1364 if (!directory.mkdirs()) {
+1365 final String msg = String.format("Unable to create temp directory '%s'." , directory.getAbsolutePath());
+1366 throw new AnalysisException (msg);
+1367 }
+1368 return directory;
+1369 }
+1370 }
44
45 private static final Logger LOGGER = Logger.getLogger(JavaScriptAnalyzer.class .getName());
46
-47
+47
48
49
50
@@ -115,7 +115,7 @@
107
108 @Override
109 public void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException {
-110 BufferedReader fin = null ;;
+110 BufferedReader fin = null ;
111 try {
112
113 final Pattern extractComments = Pattern.compile("(/\\*([^*]|[\\r\\n]|(\\*+([^*/]|[\\r\\n])))*\\*+/)|(//.*)" , Pattern.MULTILINE);
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html
index 819504a89..dcff3b708 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html
@@ -176,7 +176,7 @@
168 LOGGER.info(String.format("invalid sha-1 hash on %s" , dependency.getFileName()));
169 } catch (FileNotFoundException fnfe) {
170
-171 LOGGER.fine(String.format("Artificat not found in repository '%s'" , dependency.getFileName()));
+171 LOGGER.fine(String.format("Artifact not found in repository '%s'" , dependency.getFileName()));
172 LOGGER.log(Level.FINE, fnfe.getMessage(), fnfe);
173 } catch (IOException ioe) {
174
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html
index c95329854..801a475ca 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html
@@ -117,38 +117,49 @@
109 }
110 }
111 }
-112 }
-113
-114
-115
-116
-117
-118
-119 @Override
-120 public String getName() {
-121 return "NVD CVE Analyzer" ;
-122 }
-123
-124
-125
-126
-127
-128
-129 @Override
-130 public AnalysisPhase getAnalysisPhase() {
-131 return AnalysisPhase.FINDING_ANALYSIS;
-132 }
-133
-134
-135
-136
-137
-138
-139 @Override
-140 public void initialize() throws Exception {
-141 this .open();
-142 }
-143 }
+112 for (Identifier id : dependency.getSuppressedIdentifiers()) {
+113 if ("cpe" .equals(id.getType())) {
+114 try {
+115 final String value = id.getValue();
+116 final List<Vulnerability> vulns = cveDB.getVulnerabilities(value);
+117 dependency.getSuppressedVulnerabilities().addAll(vulns);
+118 } catch (DatabaseException ex) {
+119 throw new AnalysisException (ex);
+120 }
+121 }
+122 }
+123 }
+124
+125
+126
+127
+128
+129
+130 @Override
+131 public String getName() {
+132 return "NVD CVE Analyzer" ;
+133 }
+134
+135
+136
+137
+138
+139
+140 @Override
+141 public AnalysisPhase getAnalysisPhase() {
+142 return AnalysisPhase.FINDING_ANALYSIS;
+143 }
+144
+145
+146
+147
+148
+149
+150 @Override
+151 public void initialize() throws Exception {
+152 this .open();
+153 }
+154 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.analyzer.exception
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.analyzer.exception
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.analyzer.exception
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.analyzer.exception
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.analyzer
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.analyzer
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.analyzer
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.analyzer
54
55
56 public final class CpeMemoryIndex {
-57
-58
-59
-60
-61 private static CpeMemoryIndex instance = new CpeMemoryIndex ();
-62
-63
-64
-65
-66 private CpeMemoryIndex () {
-67 }
-68
-69
-70
-71
-72
-73
-74 public static CpeMemoryIndex getInstance() {
-75 return instance;
-76 }
-77
-78
-79
-80 private RAMDirectory index;
-81
-82
-83
-84 private IndexReader indexReader;
-85
-86
-87
-88 private IndexSearcher indexSearcher;
-89
-90
-91
-92 private Analyzer searchingAnalyzer;
-93
-94
-95
-96 private QueryParser queryParser;
-97
-98
-99
-100 private SearchFieldAnalyzer productSearchFieldAnalyzer;
-101
-102
-103
-104 private SearchFieldAnalyzer vendorSearchFieldAnalyzer;
-105
-106
-107
-108
-109
-110
-111
-112 public void open(CveDB cve) throws IndexException {
-113 if (!openState) {
-114 index = new RAMDirectory();
-115 buildIndex(cve);
-116 try {
-117 indexReader = DirectoryReader.open(index);
-118 } catch (IOException ex) {
-119 throw new IndexException (ex);
-120 }
-121 indexSearcher = new IndexSearcher(indexReader);
-122 searchingAnalyzer = createSearchingAnalyzer();
-123 queryParser = new QueryParser(LuceneUtils.CURRENT_VERSION, Fields.DOCUMENT_KEY, searchingAnalyzer);
-124 openState = true ;
-125 }
-126 }
-127
-128
-129
-130 private boolean openState = false;
-131
-132
-133
-134
-135
-136
-137 public boolean isOpen() {
-138 return openState;
-139 }
-140
-141
-142
-143
-144
-145
-146 @SuppressWarnings("unchecked" )
-147 private Analyzer createIndexingAnalyzer() {
-148 final Map fieldAnalyzers = new HashMap();
-149 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-150 return new PerFieldAnalyzerWrapper(new FieldAnalyzer (LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
-151 }
-152
-153
-154
-155
-156
-157
-158 @SuppressWarnings("unchecked" )
-159 private Analyzer createSearchingAnalyzer() {
-160 final Map fieldAnalyzers = new HashMap();
-161 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-162 productSearchFieldAnalyzer = new SearchFieldAnalyzer (LuceneUtils.CURRENT_VERSION);
-163 vendorSearchFieldAnalyzer = new SearchFieldAnalyzer (LuceneUtils.CURRENT_VERSION);
-164 fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);
-165 fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);
-166
-167 return new PerFieldAnalyzerWrapper(new FieldAnalyzer (LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
-168 }
+57
+58
+59
+60 private static final Logger LOGGER = Logger.getLogger(CpeMemoryIndex.class .getName());
+61
+62
+63
+64 private static CpeMemoryIndex instance = new CpeMemoryIndex ();
+65
+66
+67
+68
+69 private CpeMemoryIndex () {
+70 }
+71
+72
+73
+74
+75
+76
+77 public static CpeMemoryIndex getInstance() {
+78 return instance;
+79 }
+80
+81
+82
+83 private RAMDirectory index;
+84
+85
+86
+87 private IndexReader indexReader;
+88
+89
+90
+91 private IndexSearcher indexSearcher;
+92
+93
+94
+95 private Analyzer searchingAnalyzer;
+96
+97
+98
+99 private QueryParser queryParser;
+100
+101
+102
+103 private SearchFieldAnalyzer productSearchFieldAnalyzer;
+104
+105
+106
+107 private SearchFieldAnalyzer vendorSearchFieldAnalyzer;
+108
+109
+110
+111
+112
+113
+114
+115 public void open(CveDB cve) throws IndexException {
+116 if (!openState) {
+117 index = new RAMDirectory();
+118 buildIndex(cve);
+119 try {
+120 indexReader = DirectoryReader.open(index);
+121 } catch (IOException ex) {
+122 throw new IndexException (ex);
+123 }
+124 indexSearcher = new IndexSearcher(indexReader);
+125 searchingAnalyzer = createSearchingAnalyzer();
+126 queryParser = new QueryParser(LuceneUtils.CURRENT_VERSION, Fields.DOCUMENT_KEY, searchingAnalyzer);
+127 openState = true ;
+128 }
+129 }
+130
+131
+132
+133 private boolean openState = false;
+134
+135
+136
+137
+138
+139
+140 public boolean isOpen() {
+141 return openState;
+142 }
+143
+144
+145
+146
+147
+148
+149 @SuppressWarnings("unchecked" )
+150 private Analyzer createIndexingAnalyzer() {
+151 final Map fieldAnalyzers = new HashMap();
+152 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
+153 return new PerFieldAnalyzerWrapper(new FieldAnalyzer (LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
+154 }
+155
+156
+157
+158
+159
+160
+161 @SuppressWarnings("unchecked" )
+162 private Analyzer createSearchingAnalyzer() {
+163 final Map fieldAnalyzers = new HashMap();
+164 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
+165 productSearchFieldAnalyzer = new SearchFieldAnalyzer (LuceneUtils.CURRENT_VERSION);
+166 vendorSearchFieldAnalyzer = new SearchFieldAnalyzer (LuceneUtils.CURRENT_VERSION);
+167 fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);
+168 fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);
169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179 public void saveEntry(String vendor, String product, IndexWriter indexWriter) throws CorruptIndexException, IOException {
-180 final Document doc = new Document();
-181 final Field v = new TextField(Fields.VENDOR, vendor, Field.Store.YES);
-182 final Field p = new TextField(Fields.PRODUCT, product, Field.Store.YES);
-183 doc.add(v);
-184 doc.add(p);
-185 indexWriter.addDocument(doc);
-186 }
-187
-188
-189
-190
-191 public void close() {
-192 if (searchingAnalyzer != null ) {
-193 searchingAnalyzer.close();
-194 searchingAnalyzer = null ;
-195 }
-196 if (indexReader != null ) {
-197 try {
-198 indexReader.close();
-199 } catch (IOException ex) {
-200 Logger.getLogger(CpeMemoryIndex.class .getName()).log(Level.FINEST, null , ex);
-201 }
-202 indexReader = null ;
-203 }
-204 queryParser = null ;
-205 indexSearcher = null ;
-206 if (index != null ) {
-207 index.close();
-208 index = null ;
-209 }
-210 openState = false;
-211 }
-212
-213
-214
-215
-216
-217
-218
-219 private void buildIndex(CveDB cve) throws IndexException {
-220 Analyzer analyzer = null ;
-221 IndexWriter indexWriter = null ;
-222 try {
-223 analyzer = createIndexingAnalyzer();
-224 final IndexWriterConfig conf = new IndexWriterConfig(LuceneUtils.CURRENT_VERSION, analyzer);
-225 indexWriter = new IndexWriter(index, conf);
-226 try {
-227 final Set<Pair<String, String>> data = cve.getVendorProductList();
-228 for (Pair<String, String> pair : data) {
-229 saveEntry(pair.getLeft(), pair.getRight(), indexWriter);
-230 }
-231 } catch (DatabaseException ex) {
-232 Logger.getLogger(CpeMemoryIndex.class .getName()).log(Level.FINE, null , ex);
-233 throw new IndexException ("Error reading CPE data" , ex);
-234 }
-235 } catch (CorruptIndexException ex) {
-236 throw new IndexException ("Unable to close an in-memory index" , ex);
-237 } catch (IOException ex) {
-238 throw new IndexException ("Unable to close an in-memory index" , ex);
-239 } finally {
-240 if (indexWriter != null ) {
-241 try {
-242 try {
-243 indexWriter.commit();
-244 } finally {
-245 indexWriter.close(true );
-246 }
-247 } catch (CorruptIndexException ex) {
-248 throw new IndexException ("Unable to close an in-memory index" , ex);
-249 } catch (IOException ex) {
-250 throw new IndexException ("Unable to close an in-memory index" , ex);
-251 }
-252 if (analyzer != null ) {
-253 analyzer.close();
+170 return new PerFieldAnalyzerWrapper(new FieldAnalyzer (LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
+171 }
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182 public void saveEntry(String vendor, String product, IndexWriter indexWriter) throws CorruptIndexException, IOException {
+183 final Document doc = new Document();
+184 final Field v = new TextField(Fields.VENDOR, vendor, Field.Store.YES);
+185 final Field p = new TextField(Fields.PRODUCT, product, Field.Store.YES);
+186 doc.add(v);
+187 doc.add(p);
+188 indexWriter.addDocument(doc);
+189 }
+190
+191
+192
+193
+194 public void close() {
+195 if (searchingAnalyzer != null ) {
+196 searchingAnalyzer.close();
+197 searchingAnalyzer = null ;
+198 }
+199 if (indexReader != null ) {
+200 try {
+201 indexReader.close();
+202 } catch (IOException ex) {
+203 LOGGER.log(Level.FINEST, null , ex);
+204 }
+205 indexReader = null ;
+206 }
+207 queryParser = null ;
+208 indexSearcher = null ;
+209 if (index != null ) {
+210 index.close();
+211 index = null ;
+212 }
+213 openState = false;
+214 }
+215
+216
+217
+218
+219
+220
+221
+222 private void buildIndex(CveDB cve) throws IndexException {
+223 Analyzer analyzer = null ;
+224 IndexWriter indexWriter = null ;
+225 try {
+226 analyzer = createIndexingAnalyzer();
+227 final IndexWriterConfig conf = new IndexWriterConfig(LuceneUtils.CURRENT_VERSION, analyzer);
+228 indexWriter = new IndexWriter(index, conf);
+229 try {
+230 final Set<Pair<String, String>> data = cve.getVendorProductList();
+231 for (Pair<String, String> pair : data) {
+232 saveEntry(pair.getLeft(), pair.getRight(), indexWriter);
+233 }
+234 } catch (DatabaseException ex) {
+235 LOGGER.log(Level.FINE, null , ex);
+236 throw new IndexException ("Error reading CPE data" , ex);
+237 }
+238 } catch (CorruptIndexException ex) {
+239 throw new IndexException ("Unable to close an in-memory index" , ex);
+240 } catch (IOException ex) {
+241 throw new IndexException ("Unable to close an in-memory index" , ex);
+242 } finally {
+243 if (indexWriter != null ) {
+244 try {
+245 try {
+246 indexWriter.commit();
+247 } finally {
+248 indexWriter.close(true );
+249 }
+250 } catch (CorruptIndexException ex) {
+251 throw new IndexException ("Unable to close an in-memory index" , ex);
+252 } catch (IOException ex) {
+253 throw new IndexException ("Unable to close an in-memory index" , ex);
254 }
-255 }
-256 }
-257 }
-258
-259
-260
-261
-262 private void resetSearchingAnalyzer() {
-263 if (productSearchFieldAnalyzer != null ) {
-264 productSearchFieldAnalyzer.clear();
-265 }
-266 if (vendorSearchFieldAnalyzer != null ) {
-267 vendorSearchFieldAnalyzer.clear();
+255 if (analyzer != null ) {
+256 analyzer.close();
+257 }
+258 }
+259 }
+260 }
+261
+262
+263
+264
+265 private void resetSearchingAnalyzer() {
+266 if (productSearchFieldAnalyzer != null ) {
+267 productSearchFieldAnalyzer.clear();
268 }
-269 }
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279
-280 public TopDocs search(String searchString, int maxQueryResults) throws ParseException, IOException {
-281 if (searchString == null || searchString.trim().isEmpty()) {
-282 throw new ParseException("Query is null or empty" );
-283 }
-284 final Query query = queryParser.parse(searchString);
-285 return indexSearcher.search(query, maxQueryResults);
-286 }
-287
-288
-289
-290
-291
-292
-293
-294
-295
-296
-297 public TopDocs search(Query query, int maxQueryResults) throws CorruptIndexException, IOException {
-298 resetSearchingAnalyzer();
-299 return indexSearcher.search(query, maxQueryResults);
-300 }
-301
-302
-303
-304
-305
-306
-307
-308
-309 public Document getDocument(int documentId) throws IOException {
-310 return indexSearcher.doc(documentId);
-311 }
-312
-313
-314
-315
-316
-317
-318 public int numDocs() {
-319 if (indexReader == null ) {
-320 return -1;
-321 }
-322 return indexReader.numDocs();
-323 }
-324 }
+269 if (vendorSearchFieldAnalyzer != null ) {
+270 vendorSearchFieldAnalyzer.clear();
+271 }
+272 }
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283 public TopDocs search(String searchString, int maxQueryResults) throws ParseException, IOException {
+284 if (searchString == null || searchString.trim().isEmpty()) {
+285 throw new ParseException("Query is null or empty" );
+286 }
+287 final Query query = queryParser.parse(searchString);
+288 return indexSearcher.search(query, maxQueryResults);
+289 }
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300 public TopDocs search(Query query, int maxQueryResults) throws CorruptIndexException, IOException {
+301 resetSearchingAnalyzer();
+302 return indexSearcher.search(query, maxQueryResults);
+303 }
+304
+305
+306
+307
+308
+309
+310
+311
+312 public Document getDocument(int documentId) throws IOException {
+313 return indexSearcher.doc(documentId);
+314 }
+315
+316
+317
+318
+319
+320
+321 public int numDocs() {
+322 if (indexReader == null ) {
+323 return -1;
+324 }
+325 return indexReader.numDocs();
+326 }
+327 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cpe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cpe
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cpe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cpe
29
30
31 public final class CweDB {
-32
-33
-34
-35
-36 private CweDB () {
-37
-38 }
-39
-40
-41
-42 private static final HashMap<String, String> CWE = loadData();
-43
-44
-45
-46
-47
-48
-49 private static HashMap<String, String> loadData() {
-50 ObjectInputStream oin = null ;
-51 try {
-52 final String filePath = "data/cwe.hashmap.serialized" ;
-53 final InputStream input = CweDB.class .getClassLoader().getResourceAsStream(filePath);
-54 oin = new ObjectInputStream(input);
-55 return (HashMap<String, String>) oin.readObject();
-56 } catch (ClassNotFoundException ex) {
-57 Logger.getLogger(CweDB.class .getName()).log(Level.WARNING, "Unable to load CWE data. This should not be an issue." );
-58 Logger.getLogger(CweDB.class .getName()).log(Level.FINE, null , ex);
-59 } catch (IOException ex) {
-60 Logger.getLogger(CweDB.class .getName()).log(Level.WARNING, "Unable to load CWE data due to an IO Error. This should not be an issue." );
-61 Logger.getLogger(CweDB.class .getName()).log(Level.FINE, null , ex);
-62 } finally {
-63 if (oin != null ) {
-64 try {
-65 oin.close();
-66 } catch (IOException ex) {
-67 Logger.getLogger(CweDB.class .getName()).log(Level.FINEST, null , ex);
-68 }
-69 }
-70 }
-71 return null ;
-72 }
-73
-74
-75
-76
-77
-78
-79
-80
-81 public static String getCweName(String cweId) {
-82 if (cweId != null ) {
-83 return CWE.get(cweId);
-84 }
-85 return null ;
-86 }
-87 }
+32
+33
+34
+35 private static final Logger LOGGER = Logger.getLogger(CweDB.class .getName());
+36
+37
+38
+39 private CweDB () {
+40
+41 }
+42
+43
+44
+45 private static final HashMap<String, String> CWE = loadData();
+46
+47
+48
+49
+50
+51
+52 private static HashMap<String, String> loadData() {
+53 ObjectInputStream oin = null ;
+54 try {
+55 final String filePath = "data/cwe.hashmap.serialized" ;
+56 final InputStream input = CweDB.class .getClassLoader().getResourceAsStream(filePath);
+57 oin = new ObjectInputStream(input);
+58 return (HashMap<String, String>) oin.readObject();
+59 } catch (ClassNotFoundException ex) {
+60 LOGGER.log(Level.WARNING, "Unable to load CWE data. This should not be an issue." );
+61 LOGGER.log(Level.FINE, null , ex);
+62 } catch (IOException ex) {
+63 LOGGER.log(Level.WARNING, "Unable to load CWE data due to an IO Error. This should not be an issue." );
+64 LOGGER.log(Level.FINE, null , ex);
+65 } finally {
+66 if (oin != null ) {
+67 try {
+68 oin.close();
+69 } catch (IOException ex) {
+70 LOGGER.log(Level.FINEST, null , ex);
+71 }
+72 }
+73 }
+74 return null ;
+75 }
+76
+77
+78
+79
+80
+81
+82
+83
+84 public static String getCweName(String cweId) {
+85 if (cweId != null ) {
+86 return CWE.get(cweId);
+87 }
+88 return null ;
+89 }
+90 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cwe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cwe
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.cwe
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.cwe
36
37
38 public final class UrlTokenizingFilter extends AbstractTokenizingFilter {
-39
-40
-41
-42
-43
-44
-45 public UrlTokenizingFilter (TokenStream stream) {
-46 super (stream);
-47 }
-48
-49
-50
-51
-52
-53
-54
-55
-56 @Override
-57 public boolean incrementToken() throws IOException {
-58 final LinkedList<String> tokens = getTokens();
-59 final CharTermAttribute termAtt = getTermAtt();
-60 if (tokens.size() == 0 && input.incrementToken()) {
-61 final String text = new String(termAtt.buffer(), 0, termAtt.length());
-62 if (UrlStringUtils.containsUrl(text)) {
-63 final String[] parts = text.split("\\s" );
-64 for (String part : parts) {
-65 if (UrlStringUtils.isUrl(part)) {
-66 try {
-67 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
-68 tokens.addAll(data);
-69 } catch (MalformedURLException ex) {
-70 Logger.getLogger(UrlTokenizingFilter.class .getName()).log(Level.FINE, "error parsing " + part, ex);
-71 tokens.add(part);
-72 }
-73 } else {
-74 tokens.add(part);
-75 }
-76 }
-77 } else {
-78 tokens.add(text);
-79 }
-80 }
-81 return addTerm();
-82 }
-83 }
+39
+40
+41
+42 private static final Logger LOGGER = Logger.getLogger(UrlTokenizingFilter.class .getName());
+43
+44
+45
+46
+47
+48 public UrlTokenizingFilter (TokenStream stream) {
+49 super (stream);
+50 }
+51
+52
+53
+54
+55
+56
+57
+58
+59 @Override
+60 public boolean incrementToken() throws IOException {
+61 final LinkedList<String> tokens = getTokens();
+62 final CharTermAttribute termAtt = getTermAtt();
+63 if (tokens.size() == 0 && input.incrementToken()) {
+64 final String text = new String(termAtt.buffer(), 0, termAtt.length());
+65 if (UrlStringUtils.containsUrl(text)) {
+66 final String[] parts = text.split("\\s" );
+67 for (String part : parts) {
+68 if (UrlStringUtils.isUrl(part)) {
+69 try {
+70 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
+71 tokens.addAll(data);
+72 } catch (MalformedURLException ex) {
+73 LOGGER.log(Level.FINE, "error parsing " + part, ex);
+74 tokens.add(part);
+75 }
+76 } else {
+77 tokens.add(part);
+78 }
+79 }
+80 } else {
+81 tokens.add(text);
+82 }
+83 }
+84 return addTerm();
+85 }
+86 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.lucene
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.lucene
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.lucene
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.lucene
21 import java.io.IOException;
22 import java.net.HttpURLConnection;
23 import java.net.URL;
-24 import java.net.URLConnection;
-25 import java.util.logging.Level;
-26 import java.util.logging.Logger;
-27 import javax.xml.parsers.DocumentBuilder;
-28 import javax.xml.parsers.DocumentBuilderFactory;
-29 import javax.xml.xpath.XPath;
-30 import javax.xml.xpath.XPathFactory;
-31 import org.owasp.dependencycheck.utils.InvalidSettingException;
-32 import org.owasp.dependencycheck.utils.Settings;
-33 import org.owasp.dependencycheck.utils.URLConnectionFactory;
-34 import org.w3c.dom.Document;
-35
-36
-37
-38
-39
-40
-41 public class NexusSearch {
-42
-43
-44
-45
-46 private final URL rootURL;
-47
-48
-49
-50
-51 private boolean useProxy;
-52
-53
-54
-55
-56 private static final Logger LOGGER = Logger.getLogger(NexusSearch.class
-57 .getName());
-58
-59
-60
-61
-62
-63
-64
-65 public NexusSearch (URL rootURL) {
-66 this .rootURL = rootURL;
-67 try {
-68 if (null != Settings.getString(Settings.KEYS.PROXY_URL)
-69 && Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY)) {
-70 useProxy = true ;
-71 LOGGER.fine("Using proxy" );
-72 } else {
-73 useProxy = false;
-74 LOGGER.fine("Not using proxy" );
-75 }
-76 } catch (InvalidSettingException ise) {
-77 useProxy = false;
-78 }
-79 }
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90 public MavenArtifact searchSha1(String sha1) throws IOException {
-91 if (null == sha1 || !sha1.matches("^[0-9A-Fa-f]{40}$" )) {
-92 throw new IllegalArgumentException("Invalid SHA1 format" );
-93 }
-94
-95 final URL url = new URL(rootURL, String.format("identify/sha1/%s" ,
-96 sha1.toLowerCase()));
-97
-98 LOGGER.fine(String.format("Searching Nexus url %s" , url.toString()));
-99
-100
-101
-102
-103
-104
-105 URLConnection conn = null ;
-106 conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
+24 import java.util.logging.Level;
+25 import java.util.logging.Logger;
+26 import javax.xml.parsers.DocumentBuilder;
+27 import javax.xml.parsers.DocumentBuilderFactory;
+28 import javax.xml.xpath.XPath;
+29 import javax.xml.xpath.XPathFactory;
+30 import org.owasp.dependencycheck.utils.InvalidSettingException;
+31 import org.owasp.dependencycheck.utils.Settings;
+32 import org.owasp.dependencycheck.utils.URLConnectionFactory;
+33 import org.w3c.dom.Document;
+34
+35
+36
+37
+38
+39
+40 public class NexusSearch {
+41
+42
+43
+44
+45 private final URL rootURL;
+46
+47
+48
+49
+50 private boolean useProxy;
+51
+52
+53
+54
+55 private static final Logger LOGGER = Logger.getLogger(NexusSearch.class
+56 .getName());
+57
+58
+59
+60
+61
+62
+63
+64 public NexusSearch (URL rootURL) {
+65 this .rootURL = rootURL;
+66 try {
+67 if (null != Settings.getString(Settings.KEYS.PROXY_URL)
+68 && Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY)) {
+69 useProxy = true ;
+70 LOGGER.fine("Using proxy" );
+71 } else {
+72 useProxy = false;
+73 LOGGER.fine("Not using proxy" );
+74 }
+75 } catch (InvalidSettingException ise) {
+76 useProxy = false;
+77 }
+78 }
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89 public MavenArtifact searchSha1(String sha1) throws IOException {
+90 if (null == sha1 || !sha1.matches("^[0-9A-Fa-f]{40}$" )) {
+91 throw new IllegalArgumentException("Invalid SHA1 format" );
+92 }
+93
+94 final URL url = new URL(rootURL, String.format("identify/sha1/%s" ,
+95 sha1.toLowerCase()));
+96
+97 LOGGER.fine(String.format("Searching Nexus url %s" , url.toString()));
+98
+99
+100
+101
+102
+103
+104 final HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
+105
+106 conn.setDoOutput(true );
107
-108 conn.setDoOutput(true );
-109
-110
-111
-112 conn.addRequestProperty("Accept" , "application/xml" );
-113 conn.connect();
-114
-115 try {
-116 final DocumentBuilder builder = DocumentBuilderFactory
-117 .newInstance().newDocumentBuilder();
-118 final Document doc = builder.parse(conn.getInputStream());
-119 final XPath xpath = XPathFactory.newInstance().newXPath();
-120 final String groupId = xpath
-121 .evaluate(
-122 "/org.sonatype.nexus.rest.model.NexusArtifact/groupId" ,
-123 doc);
-124 final String artifactId = xpath.evaluate(
-125 "/org.sonatype.nexus.rest.model.NexusArtifact/artifactId" ,
-126 doc);
-127 final String version = xpath
-128 .evaluate(
-129 "/org.sonatype.nexus.rest.model.NexusArtifact/version" ,
-130 doc);
-131 final String link = xpath
-132 .evaluate(
-133 "/org.sonatype.nexus.rest.model.NexusArtifact/artifactLink" ,
-134 doc);
-135 return new MavenArtifact (groupId, artifactId, version, link);
-136 } catch (FileNotFoundException fnfe) {
-137
-138
-139
-140 throw fnfe;
-141 } catch (Throwable e) {
-142
-143
-144 throw new IOException(e.getMessage(), e);
-145 }
-146 }
-147
-148
-149
-150
-151
-152
-153 public boolean preflightRequest() {
-154 try {
-155 final HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(new URL(rootURL, "status" ), useProxy);
-156 conn.addRequestProperty("Accept" , "application/xml" );
-157 conn.connect();
-158 if (conn.getResponseCode() != 200) {
-159 LOGGER.log(Level.WARNING, "Expected 200 result from Nexus, got {0}" , conn.getResponseCode());
-160 return false;
-161 }
-162 final DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-163 final Document doc = builder.parse(conn.getInputStream());
-164 if (!"status" .equals(doc.getDocumentElement().getNodeName())) {
-165 LOGGER.log(Level.WARNING, "Expected root node name of status, got {0}" , doc.getDocumentElement().getNodeName());
-166 return false;
-167 }
-168 } catch (Throwable e) {
-169 return false;
-170 }
-171
-172 return true ;
-173 }
-174 }
-175
-176
+108
+109
+110 conn.addRequestProperty("Accept" , "application/xml" );
+111 conn.connect();
+112
+113 if (conn.getResponseCode() == 200) {
+114 try {
+115 final DocumentBuilder builder = DocumentBuilderFactory
+116 .newInstance().newDocumentBuilder();
+117 final Document doc = builder.parse(conn.getInputStream());
+118 final XPath xpath = XPathFactory.newInstance().newXPath();
+119 final String groupId = xpath
+120 .evaluate(
+121 "/org.sonatype.nexus.rest.model.NexusArtifact/groupId" ,
+122 doc);
+123 final String artifactId = xpath.evaluate(
+124 "/org.sonatype.nexus.rest.model.NexusArtifact/artifactId" ,
+125 doc);
+126 final String version = xpath
+127 .evaluate(
+128 "/org.sonatype.nexus.rest.model.NexusArtifact/version" ,
+129 doc);
+130 final String link = xpath
+131 .evaluate(
+132 "/org.sonatype.nexus.rest.model.NexusArtifact/artifactLink" ,
+133 doc);
+134 return new MavenArtifact (groupId, artifactId, version, link);
+135 } catch (Throwable e) {
+136
+137
+138 throw new IOException(e.getMessage(), e);
+139 }
+140 } else if (conn.getResponseCode() == 404) {
+141 throw new FileNotFoundException("Artifact not found in Nexus" );
+142 } else {
+143 final String msg = String.format("Could not connect to Nexus received response code: %d %s" ,
+144 conn.getResponseCode(), conn.getResponseMessage());
+145 LOGGER.fine(msg);
+146 throw new IOException(msg);
+147 }
+148 }
+149
+150
+151
+152
+153
+154
+155 public boolean preflightRequest() {
+156 try {
+157 final HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(new URL(rootURL, "status" ), useProxy);
+158 conn.addRequestProperty("Accept" , "application/xml" );
+159 conn.connect();
+160 if (conn.getResponseCode() != 200) {
+161 LOGGER.log(Level.WARNING, "Expected 200 result from Nexus, got {0}" , conn.getResponseCode());
+162 return false;
+163 }
+164 final DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+165 final Document doc = builder.parse(conn.getInputStream());
+166 if (!"status" .equals(doc.getDocumentElement().getNodeName())) {
+167 LOGGER.log(Level.WARNING, "Expected root node name of status, got {0}" , doc.getDocumentElement().getNodeName());
+168 return false;
+169 }
+170 } catch (Throwable e) {
+171 return false;
+172 }
+173
+174 return true ;
+175 }
+176 }
+177
+178
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nexus
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nexus
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nexus
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nexus
56
57
58
-59
+59
60
61
62
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html
index 051cf781f..47a487b56 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nuget
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nuget
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nuget
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nuget
42
43
44 public final class ConnectionFactory {
-45
-46
-47
-48
-49 public static final String DB_SCHEMA_VERSION = "2.9" ;
-50
-51
-52
-53 public static final String DB_STRUCTURE_RESOURCE = "data/initialize.sql" ;
-54
-55
-56
-57 private static Driver driver = null ;
-58
-59
-60
-61 private static String connectionString = null ;
-62
-63
-64
-65 private static String userName = null ;
-66
-67
-68
-69 private static String password = null ;
-70
-71
-72
-73
-74 private ConnectionFactory () {
-75 }
-76
-77
-78
-79
-80
-81
-82
-83 public static synchronized void initialize() throws DatabaseException {
-84
-85 if (connectionString != null ) {
-86 return ;
-87 }
-88 Connection conn = null ;
-89 try {
-90
-91 final String driverName = Settings.getString(Settings.KEYS.DB_DRIVER_NAME, "" );
-92 if (!driverName.isEmpty()) {
-93 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Loading driver: {0}" , driverName);
-94 final String driverPath = Settings.getString(Settings.KEYS.DB_DRIVER_PATH, "" );
-95 try {
-96 if (!driverPath.isEmpty()) {
-97 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Loading driver from: {0}" , driverPath);
-98 driver = DriverLoader.load(driverName, driverPath);
-99 } else {
-100 driver = DriverLoader.load(driverName);
-101 }
-102 } catch (DriverLoadException ex) {
-103 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, "Unable to load database driver" , ex);
-104 throw new DatabaseException ("Unable to load database driver" );
-105 }
-106 }
-107 userName = Settings.getString(Settings.KEYS.DB_USER, "dcuser" );
-108
-109 password = Settings.getString(Settings.KEYS.DB_PASSWORD, "DC-Pass1337!" );
-110 try {
-111 connectionString = getConnectionString();
-112 } catch (IOException ex) {
-113 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE,
-114 "Unable to retrieve the database connection string" , ex);
-115 throw new DatabaseException ("Unable to retrieve the database connection string" );
-116 }
-117 boolean shouldCreateSchema = false;
-118 try {
-119 if (connectionString.startsWith("jdbc:h2:file:" )) {
-120 shouldCreateSchema = !dbSchemaExists();
-121 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Need to create DB Structure: {0}" , shouldCreateSchema);
-122 }
-123 } catch (IOException ioex) {
-124 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, "Unable to verify database exists" , ioex);
-125 throw new DatabaseException ("Unable to verify database exists" );
-126 }
-127 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Loading database connection" );
-128 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Connection String: {0}" , connectionString);
-129 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Database User: {0}" , userName);
-130
-131 try {
-132 conn = DriverManager.getConnection(connectionString, userName, password);
-133 } catch (SQLException ex) {
-134 if (ex.getMessage().contains("java.net.UnknownHostException" ) && connectionString.contains("AUTO_SERVER=TRUE;" )) {
-135 connectionString = connectionString.replace("AUTO_SERVER=TRUE;" , "" );
-136 try {
-137 conn = DriverManager.getConnection(connectionString, userName, password);
-138 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
-139 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE,
-140 "Unable to start the database in server mode; reverting to single user mode" );
-141 } catch (SQLException sqlex) {
-142 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, "Unable to connect to the database" , ex);
-143 throw new DatabaseException ("Unable to connect to the database" );
-144 }
-145 } else {
-146 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, "Unable to connect to the database" , ex);
-147 throw new DatabaseException ("Unable to connect to the database" );
-148 }
-149 }
-150
-151 if (shouldCreateSchema) {
-152 try {
-153 createTables(conn);
-154 } catch (DatabaseException dex) {
-155 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, null , dex);
-156 throw new DatabaseException ("Unable to create the database structure" );
-157 }
-158 } else {
-159 try {
-160 ensureSchemaVersion(conn);
-161 } catch (DatabaseException dex) {
-162 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, null , dex);
-163 throw new DatabaseException ("Database schema does not match this version of dependency-check" );
-164 }
-165 }
-166 } finally {
-167 if (conn != null ) {
-168 try {
-169 conn.close();
-170 } catch (SQLException ex) {
-171 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, "An error occured closing the connection" , ex);
-172 }
-173 }
-174 }
-175 }
-176
-177
-178
-179
-180
-181
-182 public static synchronized void cleanup() {
-183 if (driver != null ) {
-184 try {
-185 DriverManager.deregisterDriver(driver);
-186 } catch (SQLException ex) {
-187 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, "An error occured unloading the databse driver" , ex);
-188 }
-189 driver = null ;
-190 }
-191 connectionString = null ;
-192 userName = null ;
-193 password = null ;
-194 }
-195
-196
-197
-198
-199
-200
-201
-202 public static Connection getConnection() throws DatabaseException {
-203 initialize();
-204 Connection conn = null ;
-205 try {
-206 conn = DriverManager.getConnection(connectionString, userName, password);
-207 } catch (SQLException ex) {
-208 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, null , ex);
-209 throw new DatabaseException ("Unable to connect to the database" );
-210 }
-211 return conn;
-212 }
-213
-214
-215
-216
-217
-218
-219
-220
-221 private static String getConnectionString() throws IOException {
-222 final String connStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING, "jdbc:h2:file:%s;AUTO_SERVER=TRUE" );
-223 if (connStr.contains("%s" )) {
-224 final String directory = getDataDirectory().getCanonicalPath();
-225 final File dataFile = new File(directory, "cve." + DB_SCHEMA_VERSION);
-226 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, String.format("File path for H2 file: '%s'" , dataFile.toString()));
-227 return String.format(connStr, dataFile.getAbsolutePath());
-228 }
-229 return connStr;
-230 }
-231
-232
-233
-234
-235
-236
-237
-238
-239 public static File getDataDirectory() throws IOException {
-240 final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);
-241 if (!path.exists()) {
-242 if (!path.mkdirs()) {
-243 throw new IOException("Unable to create NVD CVE Data directory" );
-244 }
-245 }
-246 return path;
-247 }
-248
-249
-250
-251
-252
-253
-254
-255 private static boolean dbSchemaExists() throws IOException {
-256 final File dir = getDataDirectory();
-257 final String name = String.format("cve.%s.h2.db" , DB_SCHEMA_VERSION);
-258 final File file = new File(dir, name);
-259 return file.exists();
-260 }
-261
-262
-263
-264
-265
-266
-267
-268 private static void createTables(Connection conn) throws DatabaseException {
-269 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, "Creating database structure" );
-270 InputStream is;
-271 InputStreamReader reader;
-272 BufferedReader in = null ;
-273 try {
-274 is = ConnectionFactory.class .getClassLoader().getResourceAsStream(DB_STRUCTURE_RESOURCE);
-275 reader = new InputStreamReader(is, "UTF-8" );
-276 in = new BufferedReader(reader);
-277 final StringBuilder sb = new StringBuilder(2110);
-278 String tmp;
-279 while ((tmp = in.readLine()) != null ) {
-280 sb.append(tmp);
-281 }
-282 Statement statement = null ;
-283 try {
-284 statement = conn.createStatement();
-285 statement.execute(sb.toString());
-286 } catch (SQLException ex) {
-287 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, null , ex);
-288 throw new DatabaseException ("Unable to create database statement" , ex);
-289 } finally {
-290 DBUtils.closeStatement(statement);
-291 }
-292 } catch (IOException ex) {
-293 throw new DatabaseException ("Unable to create database schema" , ex);
-294 } finally {
-295 if (in != null ) {
-296 try {
-297 in.close();
-298 } catch (IOException ex) {
-299 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINEST, null , ex);
-300 }
-301 }
-302 }
-303 }
-304
-305
-306
-307
-308
-309
-310
-311 private static void ensureSchemaVersion(Connection conn) throws DatabaseException {
-312 ResultSet rs = null ;
-313 CallableStatement cs = null ;
-314 try {
-315 cs = conn.prepareCall("SELECT value FROM properties WHERE id = 'version'" );
-316 rs = cs.executeQuery();
-317 if (rs.next()) {
-318 final boolean isWrongSchema = !DB_SCHEMA_VERSION.equals(rs.getString(1));
-319 if (isWrongSchema) {
-320 throw new DatabaseException ("Incorrect database schema; unable to continue" );
-321 }
-322 } else {
-323 throw new DatabaseException ("Database schema is missing" );
-324 }
-325 } catch (SQLException ex) {
-326 Logger.getLogger(ConnectionFactory.class .getName()).log(Level.FINE, null , ex);
-327 throw new DatabaseException ("Unable to check the database schema version" );
-328 } finally {
-329 DBUtils.closeResultSet(rs);
-330 DBUtils.closeStatement(cs);
-331 }
-332 }
-333 }
+45
+46
+47
+48 private static final Logger LOGGER = Logger.getLogger(ConnectionFactory.class .getName());
+49
+50
+51
+52 public static final String DB_SCHEMA_VERSION = "2.9" ;
+53
+54
+55
+56 public static final String DB_STRUCTURE_RESOURCE = "data/initialize.sql" ;
+57
+58
+59
+60 private static Driver driver = null ;
+61
+62
+63
+64 private static String connectionString = null ;
+65
+66
+67
+68 private static String userName = null ;
+69
+70
+71
+72 private static String password = null ;
+73
+74
+75
+76
+77 private ConnectionFactory () {
+78 }
+79
+80
+81
+82
+83
+84
+85
+86 public static synchronized void initialize() throws DatabaseException {
+87
+88 if (connectionString != null ) {
+89 return ;
+90 }
+91 Connection conn = null ;
+92 try {
+93
+94 final String driverName = Settings.getString(Settings.KEYS.DB_DRIVER_NAME, "" );
+95 if (!driverName.isEmpty()) {
+96 LOGGER.log(Level.FINE, "Loading driver: {0}" , driverName);
+97 final String driverPath = Settings.getString(Settings.KEYS.DB_DRIVER_PATH, "" );
+98 try {
+99 if (!driverPath.isEmpty()) {
+100 LOGGER.log(Level.FINE, "Loading driver from: {0}" , driverPath);
+101 driver = DriverLoader.load(driverName, driverPath);
+102 } else {
+103 driver = DriverLoader.load(driverName);
+104 }
+105 } catch (DriverLoadException ex) {
+106 LOGGER.log(Level.FINE, "Unable to load database driver" , ex);
+107 throw new DatabaseException ("Unable to load database driver" );
+108 }
+109 }
+110 userName = Settings.getString(Settings.KEYS.DB_USER, "dcuser" );
+111
+112 password = Settings.getString(Settings.KEYS.DB_PASSWORD, "DC-Pass1337!" );
+113 try {
+114 connectionString = getConnectionString();
+115 } catch (IOException ex) {
+116 LOGGER.log(Level.FINE,
+117 "Unable to retrieve the database connection string" , ex);
+118 throw new DatabaseException ("Unable to retrieve the database connection string" );
+119 }
+120 boolean shouldCreateSchema = false;
+121 try {
+122 if (connectionString.startsWith("jdbc:h2:file:" )) {
+123 shouldCreateSchema = !dbSchemaExists();
+124 LOGGER.log(Level.FINE, "Need to create DB Structure: {0}" , shouldCreateSchema);
+125 }
+126 } catch (IOException ioex) {
+127 LOGGER.log(Level.FINE, "Unable to verify database exists" , ioex);
+128 throw new DatabaseException ("Unable to verify database exists" );
+129 }
+130 LOGGER.log(Level.FINE, "Loading database connection" );
+131 LOGGER.log(Level.FINE, "Connection String: {0}" , connectionString);
+132 LOGGER.log(Level.FINE, "Database User: {0}" , userName);
+133
+134 try {
+135 conn = DriverManager.getConnection(connectionString, userName, password);
+136 } catch (SQLException ex) {
+137 if (ex.getMessage().contains("java.net.UnknownHostException" ) && connectionString.contains("AUTO_SERVER=TRUE;" )) {
+138 connectionString = connectionString.replace("AUTO_SERVER=TRUE;" , "" );
+139 try {
+140 conn = DriverManager.getConnection(connectionString, userName, password);
+141 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+142 LOGGER.log(Level.FINE,
+143 "Unable to start the database in server mode; reverting to single user mode" );
+144 } catch (SQLException sqlex) {
+145 LOGGER.log(Level.FINE, "Unable to connect to the database" , ex);
+146 throw new DatabaseException ("Unable to connect to the database" );
+147 }
+148 } else {
+149 LOGGER.log(Level.FINE, "Unable to connect to the database" , ex);
+150 throw new DatabaseException ("Unable to connect to the database" );
+151 }
+152 }
+153
+154 if (shouldCreateSchema) {
+155 try {
+156 createTables(conn);
+157 } catch (DatabaseException dex) {
+158 LOGGER.log(Level.FINE, null , dex);
+159 throw new DatabaseException ("Unable to create the database structure" );
+160 }
+161 } else {
+162 try {
+163 ensureSchemaVersion(conn);
+164 } catch (DatabaseException dex) {
+165 LOGGER.log(Level.FINE, null , dex);
+166 throw new DatabaseException ("Database schema does not match this version of dependency-check" );
+167 }
+168 }
+169 } finally {
+170 if (conn != null ) {
+171 try {
+172 conn.close();
+173 } catch (SQLException ex) {
+174 LOGGER.log(Level.FINE, "An error occurred closing the connection" , ex);
+175 }
+176 }
+177 }
+178 }
+179
+180
+181
+182
+183
+184
+185 public static synchronized void cleanup() {
+186 if (driver != null ) {
+187 try {
+188 DriverManager.deregisterDriver(driver);
+189 } catch (SQLException ex) {
+190 LOGGER.log(Level.FINE, "An error occurred unloading the database driver" , ex);
+191 } catch (Throwable unexpected) {
+192 LOGGER.log(Level.FINE,
+193 "An unexpected throwable occurred unloading the database driver" , unexpected);
+194 }
+195 driver = null ;
+196 }
+197 connectionString = null ;
+198 userName = null ;
+199 password = null ;
+200 }
+201
+202
+203
+204
+205
+206
+207
+208 public static Connection getConnection() throws DatabaseException {
+209 initialize();
+210 Connection conn = null ;
+211 try {
+212 conn = DriverManager.getConnection(connectionString, userName, password);
+213 } catch (SQLException ex) {
+214 LOGGER.log(Level.FINE, null , ex);
+215 throw new DatabaseException ("Unable to connect to the database" );
+216 }
+217 return conn;
+218 }
+219
+220
+221
+222
+223
+224
+225
+226
+227 private static String getConnectionString() throws IOException {
+228 final String connStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING, "jdbc:h2:file:%s;AUTO_SERVER=TRUE" );
+229 if (connStr.contains("%s" )) {
+230 final String directory = getDataDirectory().getCanonicalPath();
+231 final File dataFile = new File(directory, "cve." + DB_SCHEMA_VERSION);
+232 LOGGER.log(Level.FINE, String.format("File path for H2 file: '%s'" , dataFile.toString()));
+233 return String.format(connStr, dataFile.getAbsolutePath());
+234 }
+235 return connStr;
+236 }
+237
+238
+239
+240
+241
+242
+243
+244
+245 public static File getDataDirectory() throws IOException {
+246 final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);
+247 if (!path.exists()) {
+248 if (!path.mkdirs()) {
+249 throw new IOException("Unable to create NVD CVE Data directory" );
+250 }
+251 }
+252 return path;
+253 }
+254
+255
+256
+257
+258
+259
+260
+261 private static boolean dbSchemaExists() throws IOException {
+262 final File dir = getDataDirectory();
+263 final String name = String.format("cve.%s.h2.db" , DB_SCHEMA_VERSION);
+264 final File file = new File(dir, name);
+265 return file.exists();
+266 }
+267
+268
+269
+270
+271
+272
+273
+274 private static void createTables(Connection conn) throws DatabaseException {
+275 LOGGER.log(Level.FINE, "Creating database structure" );
+276 InputStream is;
+277 InputStreamReader reader;
+278 BufferedReader in = null ;
+279 try {
+280 is = ConnectionFactory.class .getClassLoader().getResourceAsStream(DB_STRUCTURE_RESOURCE);
+281 reader = new InputStreamReader(is, "UTF-8" );
+282 in = new BufferedReader(reader);
+283 final StringBuilder sb = new StringBuilder(2110);
+284 String tmp;
+285 while ((tmp = in.readLine()) != null ) {
+286 sb.append(tmp);
+287 }
+288 Statement statement = null ;
+289 try {
+290 statement = conn.createStatement();
+291 statement.execute(sb.toString());
+292 } catch (SQLException ex) {
+293 LOGGER.log(Level.FINE, null , ex);
+294 throw new DatabaseException ("Unable to create database statement" , ex);
+295 } finally {
+296 DBUtils.closeStatement(statement);
+297 }
+298 } catch (IOException ex) {
+299 throw new DatabaseException ("Unable to create database schema" , ex);
+300 } finally {
+301 if (in != null ) {
+302 try {
+303 in.close();
+304 } catch (IOException ex) {
+305 LOGGER.log(Level.FINEST, null , ex);
+306 }
+307 }
+308 }
+309 }
+310
+311
+312
+313
+314
+315
+316
+317 private static void ensureSchemaVersion(Connection conn) throws DatabaseException {
+318 ResultSet rs = null ;
+319 CallableStatement cs = null ;
+320 try {
+321 cs = conn.prepareCall("SELECT value FROM properties WHERE id = 'version'" );
+322 rs = cs.executeQuery();
+323 if (rs.next()) {
+324 final boolean isWrongSchema = !DB_SCHEMA_VERSION.equals(rs.getString(1));
+325 if (isWrongSchema) {
+326 throw new DatabaseException ("Incorrect database schema; unable to continue" );
+327 }
+328 } else {
+329 throw new DatabaseException ("Database schema is missing" );
+330 }
+331 } catch (SQLException ex) {
+332 LOGGER.log(Level.FINE, null , ex);
+333 throw new DatabaseException ("Unable to check the database schema version" );
+334 } finally {
+335 DBUtils.closeResultSet(rs);
+336 DBUtils.closeStatement(cs);
+337 }
+338 }
+339 }
46
47
48 public class CveDB {
-49
-50
-51
-52
-53 private Connection conn;
-54
-55
-56
-57
-58
-59
-60
-61 public CveDB () throws DatabaseException {
-62 super ();
-63 try {
-64 open();
-65 databaseProperties = new DatabaseProperties (this );
-66 } catch (DatabaseException ex) {
-67 throw ex;
-68 }
-69 }
-70
-71
-72
-73
-74
-75
-76 protected Connection getConnection() {
-77 return conn;
-78 }
-79
-80
-81
-82
-83
-84
-85 public final void open() throws DatabaseException {
-86 conn = ConnectionFactory.getConnection();
-87 }
-88
-89
-90
-91
-92 public void close() {
-93 if (conn != null ) {
-94 try {
-95 conn.close();
-96 } catch (SQLException ex) {
-97 final String msg = "There was an error attempting to close the CveDB, see the log for more details." ;
-98 Logger.getLogger(DBUtils.class .getName()).log(Level.SEVERE, msg);
-99 Logger.getLogger(DBUtils.class .getName()).log(Level.FINE, null , ex);
-100 } catch (Throwable ex) {
-101 final String msg = "There was an exception attempting to close the CveDB, see the log for more details." ;
-102 Logger.getLogger(DBUtils.class .getName()).log(Level.SEVERE, msg);
-103 Logger.getLogger(DBUtils.class .getName()).log(Level.FINE, null , ex);
-104 }
-105 conn = null ;
-106 }
-107 }
-108
-109
-110
-111
-112
-113
-114 public boolean isOpen() {
-115 return conn != null ;
-116 }
-117
-118
-119
-120
-121
-122
-123 public void commit() throws SQLException {
-124
-125
-126
-127
-128 }
-129
-130
-131
-132
-133
-134
-135 @Override
-136 @SuppressWarnings("FinalizeDeclaration" )
-137 protected void finalize() throws Throwable {
-138 Logger.getLogger(DBUtils.class .getName()).log(Level.FINE, "Entering finalize" );
-139 close();
-140 super .finalize();
-141 }
-142
-143
-144
-145 private DatabaseProperties databaseProperties;
-146
-147
-148
-149
-150
-151
-152 public DatabaseProperties getDatabaseProperties() {
-153 return databaseProperties;
-154 }
-155
-156
-157
-158
-159 private static final String DELETE_REFERENCE = "DELETE FROM reference WHERE cveid = ?" ;
-160
-161
-162
-163 private static final String DELETE_SOFTWARE = "DELETE FROM software WHERE cveid = ?" ;
-164
-165
-166
-167 private static final String DELETE_VULNERABILITY = "DELETE FROM vulnerability WHERE id = ?" ;
-168
-169
-170
-171
-172 private static final String CLEANUP_ORPHANS = "DELETE FROM CpeEntry WHERE id not in (SELECT CPEEntryId FROM Software); " ;
-173
-174
-175
-176 private static final String INSERT_REFERENCE = "INSERT INTO reference (cveid, name, url, source) VALUES (?, ?, ?, ?)" ;
-177
-178
-179
-180 private static final String INSERT_SOFTWARE = "INSERT INTO software (cveid, cpeEntryId, previousVersion) VALUES (?, ?, ?)" ;
-181
-182
-183
-184 private static final String INSERT_CPE = "INSERT INTO cpeEntry (cpe, vendor, product) VALUES (?, ?, ?)" ;
-185
-186
-187
-188 private static final String SELECT_CPE_ID = "SELECT id FROM cpeEntry WHERE cpe = ?" ;
-189
-190
-191
-192 private static final String INSERT_VULNERABILITY = "INSERT INTO vulnerability (cve, description, cwe, cvssScore, cvssAccessVector, "
-193 + "cvssAccessComplexity, cvssAuthentication, cvssConfidentialityImpact, cvssIntegrityImpact, cvssAvailabilityImpact) "
-194 + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" ;
-195
-196
-197
-198 private static final String UPDATE_VULNERABILITY = "UPDATE vulnerability SET description=?, cwe=?, cvssScore=?, cvssAccessVector=?, "
-199 + "cvssAccessComplexity=?, cvssAuthentication=?, cvssConfidentialityImpact=?, cvssIntegrityImpact=?, cvssAvailabilityImpact=? "
-200 + "WHERE id=?" ;
-201
-202
-203
-204 private static final String SELECT_CVE_FROM_SOFTWARE = "SELECT cve, cpe, previousVersion "
-205 + "FROM software INNER JOIN vulnerability ON vulnerability.id = software.cveId "
-206 + "INNER JOIN cpeEntry ON cpeEntry.id = software.cpeEntryId "
-207 + "WHERE vendor = ? AND product = ?" ;
-208
-209
-210
-211
-212
-213
-214 private static final String SELECT_CPE_ENTRIES = "SELECT cpe FROM cpeEntry WHERE vendor = ? AND product = ?" ;
-215
-216
-217
-218 private static final String SELECT_REFERENCE = "SELECT source, name, url FROM reference WHERE cveid = ?" ;
-219
-220
-221
-222 private static final String SELECT_VENDOR_PRODUCT_LIST = "SELECT vendor, product FROM cpeEntry GROUP BY vendor, product" ;
-223
-224
-225
-226 private static final String SELECT_SOFTWARE = "SELECT cpe, previousVersion "
-227 + "FROM software INNER JOIN cpeEntry ON software.cpeEntryId = cpeEntry.id WHERE cveid = ?" ;
-228
-229
-230
-231
-232
-233
-234 private static final String SELECT_VULNERABILITY = "SELECT id, description, cwe, cvssScore, cvssAccessVector, cvssAccessComplexity, "
-235 + "cvssAuthentication, cvssConfidentialityImpact, cvssIntegrityImpact, cvssAvailabilityImpact FROM vulnerability WHERE cve = ?" ;
-236
-237
-238
-239 private static final String SELECT_VULNERABILITY_ID = "SELECT id FROM vulnerability WHERE cve = ?" ;
-240
-241
-242
-243 private static final String SELECT_PROPERTIES = "SELECT id, value FROM properties" ;
-244
-245
-246
-247 private static final String SELECT_PROPERTY = "SELECT id, value FROM properties WHERE id = ?" ;
-248
-249
-250
-251 private static final String INSERT_PROPERTY = "INSERT INTO properties (id, value) VALUES (?, ?)" ;
-252
-253
-254
-255 private static final String UPDATE_PROPERTY = "UPDATE properties SET value = ? WHERE id = ?" ;
-256
-257
-258
-259 private static final String DELETE_PROPERTY = "DELETE FROM properties WHERE id = ?" ;
-260
-261
-262
-263
-264
-265
-266
-267
-268
-269
-270 public Set<VulnerableSoftware> getCPEs(String vendor, String product) {
-271 final Set<VulnerableSoftware> cpe = new HashSet<VulnerableSoftware>();
-272 ResultSet rs = null ;
-273 PreparedStatement ps = null ;
-274 try {
-275 ps = getConnection().prepareStatement(SELECT_CPE_ENTRIES);
-276 ps.setString(1, vendor);
-277 ps.setString(2, product);
-278 rs = ps.executeQuery();
-279
-280 while (rs.next()) {
-281 final VulnerableSoftware vs = new VulnerableSoftware ();
-282 vs.setCpe(rs.getString(1));
-283 cpe.add(vs);
-284 }
-285 } catch (SQLException ex) {
-286 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
-287 Logger.getLogger(CveDB.class .getName()).log(Level.SEVERE, msg);
-288 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, null , ex);
-289 } finally {
-290 DBUtils.closeResultSet(rs);
-291 DBUtils.closeStatement(ps);
-292 }
-293 return cpe;
-294 }
-295
-296
-297
-298
-299
-300
-301
-302 public Set<Pair<String, String>> getVendorProductList() throws DatabaseException {
-303 final HashSet data = new HashSet<Pair<String, String>>();
-304 ResultSet rs = null ;
-305 PreparedStatement ps = null ;
-306 try {
-307 ps = getConnection().prepareStatement(SELECT_VENDOR_PRODUCT_LIST);
-308 rs = ps.executeQuery();
-309 while (rs.next()) {
-310 data.add(new Pair (rs.getString(1), rs.getString(2)));
-311 }
-312 } catch (SQLException ex) {
-313 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
-314 throw new DatabaseException (msg, ex);
-315 } finally {
-316 DBUtils.closeResultSet(rs);
-317 DBUtils.closeStatement(ps);
-318 }
-319 return data;
-320 }
-321
-322
-323
-324
-325
-326
-327 Properties getProperties() {
-328 final Properties prop = new Properties();
-329 PreparedStatement ps = null ;
-330 ResultSet rs = null ;
-331 try {
-332 ps = getConnection().prepareStatement(SELECT_PROPERTIES);
-333 rs = ps.executeQuery();
-334 while (rs.next()) {
-335 prop.setProperty(rs.getString(1), rs.getString(2));
-336 }
-337 } catch (SQLException ex) {
-338 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
-339 Logger.getLogger(CveDB.class .getName()).log(Level.SEVERE, msg);
-340 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, null , ex);
-341 } finally {
-342 DBUtils.closeStatement(ps);
-343 DBUtils.closeResultSet(rs);
-344 }
-345 return prop;
-346 }
-347
-348
-349
-350
-351
-352
-353 void saveProperties(Properties props) {
-354 PreparedStatement updateProperty = null ;
-355 PreparedStatement insertProperty = null ;
-356 try {
-357 try {
-358 updateProperty = getConnection().prepareStatement(UPDATE_PROPERTY);
-359 insertProperty = getConnection().prepareStatement(INSERT_PROPERTY);
-360 } catch (SQLException ex) {
-361 Logger.getLogger(CveDB.class .getName()).log(Level.WARNING, "Unable to save properties to the database" );
-362 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Unable to save properties to the database" , ex);
-363 return ;
-364 }
-365 for (Entry<Object, Object> entry : props.entrySet()) {
-366 final String key = entry.getKey().toString();
-367 final String value = entry.getValue().toString();
-368 try {
-369 updateProperty.setString(1, value);
-370 updateProperty.setString(2, key);
-371 if (updateProperty.executeUpdate() == 0) {
-372 insertProperty.setString(1, key);
-373 insertProperty.setString(2, value);
-374 }
-375 } catch (SQLException ex) {
-376 final String msg = String.format("Unable to save property '%s' with a value of '%s' to the database" , key, value);
-377 Logger.getLogger(CveDB.class .getName()).log(Level.WARNING, msg);
-378 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, null , ex);
-379 }
-380 }
-381 } finally {
-382 DBUtils.closeStatement(updateProperty);
-383 DBUtils.closeStatement(insertProperty);
-384 }
-385 }
-386
-387
-388
-389
-390
-391
-392
-393 void saveProperty(String key, String value) {
-394 PreparedStatement updateProperty = null ;
-395 PreparedStatement insertProperty = null ;
-396 try {
-397 try {
-398 updateProperty = getConnection().prepareStatement(UPDATE_PROPERTY);
-399 } catch (SQLException ex) {
-400 Logger.getLogger(CveDB.class .getName()).log(Level.WARNING, "Unable to save properties to the database" );
-401 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Unable to save properties to the database" , ex);
-402 return ;
-403 }
-404 try {
-405 updateProperty.setString(1, value);
-406 updateProperty.setString(2, key);
-407 if (updateProperty.executeUpdate() == 0) {
-408 try {
-409 insertProperty = getConnection().prepareStatement(INSERT_PROPERTY);
-410 } catch (SQLException ex) {
-411 Logger.getLogger(CveDB.class .getName()).log(Level.WARNING, "Unable to save properties to the database" );
-412 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, "Unable to save properties to the database" , ex);
-413 return ;
-414 }
-415 insertProperty.setString(1, key);
-416 insertProperty.setString(2, value);
-417 insertProperty.execute();
-418 }
-419 } catch (SQLException ex) {
-420 final String msg = String.format("Unable to save property '%s' with a value of '%s' to the database" , key, value);
-421 Logger.getLogger(CveDB.class .getName()).log(Level.WARNING, msg);
-422 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, null , ex);
-423 }
-424 } finally {
-425 DBUtils.closeStatement(updateProperty);
-426 DBUtils.closeStatement(insertProperty);
-427 }
-428 }
-429
-430
-431
-432
-433
-434
-435
-436
-437 public List<Vulnerability> getVulnerabilities(String cpeStr) throws DatabaseException {
-438 ResultSet rs = null ;
-439 final VulnerableSoftware cpe = new VulnerableSoftware ();
-440 try {
-441 cpe.parseName(cpeStr);
-442 } catch (UnsupportedEncodingException ex) {
-443 Logger.getLogger(CveDB.class .getName()).log(Level.FINEST, null , ex);
-444 }
-445 final DependencyVersion detectedVersion = parseDependencyVersion(cpe);
-446 final List<Vulnerability> vulnerabilities = new ArrayList<Vulnerability>();
-447
-448 PreparedStatement ps;
-449 final HashSet<String> cveEntries = new HashSet<String>();
-450 try {
-451 ps = getConnection().prepareStatement(SELECT_CVE_FROM_SOFTWARE);
-452 ps.setString(1, cpe.getVendor());
-453 ps.setString(2, cpe.getProduct());
-454 rs = ps.executeQuery();
-455 while (rs.next()) {
-456 final String cveId = rs.getString(1);
-457 final String cpeId = rs.getString(2);
-458 final String previous = rs.getString(3);
-459 if (!cveEntries.contains(cveId) && isAffected(cpe.getVendor(), cpe.getProduct(), detectedVersion, cpeId, previous)) {
-460 cveEntries.add(cveId);
-461 final Vulnerability v = getVulnerability(cveId);
-462 v.setMatchedCPE(cpeId, previous);
-463 vulnerabilities.add(v);
-464 }
-465 }
-466 DBUtils.closeResultSet(rs);
-467 DBUtils.closeStatement(ps);
-468
-469
-470
-471
-472
-473 } catch (SQLException ex) {
-474 throw new DatabaseException ("Exception retrieving vulnerability for " + cpeStr, ex);
-475 } finally {
-476 DBUtils.closeResultSet(rs);
-477 }
-478 return vulnerabilities;
-479 }
-480
-481
-482
-483
-484
-485
-486
-487
-488 private Vulnerability getVulnerability(String cve) throws DatabaseException {
-489 PreparedStatement psV = null ;
-490 PreparedStatement psR = null ;
-491 PreparedStatement psS = null ;
-492 ResultSet rsV = null ;
-493 ResultSet rsR = null ;
-494 ResultSet rsS = null ;
-495 Vulnerability vuln = null ;
-496 try {
-497 psV = getConnection().prepareStatement(SELECT_VULNERABILITY);
-498 psV.setString(1, cve);
-499 rsV = psV.executeQuery();
-500 if (rsV.next()) {
-501 vuln = new Vulnerability ();
-502 vuln.setName(cve);
-503 vuln.setDescription(rsV.getString(2));
-504 String cwe = rsV.getString(3);
-505 if (cwe != null ) {
-506 final String name = CweDB.getCweName(cwe);
-507 if (name != null ) {
-508 cwe += " " + name;
-509 }
-510 }
-511 final int cveId = rsV.getInt(1);
-512 vuln.setCwe(cwe);
-513 vuln.setCvssScore(rsV.getFloat(4));
-514 vuln.setCvssAccessVector(rsV.getString(5));
-515 vuln.setCvssAccessComplexity(rsV.getString(6));
-516 vuln.setCvssAuthentication(rsV.getString(7));
-517 vuln.setCvssConfidentialityImpact(rsV.getString(8));
-518 vuln.setCvssIntegrityImpact(rsV.getString(9));
-519 vuln.setCvssAvailabilityImpact(rsV.getString(10));
-520
-521 psR = getConnection().prepareStatement(SELECT_REFERENCE);
-522 psR.setInt(1, cveId);
-523 rsR = psR.executeQuery();
-524 while (rsR.next()) {
-525 vuln.addReference(rsR.getString(1), rsR.getString(2), rsR.getString(3));
-526 }
-527 psS = getConnection().prepareStatement(SELECT_SOFTWARE);
-528 psS.setInt(1, cveId);
-529 rsS = psS.executeQuery();
-530 while (rsS.next()) {
-531 final String cpe = rsS.getString(1);
-532 final String prevVersion = rsS.getString(2);
-533 if (prevVersion == null ) {
-534 vuln.addVulnerableSoftware(cpe);
-535 } else {
-536 vuln.addVulnerableSoftware(cpe, prevVersion);
-537 }
-538 }
-539 }
-540 } catch (SQLException ex) {
-541 throw new DatabaseException ("Error retrieving " + cve, ex);
-542 } finally {
-543 DBUtils.closeResultSet(rsV);
-544 DBUtils.closeResultSet(rsR);
-545 DBUtils.closeResultSet(rsS);
-546 DBUtils.closeStatement(psV);
-547 DBUtils.closeStatement(psR);
-548 DBUtils.closeStatement(psS);
-549 }
-550 return vuln;
-551 }
-552
-553
-554
-555
-556
-557
-558
-559 public void updateVulnerability(Vulnerability vuln) throws DatabaseException {
-560 PreparedStatement selectVulnerabilityId = null ;
-561 PreparedStatement deleteVulnerability = null ;
-562 PreparedStatement deleteReferences = null ;
-563 PreparedStatement deleteSoftware = null ;
-564 PreparedStatement updateVulnerability = null ;
-565 PreparedStatement insertVulnerability = null ;
-566 PreparedStatement insertReference = null ;
-567 PreparedStatement selectCpeId = null ;
-568 PreparedStatement insertCpe = null ;
-569 PreparedStatement insertSoftware = null ;
-570
-571 try {
-572 selectVulnerabilityId = getConnection().prepareStatement(SELECT_VULNERABILITY_ID);
-573 deleteVulnerability = getConnection().prepareStatement(DELETE_VULNERABILITY);
-574 deleteReferences = getConnection().prepareStatement(DELETE_REFERENCE);
-575 deleteSoftware = getConnection().prepareStatement(DELETE_SOFTWARE);
-576 updateVulnerability = getConnection().prepareStatement(UPDATE_VULNERABILITY);
-577 insertVulnerability = getConnection().prepareStatement(INSERT_VULNERABILITY, Statement.RETURN_GENERATED_KEYS);
-578 insertReference = getConnection().prepareStatement(INSERT_REFERENCE);
-579 selectCpeId = getConnection().prepareStatement(SELECT_CPE_ID);
-580 insertCpe = getConnection().prepareStatement(INSERT_CPE, Statement.RETURN_GENERATED_KEYS);
-581 insertSoftware = getConnection().prepareStatement(INSERT_SOFTWARE);
-582 int vulnerabilityId = 0;
-583 selectVulnerabilityId.setString(1, vuln.getName());
-584 ResultSet rs = selectVulnerabilityId.executeQuery();
-585 if (rs.next()) {
-586 vulnerabilityId = rs.getInt(1);
-587
-588 deleteReferences.setInt(1, vulnerabilityId);
-589 deleteReferences.execute();
-590 deleteSoftware.setInt(1, vulnerabilityId);
-591 deleteSoftware.execute();
-592 }
-593 DBUtils.closeResultSet(rs);
-594 rs = null ;
-595 if (vulnerabilityId != 0) {
-596 if (vuln.getDescription().contains("** REJECT **" )) {
-597 deleteVulnerability.setInt(1, vulnerabilityId);
-598 deleteVulnerability.executeUpdate();
-599 } else {
-600 updateVulnerability.setString(1, vuln.getDescription());
-601 updateVulnerability.setString(2, vuln.getCwe());
-602 updateVulnerability.setFloat(3, vuln.getCvssScore());
-603 updateVulnerability.setString(4, vuln.getCvssAccessVector());
-604 updateVulnerability.setString(5, vuln.getCvssAccessComplexity());
-605 updateVulnerability.setString(6, vuln.getCvssAuthentication());
-606 updateVulnerability.setString(7, vuln.getCvssConfidentialityImpact());
-607 updateVulnerability.setString(8, vuln.getCvssIntegrityImpact());
-608 updateVulnerability.setString(9, vuln.getCvssAvailabilityImpact());
-609 updateVulnerability.setInt(10, vulnerabilityId);
-610 updateVulnerability.executeUpdate();
-611 }
-612 } else {
-613 insertVulnerability.setString(1, vuln.getName());
-614 insertVulnerability.setString(2, vuln.getDescription());
-615 insertVulnerability.setString(3, vuln.getCwe());
-616 insertVulnerability.setFloat(4, vuln.getCvssScore());
-617 insertVulnerability.setString(5, vuln.getCvssAccessVector());
-618 insertVulnerability.setString(6, vuln.getCvssAccessComplexity());
-619 insertVulnerability.setString(7, vuln.getCvssAuthentication());
-620 insertVulnerability.setString(8, vuln.getCvssConfidentialityImpact());
-621 insertVulnerability.setString(9, vuln.getCvssIntegrityImpact());
-622 insertVulnerability.setString(10, vuln.getCvssAvailabilityImpact());
-623 insertVulnerability.execute();
-624 try {
-625 rs = insertVulnerability.getGeneratedKeys();
-626 rs.next();
-627 vulnerabilityId = rs.getInt(1);
-628 } catch (SQLException ex) {
-629 final String msg = String.format("Unable to retrieve id for new vulnerability for '%s'" , vuln.getName());
-630 throw new DatabaseException (msg, ex);
-631 } finally {
-632 DBUtils.closeResultSet(rs);
-633 rs = null ;
-634 }
-635 }
-636 insertReference.setInt(1, vulnerabilityId);
-637 for (Reference r : vuln.getReferences()) {
-638 insertReference.setString(2, r.getName());
-639 insertReference.setString(3, r.getUrl());
-640 insertReference.setString(4, r.getSource());
-641 insertReference.execute();
-642 }
-643 for (VulnerableSoftware s : vuln.getVulnerableSoftware()) {
-644 int cpeProductId = 0;
-645 selectCpeId.setString(1, s.getName());
-646 try {
-647 rs = selectCpeId.executeQuery();
-648 if (rs.next()) {
-649 cpeProductId = rs.getInt(1);
-650 }
-651 } catch (SQLException ex) {
-652 throw new DatabaseException ("Unable to get primary key for new cpe: " + s.getName(), ex);
-653 } finally {
-654 DBUtils.closeResultSet(rs);
-655 rs = null ;
-656 }
-657
-658 if (cpeProductId == 0) {
-659 insertCpe.setString(1, s.getName());
-660 insertCpe.setString(2, s.getVendor());
-661 insertCpe.setString(3, s.getProduct());
-662 insertCpe.executeUpdate();
-663 cpeProductId = DBUtils.getGeneratedKey(insertCpe);
-664 }
-665 if (cpeProductId == 0) {
-666 throw new DatabaseException ("Unable to retrieve cpeProductId - no data returned" );
+49
+50
+51
+52 private static final Logger LOGGER = Logger.getLogger(CveDB.class .getName());
+53
+54
+55
+56 private Connection conn;
+57
+58
+59
+60
+61
+62
+63
+64 public CveDB () throws DatabaseException {
+65 super ();
+66 try {
+67 open();
+68 databaseProperties = new DatabaseProperties (this );
+69 } catch (DatabaseException ex) {
+70 throw ex;
+71 }
+72 }
+73
+74
+75
+76
+77
+78
+79 protected Connection getConnection() {
+80 return conn;
+81 }
+82
+83
+84
+85
+86
+87
+88 public final void open() throws DatabaseException {
+89 conn = ConnectionFactory.getConnection();
+90 }
+91
+92
+93
+94
+95 public void close() {
+96 if (conn != null ) {
+97 try {
+98 conn.close();
+99 } catch (SQLException ex) {
+100 final String msg = "There was an error attempting to close the CveDB, see the log for more details." ;
+101 LOGGER.log(Level.SEVERE, msg);
+102 LOGGER.log(Level.FINE, null , ex);
+103 } catch (Throwable ex) {
+104 final String msg = "There was an exception attempting to close the CveDB, see the log for more details." ;
+105 LOGGER.log(Level.SEVERE, msg);
+106 LOGGER.log(Level.FINE, null , ex);
+107 }
+108 conn = null ;
+109 }
+110 }
+111
+112
+113
+114
+115
+116
+117 public boolean isOpen() {
+118 return conn != null ;
+119 }
+120
+121
+122
+123
+124
+125
+126 public void commit() throws SQLException {
+127
+128
+129
+130
+131 }
+132
+133
+134
+135
+136
+137
+138 @Override
+139 @SuppressWarnings("FinalizeDeclaration" )
+140 protected void finalize() throws Throwable {
+141 LOGGER.log(Level.FINE, "Entering finalize" );
+142 close();
+143 super .finalize();
+144 }
+145
+146
+147
+148 private DatabaseProperties databaseProperties;
+149
+150
+151
+152
+153
+154
+155 public DatabaseProperties getDatabaseProperties() {
+156 return databaseProperties;
+157 }
+158
+159
+160
+161
+162 private static final String DELETE_REFERENCE = "DELETE FROM reference WHERE cveid = ?" ;
+163
+164
+165
+166 private static final String DELETE_SOFTWARE = "DELETE FROM software WHERE cveid = ?" ;
+167
+168
+169
+170 private static final String DELETE_VULNERABILITY = "DELETE FROM vulnerability WHERE id = ?" ;
+171
+172
+173
+174
+175 private static final String CLEANUP_ORPHANS = "DELETE FROM CpeEntry WHERE id not in (SELECT CPEEntryId FROM Software); " ;
+176
+177
+178
+179 private static final String INSERT_REFERENCE = "INSERT INTO reference (cveid, name, url, source) VALUES (?, ?, ?, ?)" ;
+180
+181
+182
+183 private static final String INSERT_SOFTWARE = "INSERT INTO software (cveid, cpeEntryId, previousVersion) VALUES (?, ?, ?)" ;
+184
+185
+186
+187 private static final String INSERT_CPE = "INSERT INTO cpeEntry (cpe, vendor, product) VALUES (?, ?, ?)" ;
+188
+189
+190
+191 private static final String SELECT_CPE_ID = "SELECT id FROM cpeEntry WHERE cpe = ?" ;
+192
+193
+194
+195 private static final String INSERT_VULNERABILITY = "INSERT INTO vulnerability (cve, description, cwe, cvssScore, cvssAccessVector, "
+196 + "cvssAccessComplexity, cvssAuthentication, cvssConfidentialityImpact, cvssIntegrityImpact, cvssAvailabilityImpact) "
+197 + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" ;
+198
+199
+200
+201 private static final String UPDATE_VULNERABILITY = "UPDATE vulnerability SET description=?, cwe=?, cvssScore=?, cvssAccessVector=?, "
+202 + "cvssAccessComplexity=?, cvssAuthentication=?, cvssConfidentialityImpact=?, cvssIntegrityImpact=?, cvssAvailabilityImpact=? "
+203 + "WHERE id=?" ;
+204
+205
+206
+207 private static final String SELECT_CVE_FROM_SOFTWARE = "SELECT cve, cpe, previousVersion "
+208 + "FROM software INNER JOIN vulnerability ON vulnerability.id = software.cveId "
+209 + "INNER JOIN cpeEntry ON cpeEntry.id = software.cpeEntryId "
+210 + "WHERE vendor = ? AND product = ?" ;
+211
+212
+213
+214
+215
+216
+217 private static final String SELECT_CPE_ENTRIES = "SELECT cpe FROM cpeEntry WHERE vendor = ? AND product = ?" ;
+218
+219
+220
+221 private static final String SELECT_REFERENCE = "SELECT source, name, url FROM reference WHERE cveid = ?" ;
+222
+223
+224
+225 private static final String SELECT_VENDOR_PRODUCT_LIST = "SELECT vendor, product FROM cpeEntry GROUP BY vendor, product" ;
+226
+227
+228
+229 private static final String SELECT_SOFTWARE = "SELECT cpe, previousVersion "
+230 + "FROM software INNER JOIN cpeEntry ON software.cpeEntryId = cpeEntry.id WHERE cveid = ?" ;
+231
+232
+233
+234
+235
+236
+237 private static final String SELECT_VULNERABILITY = "SELECT id, description, cwe, cvssScore, cvssAccessVector, cvssAccessComplexity, "
+238 + "cvssAuthentication, cvssConfidentialityImpact, cvssIntegrityImpact, cvssAvailabilityImpact FROM vulnerability WHERE cve = ?" ;
+239
+240
+241
+242 private static final String SELECT_VULNERABILITY_ID = "SELECT id FROM vulnerability WHERE cve = ?" ;
+243
+244
+245
+246 private static final String SELECT_PROPERTIES = "SELECT id, value FROM properties" ;
+247
+248
+249
+250 private static final String SELECT_PROPERTY = "SELECT id, value FROM properties WHERE id = ?" ;
+251
+252
+253
+254 private static final String INSERT_PROPERTY = "INSERT INTO properties (id, value) VALUES (?, ?)" ;
+255
+256
+257
+258 private static final String UPDATE_PROPERTY = "UPDATE properties SET value = ? WHERE id = ?" ;
+259
+260
+261
+262 private static final String DELETE_PROPERTY = "DELETE FROM properties WHERE id = ?" ;
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273 public Set<VulnerableSoftware> getCPEs(String vendor, String product) {
+274 final Set<VulnerableSoftware> cpe = new HashSet<VulnerableSoftware>();
+275 ResultSet rs = null ;
+276 PreparedStatement ps = null ;
+277 try {
+278 ps = getConnection().prepareStatement(SELECT_CPE_ENTRIES);
+279 ps.setString(1, vendor);
+280 ps.setString(2, product);
+281 rs = ps.executeQuery();
+282
+283 while (rs.next()) {
+284 final VulnerableSoftware vs = new VulnerableSoftware ();
+285 vs.setCpe(rs.getString(1));
+286 cpe.add(vs);
+287 }
+288 } catch (SQLException ex) {
+289 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
+290 LOGGER.log(Level.SEVERE, msg);
+291 LOGGER.log(Level.FINE, null , ex);
+292 } finally {
+293 DBUtils.closeResultSet(rs);
+294 DBUtils.closeStatement(ps);
+295 }
+296 return cpe;
+297 }
+298
+299
+300
+301
+302
+303
+304
+305 public Set<Pair<String, String>> getVendorProductList() throws DatabaseException {
+306 final HashSet data = new HashSet<Pair<String, String>>();
+307 ResultSet rs = null ;
+308 PreparedStatement ps = null ;
+309 try {
+310 ps = getConnection().prepareStatement(SELECT_VENDOR_PRODUCT_LIST);
+311 rs = ps.executeQuery();
+312 while (rs.next()) {
+313 data.add(new Pair (rs.getString(1), rs.getString(2)));
+314 }
+315 } catch (SQLException ex) {
+316 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
+317 throw new DatabaseException (msg, ex);
+318 } finally {
+319 DBUtils.closeResultSet(rs);
+320 DBUtils.closeStatement(ps);
+321 }
+322 return data;
+323 }
+324
+325
+326
+327
+328
+329
+330 Properties getProperties() {
+331 final Properties prop = new Properties();
+332 PreparedStatement ps = null ;
+333 ResultSet rs = null ;
+334 try {
+335 ps = getConnection().prepareStatement(SELECT_PROPERTIES);
+336 rs = ps.executeQuery();
+337 while (rs.next()) {
+338 prop.setProperty(rs.getString(1), rs.getString(2));
+339 }
+340 } catch (SQLException ex) {
+341 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
+342 LOGGER.log(Level.SEVERE, msg);
+343 LOGGER.log(Level.FINE, null , ex);
+344 } finally {
+345 DBUtils.closeStatement(ps);
+346 DBUtils.closeResultSet(rs);
+347 }
+348 return prop;
+349 }
+350
+351
+352
+353
+354
+355
+356 void saveProperties(Properties props) {
+357 PreparedStatement updateProperty = null ;
+358 PreparedStatement insertProperty = null ;
+359 try {
+360 try {
+361 updateProperty = getConnection().prepareStatement(UPDATE_PROPERTY);
+362 insertProperty = getConnection().prepareStatement(INSERT_PROPERTY);
+363 } catch (SQLException ex) {
+364 LOGGER.log(Level.WARNING, "Unable to save properties to the database" );
+365 LOGGER.log(Level.FINE, "Unable to save properties to the database" , ex);
+366 return ;
+367 }
+368 for (Entry<Object, Object> entry : props.entrySet()) {
+369 final String key = entry.getKey().toString();
+370 final String value = entry.getValue().toString();
+371 try {
+372 updateProperty.setString(1, value);
+373 updateProperty.setString(2, key);
+374 if (updateProperty.executeUpdate() == 0) {
+375 insertProperty.setString(1, key);
+376 insertProperty.setString(2, value);
+377 }
+378 } catch (SQLException ex) {
+379 final String msg = String.format("Unable to save property '%s' with a value of '%s' to the database" , key, value);
+380 LOGGER.log(Level.WARNING, msg);
+381 LOGGER.log(Level.FINE, null , ex);
+382 }
+383 }
+384 } finally {
+385 DBUtils.closeStatement(updateProperty);
+386 DBUtils.closeStatement(insertProperty);
+387 }
+388 }
+389
+390
+391
+392
+393
+394
+395
+396 void saveProperty(String key, String value) {
+397 PreparedStatement updateProperty = null ;
+398 PreparedStatement insertProperty = null ;
+399 try {
+400 try {
+401 updateProperty = getConnection().prepareStatement(UPDATE_PROPERTY);
+402 } catch (SQLException ex) {
+403 LOGGER.log(Level.WARNING, "Unable to save properties to the database" );
+404 LOGGER.log(Level.FINE, "Unable to save properties to the database" , ex);
+405 return ;
+406 }
+407 try {
+408 updateProperty.setString(1, value);
+409 updateProperty.setString(2, key);
+410 if (updateProperty.executeUpdate() == 0) {
+411 try {
+412 insertProperty = getConnection().prepareStatement(INSERT_PROPERTY);
+413 } catch (SQLException ex) {
+414 LOGGER.log(Level.WARNING, "Unable to save properties to the database" );
+415 LOGGER.log(Level.FINE, "Unable to save properties to the database" , ex);
+416 return ;
+417 }
+418 insertProperty.setString(1, key);
+419 insertProperty.setString(2, value);
+420 insertProperty.execute();
+421 }
+422 } catch (SQLException ex) {
+423 final String msg = String.format("Unable to save property '%s' with a value of '%s' to the database" , key, value);
+424 LOGGER.log(Level.WARNING, msg);
+425 LOGGER.log(Level.FINE, null , ex);
+426 }
+427 } finally {
+428 DBUtils.closeStatement(updateProperty);
+429 DBUtils.closeStatement(insertProperty);
+430 }
+431 }
+432
+433
+434
+435
+436
+437
+438
+439
+440 public List<Vulnerability> getVulnerabilities(String cpeStr) throws DatabaseException {
+441 ResultSet rs = null ;
+442 final VulnerableSoftware cpe = new VulnerableSoftware ();
+443 try {
+444 cpe.parseName(cpeStr);
+445 } catch (UnsupportedEncodingException ex) {
+446 LOGGER.log(Level.FINEST, null , ex);
+447 }
+448 final DependencyVersion detectedVersion = parseDependencyVersion(cpe);
+449 final List<Vulnerability> vulnerabilities = new ArrayList<Vulnerability>();
+450
+451 PreparedStatement ps;
+452 final HashSet<String> cveEntries = new HashSet<String>();
+453 try {
+454 ps = getConnection().prepareStatement(SELECT_CVE_FROM_SOFTWARE);
+455 ps.setString(1, cpe.getVendor());
+456 ps.setString(2, cpe.getProduct());
+457 rs = ps.executeQuery();
+458 while (rs.next()) {
+459 final String cveId = rs.getString(1);
+460 final String cpeId = rs.getString(2);
+461 final String previous = rs.getString(3);
+462 if (!cveEntries.contains(cveId) && isAffected(cpe.getVendor(), cpe.getProduct(), detectedVersion, cpeId, previous)) {
+463 cveEntries.add(cveId);
+464 final Vulnerability v = getVulnerability(cveId);
+465 v.setMatchedCPE(cpeId, previous);
+466 vulnerabilities.add(v);
+467 }
+468 }
+469 DBUtils.closeResultSet(rs);
+470 DBUtils.closeStatement(ps);
+471
+472
+473
+474
+475
+476 } catch (SQLException ex) {
+477 throw new DatabaseException ("Exception retrieving vulnerability for " + cpeStr, ex);
+478 } finally {
+479 DBUtils.closeResultSet(rs);
+480 }
+481 return vulnerabilities;
+482 }
+483
+484
+485
+486
+487
+488
+489
+490
+491 private Vulnerability getVulnerability(String cve) throws DatabaseException {
+492 PreparedStatement psV = null ;
+493 PreparedStatement psR = null ;
+494 PreparedStatement psS = null ;
+495 ResultSet rsV = null ;
+496 ResultSet rsR = null ;
+497 ResultSet rsS = null ;
+498 Vulnerability vuln = null ;
+499 try {
+500 psV = getConnection().prepareStatement(SELECT_VULNERABILITY);
+501 psV.setString(1, cve);
+502 rsV = psV.executeQuery();
+503 if (rsV.next()) {
+504 vuln = new Vulnerability ();
+505 vuln.setName(cve);
+506 vuln.setDescription(rsV.getString(2));
+507 String cwe = rsV.getString(3);
+508 if (cwe != null ) {
+509 final String name = CweDB.getCweName(cwe);
+510 if (name != null ) {
+511 cwe += " " + name;
+512 }
+513 }
+514 final int cveId = rsV.getInt(1);
+515 vuln.setCwe(cwe);
+516 vuln.setCvssScore(rsV.getFloat(4));
+517 vuln.setCvssAccessVector(rsV.getString(5));
+518 vuln.setCvssAccessComplexity(rsV.getString(6));
+519 vuln.setCvssAuthentication(rsV.getString(7));
+520 vuln.setCvssConfidentialityImpact(rsV.getString(8));
+521 vuln.setCvssIntegrityImpact(rsV.getString(9));
+522 vuln.setCvssAvailabilityImpact(rsV.getString(10));
+523
+524 psR = getConnection().prepareStatement(SELECT_REFERENCE);
+525 psR.setInt(1, cveId);
+526 rsR = psR.executeQuery();
+527 while (rsR.next()) {
+528 vuln.addReference(rsR.getString(1), rsR.getString(2), rsR.getString(3));
+529 }
+530 psS = getConnection().prepareStatement(SELECT_SOFTWARE);
+531 psS.setInt(1, cveId);
+532 rsS = psS.executeQuery();
+533 while (rsS.next()) {
+534 final String cpe = rsS.getString(1);
+535 final String prevVersion = rsS.getString(2);
+536 if (prevVersion == null ) {
+537 vuln.addVulnerableSoftware(cpe);
+538 } else {
+539 vuln.addVulnerableSoftware(cpe, prevVersion);
+540 }
+541 }
+542 }
+543 } catch (SQLException ex) {
+544 throw new DatabaseException ("Error retrieving " + cve, ex);
+545 } finally {
+546 DBUtils.closeResultSet(rsV);
+547 DBUtils.closeResultSet(rsR);
+548 DBUtils.closeResultSet(rsS);
+549 DBUtils.closeStatement(psV);
+550 DBUtils.closeStatement(psR);
+551 DBUtils.closeStatement(psS);
+552 }
+553 return vuln;
+554 }
+555
+556
+557
+558
+559
+560
+561
+562 public void updateVulnerability(Vulnerability vuln) throws DatabaseException {
+563 PreparedStatement selectVulnerabilityId = null ;
+564 PreparedStatement deleteVulnerability = null ;
+565 PreparedStatement deleteReferences = null ;
+566 PreparedStatement deleteSoftware = null ;
+567 PreparedStatement updateVulnerability = null ;
+568 PreparedStatement insertVulnerability = null ;
+569 PreparedStatement insertReference = null ;
+570 PreparedStatement selectCpeId = null ;
+571 PreparedStatement insertCpe = null ;
+572 PreparedStatement insertSoftware = null ;
+573
+574 try {
+575 selectVulnerabilityId = getConnection().prepareStatement(SELECT_VULNERABILITY_ID);
+576 deleteVulnerability = getConnection().prepareStatement(DELETE_VULNERABILITY);
+577 deleteReferences = getConnection().prepareStatement(DELETE_REFERENCE);
+578 deleteSoftware = getConnection().prepareStatement(DELETE_SOFTWARE);
+579 updateVulnerability = getConnection().prepareStatement(UPDATE_VULNERABILITY);
+580 insertVulnerability = getConnection().prepareStatement(INSERT_VULNERABILITY, Statement.RETURN_GENERATED_KEYS);
+581 insertReference = getConnection().prepareStatement(INSERT_REFERENCE);
+582 selectCpeId = getConnection().prepareStatement(SELECT_CPE_ID);
+583 insertCpe = getConnection().prepareStatement(INSERT_CPE, Statement.RETURN_GENERATED_KEYS);
+584 insertSoftware = getConnection().prepareStatement(INSERT_SOFTWARE);
+585 int vulnerabilityId = 0;
+586 selectVulnerabilityId.setString(1, vuln.getName());
+587 ResultSet rs = selectVulnerabilityId.executeQuery();
+588 if (rs.next()) {
+589 vulnerabilityId = rs.getInt(1);
+590
+591 deleteReferences.setInt(1, vulnerabilityId);
+592 deleteReferences.execute();
+593 deleteSoftware.setInt(1, vulnerabilityId);
+594 deleteSoftware.execute();
+595 }
+596 DBUtils.closeResultSet(rs);
+597 rs = null ;
+598 if (vulnerabilityId != 0) {
+599 if (vuln.getDescription().contains("** REJECT **" )) {
+600 deleteVulnerability.setInt(1, vulnerabilityId);
+601 deleteVulnerability.executeUpdate();
+602 } else {
+603 updateVulnerability.setString(1, vuln.getDescription());
+604 updateVulnerability.setString(2, vuln.getCwe());
+605 updateVulnerability.setFloat(3, vuln.getCvssScore());
+606 updateVulnerability.setString(4, vuln.getCvssAccessVector());
+607 updateVulnerability.setString(5, vuln.getCvssAccessComplexity());
+608 updateVulnerability.setString(6, vuln.getCvssAuthentication());
+609 updateVulnerability.setString(7, vuln.getCvssConfidentialityImpact());
+610 updateVulnerability.setString(8, vuln.getCvssIntegrityImpact());
+611 updateVulnerability.setString(9, vuln.getCvssAvailabilityImpact());
+612 updateVulnerability.setInt(10, vulnerabilityId);
+613 updateVulnerability.executeUpdate();
+614 }
+615 } else {
+616 insertVulnerability.setString(1, vuln.getName());
+617 insertVulnerability.setString(2, vuln.getDescription());
+618 insertVulnerability.setString(3, vuln.getCwe());
+619 insertVulnerability.setFloat(4, vuln.getCvssScore());
+620 insertVulnerability.setString(5, vuln.getCvssAccessVector());
+621 insertVulnerability.setString(6, vuln.getCvssAccessComplexity());
+622 insertVulnerability.setString(7, vuln.getCvssAuthentication());
+623 insertVulnerability.setString(8, vuln.getCvssConfidentialityImpact());
+624 insertVulnerability.setString(9, vuln.getCvssIntegrityImpact());
+625 insertVulnerability.setString(10, vuln.getCvssAvailabilityImpact());
+626 insertVulnerability.execute();
+627 try {
+628 rs = insertVulnerability.getGeneratedKeys();
+629 rs.next();
+630 vulnerabilityId = rs.getInt(1);
+631 } catch (SQLException ex) {
+632 final String msg = String.format("Unable to retrieve id for new vulnerability for '%s'" , vuln.getName());
+633 throw new DatabaseException (msg, ex);
+634 } finally {
+635 DBUtils.closeResultSet(rs);
+636 rs = null ;
+637 }
+638 }
+639 insertReference.setInt(1, vulnerabilityId);
+640 for (Reference r : vuln.getReferences()) {
+641 insertReference.setString(2, r.getName());
+642 insertReference.setString(3, r.getUrl());
+643 insertReference.setString(4, r.getSource());
+644 insertReference.execute();
+645 }
+646 for (VulnerableSoftware s : vuln.getVulnerableSoftware()) {
+647 int cpeProductId = 0;
+648 selectCpeId.setString(1, s.getName());
+649 try {
+650 rs = selectCpeId.executeQuery();
+651 if (rs.next()) {
+652 cpeProductId = rs.getInt(1);
+653 }
+654 } catch (SQLException ex) {
+655 throw new DatabaseException ("Unable to get primary key for new cpe: " + s.getName(), ex);
+656 } finally {
+657 DBUtils.closeResultSet(rs);
+658 rs = null ;
+659 }
+660
+661 if (cpeProductId == 0) {
+662 insertCpe.setString(1, s.getName());
+663 insertCpe.setString(2, s.getVendor());
+664 insertCpe.setString(3, s.getProduct());
+665 insertCpe.executeUpdate();
+666 cpeProductId = DBUtils.getGeneratedKey(insertCpe);
667 }
-668
-669 insertSoftware.setInt(1, vulnerabilityId);
-670 insertSoftware.setInt(2, cpeProductId);
-671 if (s.getPreviousVersion() == null ) {
-672 insertSoftware.setNull(3, java.sql.Types.VARCHAR);
-673 } else {
-674 insertSoftware.setString(3, s.getPreviousVersion());
-675 }
-676 insertSoftware.execute();
-677 }
-678
-679 } catch (SQLException ex) {
-680 final String msg = String.format("Error updating '%s'" , vuln.getName());
-681 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, null , ex);
-682 throw new DatabaseException (msg, ex);
-683 } finally {
-684 DBUtils.closeStatement(selectVulnerabilityId);
-685 DBUtils.closeStatement(deleteReferences);
-686 DBUtils.closeStatement(deleteSoftware);
-687 DBUtils.closeStatement(updateVulnerability);
-688 DBUtils.closeStatement(deleteVulnerability);
-689 DBUtils.closeStatement(insertVulnerability);
-690 DBUtils.closeStatement(insertReference);
-691 DBUtils.closeStatement(selectCpeId);
-692 DBUtils.closeStatement(insertCpe);
-693 DBUtils.closeStatement(insertSoftware);
-694 }
-695 }
-696
-697
-698
-699
-700
-701 public void cleanupDatabase() {
-702 PreparedStatement ps = null ;
-703 try {
-704 ps = getConnection().prepareStatement(CLEANUP_ORPHANS);
-705 if (ps != null ) {
-706 ps.executeUpdate();
-707 }
-708 } catch (SQLException ex) {
-709 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
-710 Logger.getLogger(CveDB.class .getName()).log(Level.SEVERE, msg);
-711 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, null , ex);
-712 } finally {
-713 DBUtils.closeStatement(ps);
-714 }
-715 }
-716
-717
-718
-719
-720
-721
-722
-723
-724
-725
-726
-727
-728 private boolean isAffected(String vendor, String product, DependencyVersion identifiedVersion, String cpeId, String previous) {
-729 boolean affected = false;
-730 final boolean isStruts = "apache" .equals(vendor) && "struts" .equals(product);
-731 final DependencyVersion v = parseDependencyVersion(cpeId);
-732 final boolean prevAffected = previous != null && !previous.isEmpty();
-733 if (identifiedVersion == null || "-" .equals(identifiedVersion.toString())) {
-734 if (v == null || "-" .equals(v.toString())) {
-735 affected = true ;
-736 }
-737 } else if (identifiedVersion.equals(v) || (prevAffected && identifiedVersion.compareTo(v) < 0)) {
-738 if (isStruts) {
-739 if (identifiedVersion.getVersionParts().get(0).equals(v.getVersionParts().get(0))) {
-740 affected = true ;
-741 }
-742 } else {
-743 affected = true ;
-744 }
-745 }
-746
-747
-748
-749
-750 return affected;
-751 }
-752
-753
-754
-755
-756
-757
-758
-759
-760 private DependencyVersion parseDependencyVersion(String cpeStr) {
-761 final VulnerableSoftware cpe = new VulnerableSoftware ();
-762 try {
-763 cpe.parseName(cpeStr);
-764 } catch (UnsupportedEncodingException ex) {
-765
-766 Logger.getLogger(CveDB.class .getName()).log(Level.FINEST, null , ex);
-767 }
-768 return parseDependencyVersion(cpe);
-769 }
-770
-771
-772
-773
-774
-775
-776
-777 private DependencyVersion parseDependencyVersion(VulnerableSoftware cpe) {
-778 DependencyVersion cpeVersion;
-779 if (cpe.getVersion() != null && cpe.getVersion().length() > 0) {
-780 String versionText;
-781 if (cpe.getRevision() != null && cpe.getRevision().length() > 0) {
-782 versionText = String.format("%s.%s" , cpe.getVersion(), cpe.getRevision());
-783 } else {
-784 versionText = cpe.getVersion();
-785 }
-786 cpeVersion = DependencyVersionUtil.parseVersion(versionText);
-787 } else {
-788 cpeVersion = new DependencyVersion ("-" );
-789 }
-790 return cpeVersion;
-791 }
-792 }
+668 if (cpeProductId == 0) {
+669 throw new DatabaseException ("Unable to retrieve cpeProductId - no data returned" );
+670 }
+671
+672 insertSoftware.setInt(1, vulnerabilityId);
+673 insertSoftware.setInt(2, cpeProductId);
+674 if (s.getPreviousVersion() == null ) {
+675 insertSoftware.setNull(3, java.sql.Types.VARCHAR);
+676 } else {
+677 insertSoftware.setString(3, s.getPreviousVersion());
+678 }
+679 insertSoftware.execute();
+680 }
+681
+682 } catch (SQLException ex) {
+683 final String msg = String.format("Error updating '%s'" , vuln.getName());
+684 LOGGER.log(Level.FINE, null , ex);
+685 throw new DatabaseException (msg, ex);
+686 } finally {
+687 DBUtils.closeStatement(selectVulnerabilityId);
+688 DBUtils.closeStatement(deleteReferences);
+689 DBUtils.closeStatement(deleteSoftware);
+690 DBUtils.closeStatement(updateVulnerability);
+691 DBUtils.closeStatement(deleteVulnerability);
+692 DBUtils.closeStatement(insertVulnerability);
+693 DBUtils.closeStatement(insertReference);
+694 DBUtils.closeStatement(selectCpeId);
+695 DBUtils.closeStatement(insertCpe);
+696 DBUtils.closeStatement(insertSoftware);
+697 }
+698 }
+699
+700
+701
+702
+703
+704 public void cleanupDatabase() {
+705 PreparedStatement ps = null ;
+706 try {
+707 ps = getConnection().prepareStatement(CLEANUP_ORPHANS);
+708 if (ps != null ) {
+709 ps.executeUpdate();
+710 }
+711 } catch (SQLException ex) {
+712 final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details." ;
+713 LOGGER.log(Level.SEVERE, msg);
+714 LOGGER.log(Level.FINE, null , ex);
+715 } finally {
+716 DBUtils.closeStatement(ps);
+717 }
+718 }
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731 private boolean isAffected(String vendor, String product, DependencyVersion identifiedVersion, String cpeId, String previous) {
+732 boolean affected = false;
+733 final boolean isStruts = "apache" .equals(vendor) && "struts" .equals(product);
+734 final DependencyVersion v = parseDependencyVersion(cpeId);
+735 final boolean prevAffected = previous != null && !previous.isEmpty();
+736 if (identifiedVersion == null || "-" .equals(identifiedVersion.toString())) {
+737 if (v == null || "-" .equals(v.toString())) {
+738 affected = true ;
+739 }
+740 } else if (identifiedVersion.equals(v) || (prevAffected && identifiedVersion.compareTo(v) < 0)) {
+741 if (isStruts) {
+742 if (identifiedVersion.getVersionParts().get(0).equals(v.getVersionParts().get(0))) {
+743 affected = true ;
+744 }
+745 } else {
+746 affected = true ;
+747 }
+748 }
+749
+750
+751
+752
+753 return affected;
+754 }
+755
+756
+757
+758
+759
+760
+761
+762
+763 private DependencyVersion parseDependencyVersion(String cpeStr) {
+764 final VulnerableSoftware cpe = new VulnerableSoftware ();
+765 try {
+766 cpe.parseName(cpeStr);
+767 } catch (UnsupportedEncodingException ex) {
+768
+769 LOGGER.log(Level.FINEST, null , ex);
+770 }
+771 return parseDependencyVersion(cpe);
+772 }
+773
+774
+775
+776
+777
+778
+779
+780 private DependencyVersion parseDependencyVersion(VulnerableSoftware cpe) {
+781 DependencyVersion cpeVersion;
+782 if (cpe.getVersion() != null && cpe.getVersion().length() > 0) {
+783 String versionText;
+784 if (cpe.getRevision() != null && cpe.getRevision().length() > 0) {
+785 versionText = String.format("%s.%s" , cpe.getVersion(), cpe.getRevision());
+786 } else {
+787 versionText = cpe.getVersion();
+788 }
+789 cpeVersion = DependencyVersionUtil.parseVersion(versionText);
+790 } else {
+791 cpeVersion = new DependencyVersion ("-" );
+792 }
+793 return cpeVersion;
+794 }
+795 }
17
18 package org.owasp.dependencycheck.data.nvdcve;
19
-20 import com.hazelcast.logging.Logger;
-21 import java.text.DateFormat;
-22 import java.text.SimpleDateFormat;
-23 import java.util.Date;
-24 import java.util.Map;
-25 import java.util.Map.Entry;
-26 import java.util.Properties;
-27 import java.util.TreeMap;
-28 import java.util.logging.Level;
+20 import java.text.DateFormat;
+21 import java.text.SimpleDateFormat;
+22 import java.util.Date;
+23 import java.util.Map;
+24 import java.util.Map.Entry;
+25 import java.util.Properties;
+26 import java.util.TreeMap;
+27 import java.util.logging.Level;
+28 import java.util.logging.Logger;
29 import org.owasp.dependencycheck.data.update.NvdCveInfo;
30 import org.owasp.dependencycheck.data.update.exception.UpdateException;
31
@@ -45,131 +45,135 @@
37 public class DatabaseProperties {
38
39
-40
-41
-42
-43 public static final String MODIFIED = "Modified" ;
-44
-45
-46
-47
-48 public static final String LAST_UPDATED = "NVD CVE Modified" ;
-49
-50
-51
-52
-53 public static final String LAST_UPDATED_BASE = "NVD CVE " ;
-54
-55
+40
+41
+42 private static final Logger LOGGER = Logger.getLogger(DatabaseProperties.class .getName());
+43
+44
+45
+46
+47 public static final String MODIFIED = "Modified" ;
+48
+49
+50
+51
+52 public static final String LAST_UPDATED = "NVD CVE Modified" ;
+53
+54
+55
56
-57 private Properties properties;
+57 public static final String LAST_UPDATED_BASE = "NVD CVE " ;
58
-59
+59
60
-61 private CveDB cveDB;
-62
-63
-64
-65
-66
-67
-68 DatabaseProperties (CveDB cveDB) {
-69 this .cveDB = cveDB;
-70 loadProperties();
-71 }
-72
-73
-74
-75
-76 private void loadProperties() {
-77 this .properties = cveDB.getProperties();
-78 }
-79
-80
-81
-82
-83
-84
-85 public boolean isEmpty() {
-86 return properties == null || properties.isEmpty();
-87 }
-88
-89
-90
-91
-92
-93
-94
-95 public void save(NvdCveInfo updatedValue) throws UpdateException {
-96 if (updatedValue == null ) {
-97 return ;
-98 }
-99 properties.put(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));
-100 cveDB.saveProperty(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));
-101 }
-102
-103
-104
-105
-106
-107
-108
-109
-110 public String getProperty(String key) {
-111 return properties.getProperty(key);
-112 }
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122 public String getProperty(String key, String defaultValue) {
-123 return properties.getProperty(key, defaultValue);
-124 }
-125
-126
-127
-128
-129
-130
-131 public Properties getProperties() {
-132 return properties;
-133 }
-134
-135
-136
-137
-138
-139
-140
-141 public Map getMetaData() {
-142 final TreeMap map = new TreeMap();
-143 for (Entry<Object, Object> entry : properties.entrySet()) {
-144 final String key = (String) entry.getKey();
-145 if (!"version" .equals(key)) {
-146 if (key.startsWith("NVD CVE " )) {
-147 try {
-148 final long epoch = Long.parseLong((String) entry.getValue());
-149 final Date date = new Date(epoch);
-150 final DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss" );
-151 final String formatted = format.format(date);
-152 map.put(key, formatted);
-153 } catch (Throwable ex) {
-154 Logger.getLogger(DatabaseProperties.class .getName()).log(Level.FINE, "Unable to parse timestamp from DB" , ex);
-155 map.put(key, entry.getValue());
-156 }
-157 } else {
-158 map.put(key, entry.getValue());
-159 }
-160 }
-161 }
-162 return map;
-163 }
-164 }
+61 private Properties properties;
+62
+63
+64
+65 private CveDB cveDB;
+66
+67
+68
+69
+70
+71
+72 DatabaseProperties (CveDB cveDB) {
+73 this .cveDB = cveDB;
+74 loadProperties();
+75 }
+76
+77
+78
+79
+80 private void loadProperties() {
+81 this .properties = cveDB.getProperties();
+82 }
+83
+84
+85
+86
+87
+88
+89 public boolean isEmpty() {
+90 return properties == null || properties.isEmpty();
+91 }
+92
+93
+94
+95
+96
+97
+98
+99 public void save(NvdCveInfo updatedValue) throws UpdateException {
+100 if (updatedValue == null ) {
+101 return ;
+102 }
+103 properties.put(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));
+104 cveDB.saveProperty(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));
+105 }
+106
+107
+108
+109
+110
+111
+112
+113
+114 public String getProperty(String key) {
+115 return properties.getProperty(key);
+116 }
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126 public String getProperty(String key, String defaultValue) {
+127 return properties.getProperty(key, defaultValue);
+128 }
+129
+130
+131
+132
+133
+134
+135 public Properties getProperties() {
+136 return properties;
+137 }
+138
+139
+140
+141
+142
+143
+144
+145 public Map getMetaData() {
+146 final TreeMap map = new TreeMap();
+147 for (Entry<Object, Object> entry : properties.entrySet()) {
+148 final String key = (String) entry.getKey();
+149 if (!"version" .equals(key)) {
+150 if (key.startsWith("NVD CVE " )) {
+151 try {
+152 final long epoch = Long.parseLong((String) entry.getValue());
+153 final Date date = new Date(epoch);
+154 final DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss" );
+155 final String formatted = format.format(date);
+156 map.put(key, formatted);
+157 } catch (Throwable ex) {
+158 LOGGER.log(Level.FINE, "Unable to parse timestamp from DB" , ex);
+159 map.put(key, entry.getValue());
+160 }
+161 } else {
+162 map.put(key, entry.getValue());
+163 }
+164 }
+165 }
+166 return map;
+167 }
+168 }
38 public final class DriverLoader {
39
40
-41
+41
42
-43 private DriverLoader () {
-44 }
-45
-46
-47
-48
-49
-50
-51
-52
-53 public static Driver load(String className) throws DriverLoadException {
-54 final ClassLoader loader = DriverLoader.class .getClassLoader();
-55 return load(className, loader);
-56 }
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71 public static Driver load(String className, String pathToDriver) throws DriverLoadException {
-72 final URLClassLoader parent = (URLClassLoader) ClassLoader.getSystemClassLoader();
-73 final ArrayList<URL> urls = new ArrayList<URL>();
-74 final String[] paths = pathToDriver.split(File.pathSeparator);
-75 for (String path : paths) {
-76 final File file = new File(path);
-77 if (file.isDirectory()) {
-78 final File[] files = file.listFiles();
-79
-80 for (File f : files) {
-81 try {
-82 urls.add(f.toURI().toURL());
-83 } catch (MalformedURLException ex) {
-84 final String msg = String.format("Unable to load database driver '%s'; invalid path provided '%s'" ,
-85 className, f.getAbsoluteFile());
-86 Logger.getLogger(DriverLoader.class .getName()).log(Level.FINE, msg, ex);
-87 throw new DriverLoadException (msg, ex);
-88 }
-89 }
-90 } else if (file.exists()) {
-91 try {
-92 urls.add(file.toURI().toURL());
-93 } catch (MalformedURLException ex) {
-94 final String msg = String.format("Unable to load database driver '%s'; invalid path provided '%s'" ,
-95 className, file.getAbsoluteFile());
-96 Logger.getLogger(DriverLoader.class .getName()).log(Level.FINE, msg, ex);
-97 throw new DriverLoadException (msg, ex);
-98 }
-99 }
-100 }
-101 final URLClassLoader loader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() {
-102 @Override
-103 public URLClassLoader run() {
-104 return new URLClassLoader(urls.toArray(new URL[urls.size()]), parent);
-105 }
-106 });
-107
-108 return load(className, loader);
-109 }
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119 private static Driver load(String className, ClassLoader loader) throws DriverLoadException {
-120 try {
-121 final Class c = Class.forName(className, true , loader);
-122
-123 final Driver driver = (Driver) c.newInstance();
-124 final Driver shim = new DriverShim (driver);
-125
-126 DriverManager.registerDriver(shim);
-127 return shim;
-128 } catch (ClassNotFoundException ex) {
-129 final String msg = String.format("Unable to load database driver '%s'" , className);
-130 Logger.getLogger(DriverLoader.class .getName()).log(Level.FINE, msg, ex);
-131 throw new DriverLoadException (msg, ex);
-132 } catch (InstantiationException ex) {
-133 final String msg = String.format("Unable to load database driver '%s'" , className);
-134 Logger.getLogger(DriverLoader.class .getName()).log(Level.FINE, msg, ex);
-135 throw new DriverLoadException (msg, ex);
-136 } catch (IllegalAccessException ex) {
-137 final String msg = String.format("Unable to load database driver '%s'" , className);
-138 Logger.getLogger(DriverLoader.class .getName()).log(Level.FINE, msg, ex);
-139 throw new DriverLoadException (msg, ex);
-140 } catch (SQLException ex) {
-141 final String msg = String.format("Unable to load database driver '%s'" , className);
-142 Logger.getLogger(DriverLoader.class .getName()).log(Level.FINE, msg, ex);
-143 throw new DriverLoadException (msg, ex);
-144 }
-145 }
-146 }
+43 private static final Logger LOGGER = Logger.getLogger(DriverLoader.class .getName());
+44
+45
+46
+47
+48 private DriverLoader () {
+49 }
+50
+51
+52
+53
+54
+55
+56
+57
+58 public static Driver load(String className) throws DriverLoadException {
+59 final ClassLoader loader = DriverLoader.class .getClassLoader();
+60 return load(className, loader);
+61 }
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76 public static Driver load(String className, String pathToDriver) throws DriverLoadException {
+77 final URLClassLoader parent = (URLClassLoader) ClassLoader.getSystemClassLoader();
+78 final ArrayList<URL> urls = new ArrayList<URL>();
+79 final String[] paths = pathToDriver.split(File.pathSeparator);
+80 for (String path : paths) {
+81 final File file = new File(path);
+82 if (file.isDirectory()) {
+83 final File[] files = file.listFiles();
+84
+85 for (File f : files) {
+86 try {
+87 urls.add(f.toURI().toURL());
+88 } catch (MalformedURLException ex) {
+89 final String msg = String.format("Unable to load database driver '%s'; invalid path provided '%s'" ,
+90 className, f.getAbsoluteFile());
+91 LOGGER.log(Level.FINE, msg, ex);
+92 throw new DriverLoadException (msg, ex);
+93 }
+94 }
+95 } else if (file.exists()) {
+96 try {
+97 urls.add(file.toURI().toURL());
+98 } catch (MalformedURLException ex) {
+99 final String msg = String.format("Unable to load database driver '%s'; invalid path provided '%s'" ,
+100 className, file.getAbsoluteFile());
+101 LOGGER.log(Level.FINE, msg, ex);
+102 throw new DriverLoadException (msg, ex);
+103 }
+104 }
+105 }
+106 final URLClassLoader loader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() {
+107 @Override
+108 public URLClassLoader run() {
+109 return new URLClassLoader(urls.toArray(new URL[urls.size()]), parent);
+110 }
+111 });
+112
+113 return load(className, loader);
+114 }
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124 private static Driver load(String className, ClassLoader loader) throws DriverLoadException {
+125 try {
+126 final Class c = Class.forName(className, true , loader);
+127
+128 final Driver driver = (Driver) c.newInstance();
+129 final Driver shim = new DriverShim (driver);
+130
+131 DriverManager.registerDriver(shim);
+132 return shim;
+133 } catch (ClassNotFoundException ex) {
+134 final String msg = String.format("Unable to load database driver '%s'" , className);
+135 LOGGER.log(Level.FINE, msg, ex);
+136 throw new DriverLoadException (msg, ex);
+137 } catch (InstantiationException ex) {
+138 final String msg = String.format("Unable to load database driver '%s'" , className);
+139 LOGGER.log(Level.FINE, msg, ex);
+140 throw new DriverLoadException (msg, ex);
+141 } catch (IllegalAccessException ex) {
+142 final String msg = String.format("Unable to load database driver '%s'" , className);
+143 LOGGER.log(Level.FINE, msg, ex);
+144 throw new DriverLoadException (msg, ex);
+145 } catch (SQLException ex) {
+146 final String msg = String.format("Unable to load database driver '%s'" , className);
+147 LOGGER.log(Level.FINE, msg, ex);
+148 throw new DriverLoadException (msg, ex);
+149 }
+150 }
+151 }
40 class DriverShim implements Driver {
41
42
-43
+43
44
-45 private final Driver driver;
-46
-47
-48
-49
-50
-51
-52 DriverShim (Driver driver) {
-53 this .driver = driver;
-54 }
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65 @Override
-66 public boolean acceptsURL(String url) throws SQLException {
-67 return this .driver.acceptsURL(url);
-68 }
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79 @Override
-80 public Connection connect(String url, Properties info) throws SQLException {
-81 return this .driver.connect(url, info);
-82 }
-83
-84
-85
-86
-87
-88
-89
-90 @Override
-91 public int getMajorVersion() {
-92 return this .driver.getMajorVersion();
-93 }
-94
-95
-96
-97
-98
-99
-100
-101 @Override
-102 public int getMinorVersion() {
-103 return this .driver.getMinorVersion();
-104 }
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114 public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-115
-116 Method m = null ;
-117 try {
-118 m = driver.getClass().getMethod("getParentLogger" );
-119 } catch (Throwable e) {
-120 throw new SQLFeatureNotSupportedException();
-121 }
-122 if (m != null ) {
-123 try {
-124 return (Logger) m.invoke(m);
-125 } catch (IllegalAccessException ex) {
-126 Logger.getLogger(DriverShim.class .getName()).log(Level.FINER, null , ex);
-127 } catch (IllegalArgumentException ex) {
-128 Logger.getLogger(DriverShim.class .getName()).log(Level.FINER, null , ex);
-129 } catch (InvocationTargetException ex) {
-130 Logger.getLogger(DriverShim.class .getName()).log(Level.FINER, null , ex);
-131 }
-132 }
-133 throw new SQLFeatureNotSupportedException();
-134 }
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145 @Override
-146 public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
-147 return this .driver.getPropertyInfo(url, info);
-148 }
-149
-150
-151
-152
-153
-154
-155
-156 @Override
-157 public boolean jdbcCompliant() {
-158 return this .driver.jdbcCompliant();
-159 }
-160
-161
-162
-163
-164
-165
-166 @Override
-167 public int hashCode() {
-168 int hash = 7;
-169 hash = 97 * hash + (this .driver != null ? this .driver.hashCode() : 0);
-170 return hash;
-171 }
-172
-173
-174
-175
-176
-177
-178
-179 @Override
-180 public boolean equals(Object obj) {
-181 if (obj == null ) {
-182 return false;
-183 }
-184 if (getClass() != obj.getClass()) {
-185 return false;
-186 }
-187 final DriverShim other = (DriverShim) obj;
-188 return this .driver == other.driver || (this .driver != null && this .driver.equals(other.driver));
-189 }
-190
-191
-192
-193
-194
-195
-196 @Override
-197 public String toString() {
-198 return "DriverShim{" + "driver=" + driver + '}';
-199 }
-200 }
+45 private static final Logger LOGGER = Logger.getLogger(DriverShim.class .getName());
+46
+47
+48
+49 private final Driver driver;
+50
+51
+52
+53
+54
+55
+56 DriverShim (Driver driver) {
+57 this .driver = driver;
+58 }
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69 @Override
+70 public boolean acceptsURL(String url) throws SQLException {
+71 return this .driver.acceptsURL(url);
+72 }
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83 @Override
+84 public Connection connect(String url, Properties info) throws SQLException {
+85 return this .driver.connect(url, info);
+86 }
+87
+88
+89
+90
+91
+92
+93
+94 @Override
+95 public int getMajorVersion() {
+96 return this .driver.getMajorVersion();
+97 }
+98
+99
+100
+101
+102
+103
+104
+105 @Override
+106 public int getMinorVersion() {
+107 return this .driver.getMinorVersion();
+108 }
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118 public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+119
+120 Method m = null ;
+121 try {
+122 m = driver.getClass().getMethod("getParentLogger" );
+123 } catch (Throwable e) {
+124 throw new SQLFeatureNotSupportedException();
+125 }
+126 if (m != null ) {
+127 try {
+128 return (Logger) m.invoke(m);
+129 } catch (IllegalAccessException ex) {
+130 LOGGER.log(Level.FINER, null , ex);
+131 } catch (IllegalArgumentException ex) {
+132 LOGGER.log(Level.FINER, null , ex);
+133 } catch (InvocationTargetException ex) {
+134 LOGGER.log(Level.FINER, null , ex);
+135 }
+136 }
+137 throw new SQLFeatureNotSupportedException();
+138 }
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149 @Override
+150 public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
+151 return this .driver.getPropertyInfo(url, info);
+152 }
+153
+154
+155
+156
+157
+158
+159
+160 @Override
+161 public boolean jdbcCompliant() {
+162 return this .driver.jdbcCompliant();
+163 }
+164
+165
+166
+167
+168
+169
+170 @Override
+171 public int hashCode() {
+172 int hash = 7;
+173 hash = 97 * hash + (this .driver != null ? this .driver.hashCode() : 0);
+174 return hash;
+175 }
+176
+177
+178
+179
+180
+181
+182
+183 @Override
+184 public boolean equals(Object obj) {
+185 if (obj == null ) {
+186 return false;
+187 }
+188 if (getClass() != obj.getClass()) {
+189 return false;
+190 }
+191 final DriverShim other = (DriverShim) obj;
+192 return this .driver == other.driver || (this .driver != null && this .driver.equals(other.driver));
+193 }
+194
+195
+196
+197
+198
+199
+200 @Override
+201 public String toString() {
+202 return "DriverShim{" + "driver=" + driver + '}';
+203 }
+204 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nvdcve
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nvdcve
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.nvdcve
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.nvdcve
31 public class NvdCveUpdater implements CachedWebDataSource {
32
33
-34
-35
-36
-37
-38
-39 @Override
-40 public void update() throws UpdateException {
-41 try {
-42 final StandardUpdate task = new StandardUpdate ();
-43 if (task.isUpdateNeeded()) {
-44 task.update();
-45 }
-46 } catch (MalformedURLException ex) {
-47 Logger.getLogger(NvdCveUpdater.class .getName()).log(Level.WARNING,
-48 "NVD CVE properties files contain an invalid URL, unable to update the data to use the most current data." );
-49 Logger.getLogger(NvdCveUpdater.class .getName()).log(Level.FINE, null , ex);
-50 } catch (DownloadFailedException ex) {
-51 Logger.getLogger(NvdCveUpdater.class .getName()).log(Level.WARNING,
-52 "Unable to download the NVD CVE data, unable to update the data to use the most current data." );
-53 Logger.getLogger(NvdCveUpdater.class .getName()).log(Level.FINE, null , ex);
-54 }
-55 }
-56 }
+34
+35
+36 private static final Logger LOGGER = Logger.getLogger(NvdCveUpdater.class .getName());
+37
+38
+39
+40
+41
+42
+43
+44 @Override
+45 public void update() throws UpdateException {
+46 try {
+47 final StandardUpdate task = new StandardUpdate ();
+48 if (task.isUpdateNeeded()) {
+49 task.update();
+50 }
+51 } catch (MalformedURLException ex) {
+52 LOGGER.log(Level.WARNING,
+53 "NVD CVE properties files contain an invalid URL, unable to update the data to use the most current data." );
+54 LOGGER.log(Level.FINE, null , ex);
+55 } catch (DownloadFailedException ex) {
+56 LOGGER.log(Level.WARNING,
+57 "Unable to download the NVD CVE data, unable to update the data to use the most current data." );
+58 LOGGER.log(Level.FINE, null , ex);
+59 }
+60 }
+61 }
48 public class StandardUpdate {
49
50
-51
+51
52
-53 public static final int MAX_THREAD_POOL_SIZE = Settings.getInt(Settings.KEYS.MAX_DOWNLOAD_THREAD_POOL_SIZE, 3);
+53 private static final Logger LOGGER = Logger.getLogger(StandardUpdate.class .getName());
54
-55
+55
56
-57 private DatabaseProperties properties;
+57 public static final int MAX_THREAD_POOL_SIZE = Settings.getInt(Settings.KEYS.MAX_DOWNLOAD_THREAD_POOL_SIZE, 3);
58
-59
+59
60
-61 private UpdateableNvdCve updateable;
+61 private DatabaseProperties properties;
62
-63
+63
64
-65 private CveDB cveDB = null ;
-66
-67
-68
-69
-70
-71
-72 public boolean isUpdateNeeded() {
-73 return updateable.isUpdateNeeded();
-74 }
-75
-76
-77
-78
-79
-80
-81
-82
-83 public StandardUpdate () throws MalformedURLException, DownloadFailedException, UpdateException {
-84 openDataStores();
-85 properties = cveDB.getDatabaseProperties();
-86 updateable = updatesNeeded();
-87 }
-88
-89
-90
-91
-92
-93
-94
-95 public void update() throws UpdateException {
-96 int maxUpdates = 0;
-97 try {
-98 for (NvdCveInfo cve : updateable) {
-99 if (cve.getNeedsUpdate()) {
-100 maxUpdates += 1;
-101 }
-102 }
-103 if (maxUpdates <= 0) {
-104 return ;
-105 }
-106 if (maxUpdates > 3) {
-107 Logger.getLogger(StandardUpdate.class .getName()).log(Level.INFO,
-108 "NVD CVE requires several updates; this could take a couple of minutes." );
+65 private UpdateableNvdCve updateable;
+66
+67
+68
+69 private CveDB cveDB = null ;
+70
+71
+72
+73
+74
+75
+76 public boolean isUpdateNeeded() {
+77 return updateable.isUpdateNeeded();
+78 }
+79
+80
+81
+82
+83
+84
+85
+86
+87 public StandardUpdate () throws MalformedURLException, DownloadFailedException, UpdateException {
+88 openDataStores();
+89 properties = cveDB.getDatabaseProperties();
+90 updateable = updatesNeeded();
+91 }
+92
+93
+94
+95
+96
+97
+98
+99 public void update() throws UpdateException {
+100 int maxUpdates = 0;
+101 try {
+102 for (NvdCveInfo cve : updateable) {
+103 if (cve.getNeedsUpdate()) {
+104 maxUpdates += 1;
+105 }
+106 }
+107 if (maxUpdates <= 0) {
+108 return ;
109 }
-110 if (maxUpdates > 0) {
-111 openDataStores();
-112 }
-113
-114 final int poolSize = (MAX_THREAD_POOL_SIZE < maxUpdates) ? MAX_THREAD_POOL_SIZE : maxUpdates;
-115
-116 final ExecutorService downloadExecutors = Executors.newFixedThreadPool(poolSize);
-117 final ExecutorService processExecutor = Executors.newSingleThreadExecutor();
-118 final Set<Future<Future<ProcessTask>>> downloadFutures = new HashSet<Future<Future<ProcessTask>>>(maxUpdates);
-119 for (NvdCveInfo cve : updateable) {
-120 if (cve.getNeedsUpdate()) {
-121 final CallableDownloadTask call = new CallableDownloadTask (cve, processExecutor, cveDB);
-122 downloadFutures.add(downloadExecutors.submit(call));
-123 }
-124 }
-125 downloadExecutors.shutdown();
-126
-127
-128 final Set<Future<ProcessTask>> processFutures = new HashSet<Future<ProcessTask>>(maxUpdates);
-129 for (Future<Future<ProcessTask>> future : downloadFutures) {
-130 Future<ProcessTask> task = null ;
-131 try {
-132 task = future.get();
-133 } catch (InterruptedException ex) {
-134 downloadExecutors.shutdownNow();
-135 processExecutor.shutdownNow();
-136
-137 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "Thread was interrupted during download" , ex);
-138 throw new UpdateException ("The download was interrupted" , ex);
-139 } catch (ExecutionException ex) {
-140 downloadExecutors.shutdownNow();
-141 processExecutor.shutdownNow();
-142
-143 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "Thread was interrupted during download execution" , ex);
-144 throw new UpdateException ("The execution of the download was interrupted" , ex);
-145 }
-146 if (task == null ) {
-147 downloadExecutors.shutdownNow();
-148 processExecutor.shutdownNow();
-149 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "Thread was interrupted during download" );
-150 throw new UpdateException ("The download was interrupted; unable to complete the update" );
-151 } else {
-152 processFutures.add(task);
-153 }
-154 }
-155
-156 for (Future<ProcessTask> future : processFutures) {
-157 try {
-158 final ProcessTask task = future.get();
-159 if (task.getException() != null ) {
-160 throw task.getException();
-161 }
-162 } catch (InterruptedException ex) {
-163 processExecutor.shutdownNow();
-164 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "Thread was interrupted during processing" , ex);
-165 throw new UpdateException (ex);
-166 } catch (ExecutionException ex) {
+110 if (maxUpdates > 3) {
+111 LOGGER.log(Level.INFO,
+112 "NVD CVE requires several updates; this could take a couple of minutes." );
+113 }
+114 if (maxUpdates > 0) {
+115 openDataStores();
+116 }
+117
+118 final int poolSize = (MAX_THREAD_POOL_SIZE < maxUpdates) ? MAX_THREAD_POOL_SIZE : maxUpdates;
+119
+120 final ExecutorService downloadExecutors = Executors.newFixedThreadPool(poolSize);
+121 final ExecutorService processExecutor = Executors.newSingleThreadExecutor();
+122 final Set<Future<Future<ProcessTask>>> downloadFutures = new HashSet<Future<Future<ProcessTask>>>(maxUpdates);
+123 for (NvdCveInfo cve : updateable) {
+124 if (cve.getNeedsUpdate()) {
+125 final CallableDownloadTask call = new CallableDownloadTask (cve, processExecutor, cveDB, Settings.getInstance());
+126 downloadFutures.add(downloadExecutors.submit(call));
+127 }
+128 }
+129 downloadExecutors.shutdown();
+130
+131
+132 final Set<Future<ProcessTask>> processFutures = new HashSet<Future<ProcessTask>>(maxUpdates);
+133 for (Future<Future<ProcessTask>> future : downloadFutures) {
+134 Future<ProcessTask> task = null ;
+135 try {
+136 task = future.get();
+137 } catch (InterruptedException ex) {
+138 downloadExecutors.shutdownNow();
+139 processExecutor.shutdownNow();
+140
+141 LOGGER.log(Level.FINE, "Thread was interrupted during download" , ex);
+142 throw new UpdateException ("The download was interrupted" , ex);
+143 } catch (ExecutionException ex) {
+144 downloadExecutors.shutdownNow();
+145 processExecutor.shutdownNow();
+146
+147 LOGGER.log(Level.FINE, "Thread was interrupted during download execution" , ex);
+148 throw new UpdateException ("The execution of the download was interrupted" , ex);
+149 }
+150 if (task == null ) {
+151 downloadExecutors.shutdownNow();
+152 processExecutor.shutdownNow();
+153 LOGGER.log(Level.FINE, "Thread was interrupted during download" );
+154 throw new UpdateException ("The download was interrupted; unable to complete the update" );
+155 } else {
+156 processFutures.add(task);
+157 }
+158 }
+159
+160 for (Future<ProcessTask> future : processFutures) {
+161 try {
+162 final ProcessTask task = future.get();
+163 if (task.getException() != null ) {
+164 throw task.getException();
+165 }
+166 } catch (InterruptedException ex) {
167 processExecutor.shutdownNow();
-168 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "Execution Exception during process" , ex);
+168 LOGGER.log(Level.FINE, "Thread was interrupted during processing" , ex);
169 throw new UpdateException (ex);
-170 } finally {
-171 processExecutor.shutdown();
-172 }
-173 }
-174
-175 if (maxUpdates >= 1) {
-176 properties.save(updateable.get(MODIFIED));
-177 cveDB.cleanupDatabase();
-178 }
-179 } finally {
-180 closeDataStores();
-181 }
-182 }
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194 protected final UpdateableNvdCve updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
-195 UpdateableNvdCve updates = null ;
-196 try {
-197 updates = retrieveCurrentTimestampsFromWeb();
-198 } catch (InvalidDataException ex) {
-199 final String msg = "Unable to retrieve valid timestamp from nvd cve downloads page" ;
-200 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, msg, ex);
-201 throw new DownloadFailedException (msg, ex);
-202 } catch (InvalidSettingException ex) {
-203 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "Invalid setting found when retrieving timestamps" , ex);
-204 throw new DownloadFailedException ("Invalid settings" , ex);
-205 }
-206
-207 if (updates == null ) {
-208 throw new DownloadFailedException ("Unable to retrieve the timestamps of the currently published NVD CVE data" );
+170 } catch (ExecutionException ex) {
+171 processExecutor.shutdownNow();
+172 LOGGER.log(Level.FINE, "Execution Exception during process" , ex);
+173 throw new UpdateException (ex);
+174 } finally {
+175 processExecutor.shutdown();
+176 }
+177 }
+178
+179 if (maxUpdates >= 1) {
+180 properties.save(updateable.get(MODIFIED));
+181 cveDB.cleanupDatabase();
+182 }
+183 } finally {
+184 closeDataStores();
+185 }
+186 }
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198 protected final UpdateableNvdCve updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
+199 UpdateableNvdCve updates = null ;
+200 try {
+201 updates = retrieveCurrentTimestampsFromWeb();
+202 } catch (InvalidDataException ex) {
+203 final String msg = "Unable to retrieve valid timestamp from nvd cve downloads page" ;
+204 LOGGER.log(Level.FINE, msg, ex);
+205 throw new DownloadFailedException (msg, ex);
+206 } catch (InvalidSettingException ex) {
+207 LOGGER.log(Level.FINE, "Invalid setting found when retrieving timestamps" , ex);
+208 throw new DownloadFailedException ("Invalid settings" , ex);
209 }
-210 if (!properties.isEmpty()) {
-211 try {
-212 final long lastUpdated = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED, "0" ));
-213 final Date now = new Date();
-214 final int days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);
-215 if (lastUpdated == updates.getTimeStamp(MODIFIED)) {
-216 updates.clear();
-217 } else if (withinRange(lastUpdated, now.getTime(), days)) {
-218 for (NvdCveInfo entry : updates) {
-219 if (MODIFIED.equals(entry.getId())) {
-220 entry.setNeedsUpdate(true );
-221 } else {
-222 entry.setNeedsUpdate(false);
-223 }
-224 }
-225 } else {
-226 for (NvdCveInfo entry : updates) {
-227 if (MODIFIED.equals(entry.getId())) {
-228 entry.setNeedsUpdate(true );
-229 } else {
-230 long currentTimestamp = 0;
-231 try {
-232 currentTimestamp = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED_BASE + entry.getId(), "0" ));
-233 } catch (NumberFormatException ex) {
-234 final String msg = String.format("Error parsing '%s' '%s' from nvdcve.lastupdated" ,
-235 DatabaseProperties.LAST_UPDATED_BASE, entry.getId());
-236 Logger
-237 .getLogger(StandardUpdate.class
-238 .getName()).log(Level.FINE, msg, ex);
-239 }
-240 if (currentTimestamp == entry.getTimestamp()) {
-241 entry.setNeedsUpdate(false);
-242 }
-243 }
-244 }
-245 }
-246 } catch (NumberFormatException ex) {
-247 final String msg = "An invalid schema version or timestamp exists in the data.properties file." ;
-248 Logger.getLogger(StandardUpdate.class .getName()).log(Level.WARNING, msg);
-249 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "" , ex);
-250 }
-251 }
-252 return updates;
-253 }
-254
-255
-256
-257
-258
-259
-260
-261
-262
-263
-264 private UpdateableNvdCve retrieveCurrentTimestampsFromWeb()
-265 throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {
-266
-267 final UpdateableNvdCve updates = new UpdateableNvdCve ();
-268 updates.add(MODIFIED, Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL),
-269 Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),
-270 false);
-271
-272 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);
-273 final int end = Calendar.getInstance().get(Calendar.YEAR);
-274 final String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);
-275 final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);
-276 for (int i = start; i <= end; i++) {
-277 updates.add(Integer.toString(i), String.format(baseUrl20, i),
-278 String.format(baseUrl12, i),
-279 true );
-280 }
-281
-282 return updates;
-283 }
-284
-285
-286
-287
-288 protected void closeDataStores() {
-289 if (cveDB != null ) {
-290 try {
-291 cveDB.close();
-292 } catch (Throwable ignore) {
-293 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINEST, "Error closing the cveDB" , ignore);
-294 }
-295 }
-296 }
-297
-298
-299
-300
-301
-302
-303 protected final void openDataStores() throws UpdateException {
-304 if (cveDB != null ) {
-305 return ;
-306 }
-307 try {
-308 cveDB = new CveDB ();
-309 cveDB.open();
-310 } catch (DatabaseException ex) {
-311 closeDataStores();
-312 Logger.getLogger(StandardUpdate.class .getName()).log(Level.FINE, "Database Exception opening databases" , ex);
-313 throw new UpdateException ("Error updating the CPE/CVE data, please see the log file for more details." );
-314 }
-315 }
-316
-317
-318
-319
-320
-321
-322
-323
-324
-325
-326
-327 protected boolean withinRange(long date, long compareTo, int range) {
-328 final double differenceInDays = (compareTo - date) / 1000.0 / 60.0 / 60.0 / 24.0;
-329 return differenceInDays < range;
-330 }
-331 }
+210
+211 if (updates == null ) {
+212 throw new DownloadFailedException ("Unable to retrieve the timestamps of the currently published NVD CVE data" );
+213 }
+214 if (!properties.isEmpty()) {
+215 try {
+216 final long lastUpdated = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED, "0" ));
+217 final Date now = new Date();
+218 final int days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);
+219 if (lastUpdated == updates.getTimeStamp(MODIFIED)) {
+220 updates.clear();
+221 } else if (withinRange(lastUpdated, now.getTime(), days)) {
+222 for (NvdCveInfo entry : updates) {
+223 if (MODIFIED.equals(entry.getId())) {
+224 entry.setNeedsUpdate(true );
+225 } else {
+226 entry.setNeedsUpdate(false);
+227 }
+228 }
+229 } else {
+230 for (NvdCveInfo entry : updates) {
+231 if (MODIFIED.equals(entry.getId())) {
+232 entry.setNeedsUpdate(true );
+233 } else {
+234 long currentTimestamp = 0;
+235 try {
+236 currentTimestamp = Long.parseLong(properties.getProperty(DatabaseProperties.LAST_UPDATED_BASE + entry.getId(), "0" ));
+237 } catch (NumberFormatException ex) {
+238 final String msg = String.format("Error parsing '%s' '%s' from nvdcve.lastupdated" ,
+239 DatabaseProperties.LAST_UPDATED_BASE, entry.getId());
+240 LOGGER.log(Level.FINE, msg, ex);
+241 }
+242 if (currentTimestamp == entry.getTimestamp()) {
+243 entry.setNeedsUpdate(false);
+244 }
+245 }
+246 }
+247 }
+248 } catch (NumberFormatException ex) {
+249 final String msg = "An invalid schema version or timestamp exists in the data.properties file." ;
+250 LOGGER.log(Level.WARNING, msg);
+251 LOGGER.log(Level.FINE, "" , ex);
+252 }
+253 }
+254 return updates;
+255 }
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266 private UpdateableNvdCve retrieveCurrentTimestampsFromWeb()
+267 throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {
+268
+269 final UpdateableNvdCve updates = new UpdateableNvdCve ();
+270 updates.add(MODIFIED, Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL),
+271 Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),
+272 false);
+273
+274 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);
+275 final int end = Calendar.getInstance().get(Calendar.YEAR);
+276 final String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);
+277 final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);
+278 for (int i = start; i <= end; i++) {
+279 updates.add(Integer.toString(i), String.format(baseUrl20, i),
+280 String.format(baseUrl12, i),
+281 true );
+282 }
+283
+284 return updates;
+285 }
+286
+287
+288
+289
+290 protected void closeDataStores() {
+291 if (cveDB != null ) {
+292 try {
+293 cveDB.close();
+294 } catch (Throwable ignore) {
+295 LOGGER.log(Level.FINEST, "Error closing the cveDB" , ignore);
+296 }
+297 }
+298 }
+299
+300
+301
+302
+303
+304
+305 protected final void openDataStores() throws UpdateException {
+306 if (cveDB != null ) {
+307 return ;
+308 }
+309 try {
+310 cveDB = new CveDB ();
+311 cveDB.open();
+312 } catch (DatabaseException ex) {
+313 closeDataStores();
+314 LOGGER.log(Level.FINE, "Database Exception opening databases" , ex);
+315 throw new UpdateException ("Error updating the CPE/CVE data, please see the log file for more details." );
+316 }
+317 }
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329 protected boolean withinRange(long date, long compareTo, int range) {
+330 final double differenceInDays = (compareTo - date) / 1000.0 / 60.0 / 60.0 / 24.0;
+331 return differenceInDays < range;
+332 }
+333 }
21 import java.util.ServiceLoader;
22
23
-24
-25
-26
-27 public final class UpdateService {
-28
-29
-30
-31
-32 private static UpdateService service;
-33
-34
-35
-36 private final ServiceLoader<CachedWebDataSource> loader;
-37
-38
-39
+24
+25
+26
+27
+28
+29 public class UpdateService {
+30
+31
+32
+33
+34 private final ServiceLoader<CachedWebDataSource> loader;
+35
+36
+37
+38
+39
40
-41 private UpdateService () {
-42 loader = ServiceLoader.load(CachedWebDataSource.class );
+41 public UpdateService (ClassLoader classLoader) {
+42 loader = ServiceLoader.load(CachedWebDataSource.class , classLoader);
43 }
44
45
-46
+46
47
-48
+48
49
-50 public static synchronized UpdateService getInstance() {
-51 if (service == null ) {
-52 service = new UpdateService ();
-53 }
-54 return service;
-55 }
-56
-57
-58
-59
-60
-61
-62 public Iterator<CachedWebDataSource> getDataSources() {
-63 return loader.iterator();
-64 }
-65 }
+50 public Iterator<CachedWebDataSource> getDataSources() {
+51 return loader.iterator();
+52 }
+53 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.exception
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.exception
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.exception
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.exception
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update
27 import java.util.logging.Logger;
28 import org.owasp.dependencycheck.data.nvdcve.CveDB;
29 import org.owasp.dependencycheck.data.update.NvdCveInfo;
-30 import org.owasp.dependencycheck.utils.DownloadFailedException;
-31 import org.owasp.dependencycheck.utils.Downloader;
-32 import org.owasp.dependencycheck.utils.Settings;
-33
-34
-35
-36
-37
-38
-39 public class CallableDownloadTask implements Callable<Future<ProcessTask>> {
-40
-41
-42
-43
-44
-45
-46
-47
-48 public CallableDownloadTask (NvdCveInfo nvdCveInfo, ExecutorService processor, CveDB cveDB) {
-49 this .nvdCveInfo = nvdCveInfo;
-50 this .processorService = processor;
-51 this .cveDB = cveDB;
-52
-53 final File file1;
-54 final File file2;
-55
-56 try {
-57 file1 = File.createTempFile("cve" + nvdCveInfo.getId() + "_" , ".xml" , Settings.getTempDirectory());
-58 file2 = File.createTempFile("cve_1_2_" + nvdCveInfo.getId() + "_" , ".xml" , Settings.getTempDirectory());
-59 } catch (IOException ex) {
-60 return ;
-61 }
-62 this .first = file1;
-63 this .second = file2;
-64
-65 }
-66
-67
-68
-69 private CveDB cveDB;
-70
-71
-72
-73 private ExecutorService processorService;
-74
-75
-76
-77 private NvdCveInfo nvdCveInfo;
-78
-79
-80
-81
-82
-83
-84 public NvdCveInfo getNvdCveInfo() {
-85 return nvdCveInfo;
-86 }
-87
+30 import org.owasp.dependencycheck.data.update.exception.UpdateException;
+31 import org.owasp.dependencycheck.utils.DownloadFailedException;
+32 import org.owasp.dependencycheck.utils.Downloader;
+33 import org.owasp.dependencycheck.utils.Settings;
+34
+35
+36
+37
+38
+39
+40 public class CallableDownloadTask implements Callable<Future<ProcessTask>> {
+41
+42
+43
+44
+45 private static final Logger LOGGER = Logger.getLogger(CallableDownloadTask.class .getName());
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57 public CallableDownloadTask (NvdCveInfo nvdCveInfo, ExecutorService processor, CveDB cveDB, Settings settings) throws UpdateException {
+58 this .nvdCveInfo = nvdCveInfo;
+59 this .processorService = processor;
+60 this .cveDB = cveDB;
+61 this .settings = settings;
+62
+63 final File file1;
+64 final File file2;
+65
+66 try {
+67 file1 = File.createTempFile("cve" + nvdCveInfo.getId() + "_" , ".xml" , Settings.getTempDirectory());
+68 file2 = File.createTempFile("cve_1_2_" + nvdCveInfo.getId() + "_" , ".xml" , Settings.getTempDirectory());
+69 } catch (IOException ex) {
+70 throw new UpdateException ("Unable to create temporary files" , ex);
+71 }
+72 this .first = file1;
+73 this .second = file2;
+74
+75 }
+76
+77
+78
+79 private CveDB cveDB;
+80
+81
+82
+83 private ExecutorService processorService;
+84
+85
+86
+87 private NvdCveInfo nvdCveInfo;
88
-89
-90
-91
-92
-93 public void setNvdCveInfo(NvdCveInfo nvdCveInfo) {
-94 this .nvdCveInfo = nvdCveInfo;
-95 }
-96
-97
-98
-99 private File first;
-100
-101
-102
-103
-104
-105
-106 public File getFirst() {
-107 return first;
-108 }
-109
+89
+90
+91 private Settings settings;
+92
+93
+94
+95
+96
+97
+98 public NvdCveInfo getNvdCveInfo() {
+99 return nvdCveInfo;
+100 }
+101
+102
+103
+104
+105
+106
+107 public void setNvdCveInfo(NvdCveInfo nvdCveInfo) {
+108 this .nvdCveInfo = nvdCveInfo;
+109 }
110
-111
-112
-113
-114
-115 public void setFirst(File first) {
-116 this .first = first;
-117 }
-118
-119
-120
-121 private File second;
-122
-123
-124
-125
-126
-127
-128 public File getSecond() {
-129 return second;
-130 }
-131
+111
+112
+113 private File first;
+114
+115
+116
+117
+118
+119
+120 public File getFirst() {
+121 return first;
+122 }
+123
+124
+125
+126
+127
+128
+129 public void setFirst(File first) {
+130 this .first = first;
+131 }
132
-133
-134
-135
-136
-137 public void setSecond(File second) {
-138 this .second = second;
-139 }
-140
-141
-142
-143 private Exception exception = null ;
-144
-145
-146
-147
-148
-149
-150 public Exception getException() {
-151 return exception;
-152 }
-153
+133
+134
+135 private File second;
+136
+137
+138
+139
+140
+141
+142 public File getSecond() {
+143 return second;
+144 }
+145
+146
+147
+148
+149
+150
+151 public void setSecond(File second) {
+152 this .second = second;
+153 }
154
-155
-156
-157
-158
-159 public boolean hasException() {
-160 return exception != null ;
-161 }
-162
-163 @Override
-164 public Future<ProcessTask> call() throws Exception {
-165 try {
-166 final URL url1 = new URL(nvdCveInfo.getUrl());
-167 final URL url2 = new URL(nvdCveInfo.getOldSchemaVersionUrl());
-168 String msg = String.format("Download Started for NVD CVE - %s" , nvdCveInfo.getId());
-169 Logger.getLogger(CallableDownloadTask.class .getName()).log(Level.INFO, msg);
-170 try {
-171 Downloader.fetchFile(url1, first);
-172 Downloader.fetchFile(url2, second);
-173 } catch (DownloadFailedException ex) {
-174 msg = String.format("Download Failed for NVD CVE - %s%nSome CVEs may not be reported." , nvdCveInfo.getId());
-175 Logger.getLogger(CallableDownloadTask.class .getName()).log(Level.WARNING, msg);
-176 Logger.getLogger(CallableDownloadTask.class .getName()).log(Level.FINE, null , ex);
-177 return null ;
-178 }
-179
-180 msg = String.format("Download Complete for NVD CVE - %s" , nvdCveInfo.getId());
-181 Logger.getLogger(CallableDownloadTask.class .getName()).log(Level.INFO, msg);
-182
-183 final ProcessTask task = new ProcessTask (cveDB, this );
-184 return this .processorService.submit(task);
-185
-186 } catch (Throwable ex) {
-187 final String msg = String.format("An exception occurred downloading NVD CVE - %s%nSome CVEs may not be reported." , nvdCveInfo.getId());
-188 Logger.getLogger(CallableDownloadTask.class .getName()).log(Level.WARNING, msg);
-189 Logger.getLogger(CallableDownloadTask.class .getName()).log(Level.FINE, "Download Task Failed" , ex);
-190 }
-191 return null ;
-192 }
-193
-194
-195
-196
-197 public void cleanup() {
-198 boolean deleted = false;
-199 try {
-200 if (first != null && first.exists()) {
-201 deleted = first.delete();
-202 }
-203 } finally {
-204 if (first != null && (first.exists() || !deleted)) {
-205 first.deleteOnExit();
-206 }
+155
+156
+157 private Exception exception = null ;
+158
+159
+160
+161
+162
+163
+164 public Exception getException() {
+165 return exception;
+166 }
+167
+168
+169
+170
+171
+172
+173 public boolean hasException() {
+174 return exception != null ;
+175 }
+176
+177 @Override
+178 public Future<ProcessTask> call() throws Exception {
+179 try {
+180 Settings.setInstance(settings);
+181 final URL url1 = new URL(nvdCveInfo.getUrl());
+182 final URL url2 = new URL(nvdCveInfo.getOldSchemaVersionUrl());
+183 String msg = String.format("Download Started for NVD CVE - %s" , nvdCveInfo.getId());
+184 LOGGER.log(Level.INFO, msg);
+185 try {
+186 Downloader.fetchFile(url1, first);
+187 Downloader.fetchFile(url2, second);
+188 } catch (DownloadFailedException ex) {
+189 msg = String.format("Download Failed for NVD CVE - %s%nSome CVEs may not be reported." , nvdCveInfo.getId());
+190 LOGGER.log(Level.WARNING, msg);
+191 LOGGER.log(Level.FINE, null , ex);
+192 return null ;
+193 }
+194
+195 msg = String.format("Download Complete for NVD CVE - %s" , nvdCveInfo.getId());
+196 LOGGER.log(Level.INFO, msg);
+197
+198 final ProcessTask task = new ProcessTask (cveDB, this , settings);
+199 return this .processorService.submit(task);
+200
+201 } catch (Throwable ex) {
+202 final String msg = String.format("An exception occurred downloading NVD CVE - %s%nSome CVEs may not be reported." , nvdCveInfo.getId());
+203 LOGGER.log(Level.WARNING, msg);
+204 LOGGER.log(Level.FINE, "Download Task Failed" , ex);
+205 } finally {
+206 Settings.cleanup();
207 }
-208 try {
-209 deleted = false;
-210 if (second != null && second.exists()) {
-211 deleted = second.delete();
-212 }
-213 } finally {
-214 if (second != null && (second.exists() || !deleted)) {
-215 second.deleteOnExit();
-216 }
-217 }
-218 }
-219 }
+208 return null ;
+209 }
+210
+211
+212
+213
+214 public void cleanup() {
+215 boolean deleted = false;
+216 try {
+217 if (first != null && first.exists()) {
+218 deleted = first.delete();
+219 }
+220 } finally {
+221 if (first != null && (first.exists() || !deleted)) {
+222 first.deleteOnExit();
+223 }
+224 }
+225 try {
+226 deleted = false;
+227 if (second != null && second.exists()) {
+228 deleted = second.delete();
+229 }
+230 } finally {
+231 if (second != null && (second.exists() || !deleted)) {
+232 second.deleteOnExit();
+233 }
+234 }
+235 }
+236 }
32 import org.owasp.dependencycheck.data.nvdcve.CveDB;
33 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
34 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
-35 import org.owasp.dependencycheck.data.update.StandardUpdate;
-36 import org.owasp.dependencycheck.data.update.exception.UpdateException;
-37 import org.owasp.dependencycheck.data.update.xml.NvdCve12Handler;
-38 import org.owasp.dependencycheck.data.update.xml.NvdCve20Handler;
-39 import org.owasp.dependencycheck.dependency.VulnerableSoftware;
+35 import org.owasp.dependencycheck.data.update.exception.UpdateException;
+36 import org.owasp.dependencycheck.data.update.xml.NvdCve12Handler;
+37 import org.owasp.dependencycheck.data.update.xml.NvdCve20Handler;
+38 import org.owasp.dependencycheck.dependency.VulnerableSoftware;
+39 import org.owasp.dependencycheck.utils.Settings;
40 import org.xml.sax.SAXException;
41
42
@@ -55,130 +55,144 @@
47 public class ProcessTask implements Callable<ProcessTask> {
48
49
-50
+50
51
-52 private UpdateException exception = null ;
-53
-54
-55
-56
-57
-58
-59 public UpdateException getException() {
-60 return exception;
-61 }
-62
-63
-64
-65
-66
-67
-68 public void setException(UpdateException exception) {
-69 this .exception = exception;
-70 }
-71
-72
-73
-74 private final CveDB cveDB;
+52 private static final Logger LOGGER = Logger.getLogger(ProcessTask.class .getName());
+53
+54
+55
+56 private UpdateException exception = null ;
+57
+58
+59
+60
+61
+62
+63 public UpdateException getException() {
+64 return exception;
+65 }
+66
+67
+68
+69
+70
+71
+72 public void setException(UpdateException exception) {
+73 this .exception = exception;
+74 }
75
-76
+76
77
-78 private final CallableDownloadTask filePair;
+78 private final CveDB cveDB;
79
-80
+80
81
-82 private final DatabaseProperties properties;
-83
-84
-85
-86
-87
-88
+82 private final CallableDownloadTask filePair;
+83
+84
+85
+86 private final DatabaseProperties properties;
+87
+88
89
-90 public ProcessTask (final CveDB cveDB, final CallableDownloadTask filePair) {
-91 this .cveDB = cveDB;
-92 this .filePair = filePair;
-93 this .properties = cveDB.getDatabaseProperties();
-94 }
-95
-96
-97
-98
-99
-100
-101
-102
-103 @Override
-104 public ProcessTask call() throws Exception {
-105 try {
-106 processFiles();
-107 } catch (UpdateException ex) {
-108 this .exception = ex;
-109 }
-110 return this ;
-111 }
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125 protected void importXML(File file, File oldVersion) throws ParserConfigurationException,
-126 SAXException, IOException, SQLException, DatabaseException, ClassNotFoundException {
-127
-128 final SAXParserFactory factory = SAXParserFactory.newInstance();
-129 final SAXParser saxParser = factory.newSAXParser();
-130
-131 final NvdCve12Handler cve12Handler = new NvdCve12Handler ();
-132 saxParser.parse(oldVersion, cve12Handler);
-133 final Map<String, List<VulnerableSoftware>> prevVersionVulnMap = cve12Handler.getVulnerabilities();
-134
-135 final NvdCve20Handler cve20Handler = new NvdCve20Handler ();
-136 cve20Handler.setCveDB(cveDB);
-137 cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap);
-138 saxParser.parse(file, cve20Handler);
-139 }
-140
-141
-142
-143
-144
-145
-146 private void processFiles() throws UpdateException {
-147 String msg = String.format("Processing Started for NVD CVE - %s" , filePair.getNvdCveInfo().getId());
-148 Logger.getLogger(StandardUpdate.class .getName()).log(Level.INFO, msg);
-149 try {
-150 importXML(filePair.getFirst(), filePair.getSecond());
-151 cveDB.commit();
-152 properties.save(filePair.getNvdCveInfo());
-153 } catch (FileNotFoundException ex) {
-154 throw new UpdateException (ex);
-155 } catch (ParserConfigurationException ex) {
-156 throw new UpdateException (ex);
-157 } catch (SAXException ex) {
-158 throw new UpdateException (ex);
-159 } catch (IOException ex) {
-160 throw new UpdateException (ex);
-161 } catch (SQLException ex) {
-162 throw new UpdateException (ex);
-163 } catch (DatabaseException ex) {
-164 throw new UpdateException (ex);
-165 } catch (ClassNotFoundException ex) {
-166 throw new UpdateException (ex);
-167 } finally {
-168 filePair.cleanup();
-169 }
-170 msg = String.format("Processing Complete for NVD CVE - %s" , filePair.getNvdCveInfo().getId());
-171 Logger.getLogger(StandardUpdate.class .getName()).log(Level.INFO, msg);
-172 }
-173 }
+90 private Settings settings;
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100 public ProcessTask (final CveDB cveDB, final CallableDownloadTask filePair, Settings settings) {
+101 this .cveDB = cveDB;
+102 this .filePair = filePair;
+103 this .properties = cveDB.getDatabaseProperties();
+104 this .settings = settings;
+105 }
+106
+107
+108
+109
+110
+111
+112
+113
+114 @Override
+115 public ProcessTask call() throws Exception {
+116 try {
+117 Settings.setInstance(settings);
+118 processFiles();
+119 } catch (UpdateException ex) {
+120 this .exception = ex;
+121 } finally {
+122 Settings.cleanup();
+123 }
+124 return this ;
+125 }
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139 protected void importXML(File file, File oldVersion) throws ParserConfigurationException,
+140 SAXException, IOException, SQLException, DatabaseException, ClassNotFoundException {
+141
+142 final SAXParserFactory factory = SAXParserFactory.newInstance();
+143 final SAXParser saxParser = factory.newSAXParser();
+144
+145 final NvdCve12Handler cve12Handler = new NvdCve12Handler ();
+146 saxParser.parse(oldVersion, cve12Handler);
+147 final Map<String, List<VulnerableSoftware>> prevVersionVulnMap = cve12Handler.getVulnerabilities();
+148
+149 final NvdCve20Handler cve20Handler = new NvdCve20Handler ();
+150 cve20Handler.setCveDB(cveDB);
+151 cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap);
+152 saxParser.parse(file, cve20Handler);
+153 }
+154
+155
+156
+157
+158
+159
+160 private void processFiles() throws UpdateException {
+161 String msg = String.format("Processing Started for NVD CVE - %s" , filePair.getNvdCveInfo().getId());
+162 LOGGER.log(Level.INFO, msg);
+163 try {
+164 importXML(filePair.getFirst(), filePair.getSecond());
+165 cveDB.commit();
+166 properties.save(filePair.getNvdCveInfo());
+167 } catch (FileNotFoundException ex) {
+168 throw new UpdateException (ex);
+169 } catch (ParserConfigurationException ex) {
+170 throw new UpdateException (ex);
+171 } catch (SAXException ex) {
+172 throw new UpdateException (ex);
+173 } catch (IOException ex) {
+174 throw new UpdateException (ex);
+175 } catch (SQLException ex) {
+176 throw new UpdateException (ex);
+177 } catch (DatabaseException ex) {
+178 throw new UpdateException (ex);
+179 } catch (ClassNotFoundException ex) {
+180 throw new UpdateException (ex);
+181 } finally {
+182 filePair.cleanup();
+183 }
+184 msg = String.format("Processing Complete for NVD CVE - %s" , filePair.getNvdCveInfo().getId());
+185 LOGGER.log(Level.INFO, msg);
+186 }
+187 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.task
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.task
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.task
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.task
41 public class NvdCve20Handler extends DefaultHandler {
42
43
-44
+44
45
-46 private static final String CURRENT_SCHEMA_VERSION = "2.0" ;
+46 private static final Logger LOGGER = Logger.getLogger(NvdCve20Handler.class .getName());
47
-48
+48
49
-50 private final Element current = new Element ();
+50 private static final String CURRENT_SCHEMA_VERSION = "2.0" ;
51
-52
+52
53
-54 private StringBuilder nodeText;
+54 private final Element current = new Element ();
55
-56
+56
57
-58 private Vulnerability vulnerability;
+58 private StringBuilder nodeText;
59
-60
+60
61
-62 private Reference reference;
+62 private Vulnerability vulnerability;
63
-64
+64
65
-66 private boolean hasApplicationCpe = false;
+66 private Reference reference;
67
-68
+68
69
-70 private int totalNumberOfEntries;
-71
-72
-73
-74
-75
-76
-77 public int getTotalNumberOfEntries() {
-78 return totalNumberOfEntries;
-79 }
-80
-81
-82
-83 private int totalNumberOfApplicationEntries;
-84
-85
-86
-87
-88
-89
-90 public int getTotalNumberOfApplicationEntries() {
-91 return totalNumberOfApplicationEntries;
-92 }
-93
-94 @Override
-95 public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-96 current.setNode(qName);
-97 if (current.isEntryNode()) {
-98 hasApplicationCpe = false;
-99 vulnerability = new Vulnerability ();
-100 vulnerability.setName(attributes.getValue("id" ));
-101 } else if (current.isVulnProductNode()) {
-102 nodeText = new StringBuilder(100);
-103 } else if (current.isVulnReferencesNode()) {
-104 final String lang = attributes.getValue("xml:lang" );
-105 if ("en" .equals(lang)) {
-106 reference = new Reference ();
-107 } else {
-108 reference = null ;
-109 }
-110 } else if (reference != null && current.isVulnReferenceNode()) {
-111 reference.setUrl(attributes.getValue("href" ));
-112 nodeText = new StringBuilder(130);
-113 } else if (reference != null && current.isVulnSourceNode()) {
-114 nodeText = new StringBuilder(30);
-115 } else if (current.isVulnSummaryNode()) {
-116 nodeText = new StringBuilder(500);
-117 } else if (current.isNVDNode()) {
-118 final String nvdVer = attributes.getValue("nvd_xml_version" );
-119 if (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {
-120 throw new SAXNotSupportedException("Schema version " + nvdVer + " is not supported" );
-121 }
-122 } else if (current.isVulnCWENode()) {
-123 vulnerability.setCwe(attributes.getValue("id" ));
-124 } else if (current.isCVSSScoreNode()) {
-125 nodeText = new StringBuilder(5);
-126 } else if (current.isCVSSAccessVectorNode()) {
-127 nodeText = new StringBuilder(20);
-128 } else if (current.isCVSSAccessComplexityNode()) {
-129 nodeText = new StringBuilder(20);
-130 } else if (current.isCVSSAuthenticationNode()) {
+70 private boolean hasApplicationCpe = false;
+71
+72
+73
+74 private int totalNumberOfEntries;
+75
+76
+77
+78
+79
+80
+81 public int getTotalNumberOfEntries() {
+82 return totalNumberOfEntries;
+83 }
+84
+85
+86
+87 private int totalNumberOfApplicationEntries;
+88
+89
+90
+91
+92
+93
+94 public int getTotalNumberOfApplicationEntries() {
+95 return totalNumberOfApplicationEntries;
+96 }
+97
+98 @Override
+99 public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+100 current.setNode(qName);
+101 if (current.isEntryNode()) {
+102 hasApplicationCpe = false;
+103 vulnerability = new Vulnerability ();
+104 vulnerability.setName(attributes.getValue("id" ));
+105 } else if (current.isVulnProductNode()) {
+106 nodeText = new StringBuilder(100);
+107 } else if (current.isVulnReferencesNode()) {
+108 final String lang = attributes.getValue("xml:lang" );
+109 if ("en" .equals(lang)) {
+110 reference = new Reference ();
+111 } else {
+112 reference = null ;
+113 }
+114 } else if (reference != null && current.isVulnReferenceNode()) {
+115 reference.setUrl(attributes.getValue("href" ));
+116 nodeText = new StringBuilder(130);
+117 } else if (reference != null && current.isVulnSourceNode()) {
+118 nodeText = new StringBuilder(30);
+119 } else if (current.isVulnSummaryNode()) {
+120 nodeText = new StringBuilder(500);
+121 } else if (current.isNVDNode()) {
+122 final String nvdVer = attributes.getValue("nvd_xml_version" );
+123 if (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {
+124 throw new SAXNotSupportedException("Schema version " + nvdVer + " is not supported" );
+125 }
+126 } else if (current.isVulnCWENode()) {
+127 vulnerability.setCwe(attributes.getValue("id" ));
+128 } else if (current.isCVSSScoreNode()) {
+129 nodeText = new StringBuilder(5);
+130 } else if (current.isCVSSAccessVectorNode()) {
131 nodeText = new StringBuilder(20);
-132 } else if (current.isCVSSAvailabilityImpactNode()) {
+132 } else if (current.isCVSSAccessComplexityNode()) {
133 nodeText = new StringBuilder(20);
-134 } else if (current.isCVSSConfidentialityImpactNode()) {
+134 } else if (current.isCVSSAuthenticationNode()) {
135 nodeText = new StringBuilder(20);
-136 } else if (current.isCVSSIntegrityImpactNode()) {
+136 } else if (current.isCVSSAvailabilityImpactNode()) {
137 nodeText = new StringBuilder(20);
-138 }
-139 }
-140
-141 @Override
-142 public void characters(char [] ch, int start, int length) throws SAXException {
-143 if (nodeText != null ) {
-144 nodeText.append(ch, start, length);
-145 }
-146 }
-147
-148 @Override
-149 public void endElement(String uri, String localName, String qName) throws SAXException {
-150 current.setNode(qName);
-151 if (current.isEntryNode()) {
-152 totalNumberOfEntries += 1;
-153 if (hasApplicationCpe) {
-154 totalNumberOfApplicationEntries += 1;
-155 try {
-156 saveEntry(vulnerability);
-157 } catch (DatabaseException ex) {
-158 throw new SAXException(ex);
-159 } catch (CorruptIndexException ex) {
-160 throw new SAXException(ex);
-161 } catch (IOException ex) {
+138 } else if (current.isCVSSConfidentialityImpactNode()) {
+139 nodeText = new StringBuilder(20);
+140 } else if (current.isCVSSIntegrityImpactNode()) {
+141 nodeText = new StringBuilder(20);
+142 }
+143 }
+144
+145 @Override
+146 public void characters(char [] ch, int start, int length) throws SAXException {
+147 if (nodeText != null ) {
+148 nodeText.append(ch, start, length);
+149 }
+150 }
+151
+152 @Override
+153 public void endElement(String uri, String localName, String qName) throws SAXException {
+154 current.setNode(qName);
+155 if (current.isEntryNode()) {
+156 totalNumberOfEntries += 1;
+157 if (hasApplicationCpe) {
+158 totalNumberOfApplicationEntries += 1;
+159 try {
+160 saveEntry(vulnerability);
+161 } catch (DatabaseException ex) {
162 throw new SAXException(ex);
-163 }
-164 }
-165 vulnerability = null ;
-166 } else if (current.isCVSSScoreNode()) {
-167 try {
-168 final float score = Float.parseFloat(nodeText.toString());
-169 vulnerability.setCvssScore(score);
-170 } catch (NumberFormatException ex) {
-171 Logger.getLogger(NvdCve20Handler.class .getName()).log(Level.SEVERE, "Error parsing CVSS Score." );
-172 Logger.getLogger(NvdCve20Handler.class .getName()).log(Level.FINE, null , ex);
-173 }
-174 nodeText = null ;
-175 } else if (current.isCVSSAccessVectorNode()) {
-176 vulnerability.setCvssAccessVector(nodeText.toString());
-177 nodeText = null ;
-178 } else if (current.isCVSSAccessComplexityNode()) {
-179 vulnerability.setCvssAccessComplexity(nodeText.toString());
-180 nodeText = null ;
-181 } else if (current.isCVSSAuthenticationNode()) {
-182 vulnerability.setCvssAuthentication(nodeText.toString());
-183 nodeText = null ;
-184 } else if (current.isCVSSAvailabilityImpactNode()) {
-185 vulnerability.setCvssAvailabilityImpact(nodeText.toString());
-186 nodeText = null ;
-187 } else if (current.isCVSSConfidentialityImpactNode()) {
-188 vulnerability.setCvssConfidentialityImpact(nodeText.toString());
-189 nodeText = null ;
-190 } else if (current.isCVSSIntegrityImpactNode()) {
-191 vulnerability.setCvssIntegrityImpact(nodeText.toString());
-192 nodeText = null ;
-193 } else if (current.isVulnProductNode()) {
-194 final String cpe = nodeText.toString();
-195 if (cpe.startsWith("cpe:/a:" )) {
-196 hasApplicationCpe = true ;
-197 vulnerability.addVulnerableSoftware(cpe);
-198 }
-199 nodeText = null ;
-200 } else if (reference != null && current.isVulnReferencesNode()) {
-201 vulnerability.addReference(reference);
-202 reference = null ;
-203 } else if (reference != null && current.isVulnReferenceNode()) {
-204 reference.setName(nodeText.toString());
-205 nodeText = null ;
-206 } else if (reference != null && current.isVulnSourceNode()) {
-207 reference.setSource(nodeText.toString());
-208 nodeText = null ;
-209 } else if (current.isVulnSummaryNode()) {
-210 vulnerability.setDescription(nodeText.toString());
-211 if (nodeText.indexOf("** REJECT **" ) >= 0) {
-212 hasApplicationCpe = true ;
-213 }
-214 nodeText = null ;
-215 }
-216 }
-217
-218
-219
-220 private CveDB cveDB;
-221
-222
-223
-224
-225
-226
-227 public void setCveDB(CveDB db) {
-228 cveDB = db;
-229 }
-230
-231
-232
-233 private Map<String, List<VulnerableSoftware>> prevVersionVulnMap;
-234
-235
-236
-237
-238
-239
-240 public void setPrevVersionVulnMap(Map<String, List<VulnerableSoftware>> map) {
-241 prevVersionVulnMap = map;
-242 }
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252 private void saveEntry(Vulnerability vuln) throws DatabaseException, CorruptIndexException, IOException {
-253 if (cveDB == null ) {
-254 return ;
-255 }
-256 final String cveName = vuln.getName();
-257 if (prevVersionVulnMap.containsKey(cveName)) {
-258 final List<VulnerableSoftware> vulnSoftware = prevVersionVulnMap.get(cveName);
-259 for (VulnerableSoftware vs : vulnSoftware) {
-260 vuln.updateVulnerableSoftware(vs);
-261 }
-262 }
-263 cveDB.updateVulnerability(vuln);
-264 }
-265
-266
-267
-268
-269
-270 protected static class Element {
-271
-272
-273
-274
-275 public static final String NVD = "nvd" ;
+163 } catch (CorruptIndexException ex) {
+164 throw new SAXException(ex);
+165 } catch (IOException ex) {
+166 throw new SAXException(ex);
+167 }
+168 }
+169 vulnerability = null ;
+170 } else if (current.isCVSSScoreNode()) {
+171 try {
+172 final float score = Float.parseFloat(nodeText.toString());
+173 vulnerability.setCvssScore(score);
+174 } catch (NumberFormatException ex) {
+175 LOGGER.log(Level.SEVERE, "Error parsing CVSS Score." );
+176 LOGGER.log(Level.FINE, null , ex);
+177 }
+178 nodeText = null ;
+179 } else if (current.isCVSSAccessVectorNode()) {
+180 vulnerability.setCvssAccessVector(nodeText.toString());
+181 nodeText = null ;
+182 } else if (current.isCVSSAccessComplexityNode()) {
+183 vulnerability.setCvssAccessComplexity(nodeText.toString());
+184 nodeText = null ;
+185 } else if (current.isCVSSAuthenticationNode()) {
+186 vulnerability.setCvssAuthentication(nodeText.toString());
+187 nodeText = null ;
+188 } else if (current.isCVSSAvailabilityImpactNode()) {
+189 vulnerability.setCvssAvailabilityImpact(nodeText.toString());
+190 nodeText = null ;
+191 } else if (current.isCVSSConfidentialityImpactNode()) {
+192 vulnerability.setCvssConfidentialityImpact(nodeText.toString());
+193 nodeText = null ;
+194 } else if (current.isCVSSIntegrityImpactNode()) {
+195 vulnerability.setCvssIntegrityImpact(nodeText.toString());
+196 nodeText = null ;
+197 } else if (current.isVulnProductNode()) {
+198 final String cpe = nodeText.toString();
+199 if (cpe.startsWith("cpe:/a:" )) {
+200 hasApplicationCpe = true ;
+201 vulnerability.addVulnerableSoftware(cpe);
+202 }
+203 nodeText = null ;
+204 } else if (reference != null && current.isVulnReferencesNode()) {
+205 vulnerability.addReference(reference);
+206 reference = null ;
+207 } else if (reference != null && current.isVulnReferenceNode()) {
+208 reference.setName(nodeText.toString());
+209 nodeText = null ;
+210 } else if (reference != null && current.isVulnSourceNode()) {
+211 reference.setSource(nodeText.toString());
+212 nodeText = null ;
+213 } else if (current.isVulnSummaryNode()) {
+214 vulnerability.setDescription(nodeText.toString());
+215 if (nodeText.indexOf("** REJECT **" ) >= 0) {
+216 hasApplicationCpe = true ;
+217 }
+218 nodeText = null ;
+219 }
+220 }
+221
+222
+223
+224 private CveDB cveDB;
+225
+226
+227
+228
+229
+230
+231 public void setCveDB(CveDB db) {
+232 cveDB = db;
+233 }
+234
+235
+236
+237 private Map<String, List<VulnerableSoftware>> prevVersionVulnMap;
+238
+239
+240
+241
+242
+243
+244 public void setPrevVersionVulnMap(Map<String, List<VulnerableSoftware>> map) {
+245 prevVersionVulnMap = map;
+246 }
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256 private void saveEntry(Vulnerability vuln) throws DatabaseException, CorruptIndexException, IOException {
+257 if (cveDB == null ) {
+258 return ;
+259 }
+260 final String cveName = vuln.getName();
+261 if (prevVersionVulnMap.containsKey(cveName)) {
+262 final List<VulnerableSoftware> vulnSoftware = prevVersionVulnMap.get(cveName);
+263 for (VulnerableSoftware vs : vulnSoftware) {
+264 vuln.updateVulnerableSoftware(vs);
+265 }
+266 }
+267 cveDB.updateVulnerability(vuln);
+268 }
+269
+270
+271
+272
+273
+274 protected static class Element {
+275
276
277
278
-279 public static final String ENTRY = "entry" ;
+279 public static final String NVD = "nvd" ;
280
281
282
-283 public static final String VULN_PRODUCT = "vuln:product" ;
+283 public static final String ENTRY = "entry" ;
284
285
286
-287 public static final String VULN_REFERENCES = "vuln:references" ;
+287 public static final String VULN_PRODUCT = "vuln:product" ;
288
289
290
-291 public static final String VULN_SOURCE = "vuln:source" ;
+291 public static final String VULN_REFERENCES = "vuln:references" ;
292
293
294
-295 public static final String VULN_REFERENCE = "vuln:reference" ;
+295 public static final String VULN_SOURCE = "vuln:source" ;
296
297
298
-299 public static final String VULN_SUMMARY = "vuln:summary" ;
+299 public static final String VULN_REFERENCE = "vuln:reference" ;
300
301
302
-303 public static final String VULN_CWE = "vuln:cwe" ;
+303 public static final String VULN_SUMMARY = "vuln:summary" ;
304
305
306
-307 public static final String CVSS_SCORE = "cvss:score" ;
+307 public static final String VULN_CWE = "vuln:cwe" ;
308
309
310
-311 public static final String CVSS_ACCESS_VECTOR = "cvss:access-vector" ;
+311 public static final String CVSS_SCORE = "cvss:score" ;
312
313
314
-315 public static final String CVSS_ACCESS_COMPLEXITY = "cvss:access-complexity" ;
+315 public static final String CVSS_ACCESS_VECTOR = "cvss:access-vector" ;
316
317
318
-319 public static final String CVSS_AUTHENTICATION = "cvss:authentication" ;
+319 public static final String CVSS_ACCESS_COMPLEXITY = "cvss:access-complexity" ;
320
321
322
-323 public static final String CVSS_CONFIDENTIALITY_IMPACT = "cvss:confidentiality-impact" ;
+323 public static final String CVSS_AUTHENTICATION = "cvss:authentication" ;
324
325
326
-327 public static final String CVSS_INTEGRITY_IMPACT = "cvss:integrity-impact" ;
+327 public static final String CVSS_CONFIDENTIALITY_IMPACT = "cvss:confidentiality-impact" ;
328
329
330
-331 public static final String CVSS_AVAILABILITY_IMPACT = "cvss:availability-impact" ;
+331 public static final String CVSS_INTEGRITY_IMPACT = "cvss:integrity-impact" ;
332
-333
+333
334
-335 private String node;
-336
-337
-338
-339
-340
-341
-342 public String getNode() {
-343 return this .node;
-344 }
-345
-346
-347
-348
-349
-350
-351 public void setNode(String node) {
-352 this .node = node;
-353 }
-354
-355
-356
-357
-358
-359
-360 public boolean isNVDNode() {
-361 return NVD.equals(node);
-362 }
-363
-364
-365
-366
-367
-368
-369 public boolean isEntryNode() {
-370 return ENTRY.equals(node);
-371 }
-372
-373
-374
-375
-376
-377
-378 public boolean isVulnProductNode() {
-379 return VULN_PRODUCT.equals(node);
-380 }
-381
-382
-383
-384
-385
-386
-387 public boolean isVulnReferencesNode() {
-388 return VULN_REFERENCES.equals(node);
-389 }
-390
-391
-392
-393
-394
-395
-396 public boolean isVulnReferenceNode() {
-397 return VULN_REFERENCE.equals(node);
-398 }
-399
-400
-401
-402
-403
-404
-405 public boolean isVulnSourceNode() {
-406 return VULN_SOURCE.equals(node);
-407 }
-408
-409
-410
-411
-412
-413
-414 public boolean isVulnSummaryNode() {
-415 return VULN_SUMMARY.equals(node);
-416 }
-417
-418
-419
-420
-421
-422
-423 public boolean isVulnCWENode() {
-424 return VULN_CWE.equals(node);
-425 }
-426
-427
-428
-429
-430
-431
-432 public boolean isCVSSScoreNode() {
-433 return CVSS_SCORE.equals(node);
-434 }
-435
-436
-437
-438
-439
-440
-441 public boolean isCVSSAccessVectorNode() {
-442 return CVSS_ACCESS_VECTOR.equals(node);
-443 }
-444
-445
-446
-447
-448
-449
-450 public boolean isCVSSAccessComplexityNode() {
-451 return CVSS_ACCESS_COMPLEXITY.equals(node);
-452 }
-453
-454
-455
-456
-457
-458
-459 public boolean isCVSSAuthenticationNode() {
-460 return CVSS_AUTHENTICATION.equals(node);
-461 }
-462
-463
-464
-465
-466
-467
-468 public boolean isCVSSConfidentialityImpactNode() {
-469 return CVSS_CONFIDENTIALITY_IMPACT.equals(node);
-470 }
-471
-472
-473
-474
-475
-476
-477 public boolean isCVSSIntegrityImpactNode() {
-478 return CVSS_INTEGRITY_IMPACT.equals(node);
-479 }
-480
-481
-482
-483
-484
-485
-486 public boolean isCVSSAvailabilityImpactNode() {
-487 return CVSS_AVAILABILITY_IMPACT.equals(node);
-488 }
-489 }
-490
-491 }
+335 public static final String CVSS_AVAILABILITY_IMPACT = "cvss:availability-impact" ;
+336
+337
+338
+339 private String node;
+340
+341
+342
+343
+344
+345
+346 public String getNode() {
+347 return this .node;
+348 }
+349
+350
+351
+352
+353
+354
+355 public void setNode(String node) {
+356 this .node = node;
+357 }
+358
+359
+360
+361
+362
+363
+364 public boolean isNVDNode() {
+365 return NVD.equals(node);
+366 }
+367
+368
+369
+370
+371
+372
+373 public boolean isEntryNode() {
+374 return ENTRY.equals(node);
+375 }
+376
+377
+378
+379
+380
+381
+382 public boolean isVulnProductNode() {
+383 return VULN_PRODUCT.equals(node);
+384 }
+385
+386
+387
+388
+389
+390
+391 public boolean isVulnReferencesNode() {
+392 return VULN_REFERENCES.equals(node);
+393 }
+394
+395
+396
+397
+398
+399
+400 public boolean isVulnReferenceNode() {
+401 return VULN_REFERENCE.equals(node);
+402 }
+403
+404
+405
+406
+407
+408
+409 public boolean isVulnSourceNode() {
+410 return VULN_SOURCE.equals(node);
+411 }
+412
+413
+414
+415
+416
+417
+418 public boolean isVulnSummaryNode() {
+419 return VULN_SUMMARY.equals(node);
+420 }
+421
+422
+423
+424
+425
+426
+427 public boolean isVulnCWENode() {
+428 return VULN_CWE.equals(node);
+429 }
+430
+431
+432
+433
+434
+435
+436 public boolean isCVSSScoreNode() {
+437 return CVSS_SCORE.equals(node);
+438 }
+439
+440
+441
+442
+443
+444
+445 public boolean isCVSSAccessVectorNode() {
+446 return CVSS_ACCESS_VECTOR.equals(node);
+447 }
+448
+449
+450
+451
+452
+453
+454 public boolean isCVSSAccessComplexityNode() {
+455 return CVSS_ACCESS_COMPLEXITY.equals(node);
+456 }
+457
+458
+459
+460
+461
+462
+463 public boolean isCVSSAuthenticationNode() {
+464 return CVSS_AUTHENTICATION.equals(node);
+465 }
+466
+467
+468
+469
+470
+471
+472 public boolean isCVSSConfidentialityImpactNode() {
+473 return CVSS_CONFIDENTIALITY_IMPACT.equals(node);
+474 }
+475
+476
+477
+478
+479
+480
+481 public boolean isCVSSIntegrityImpactNode() {
+482 return CVSS_INTEGRITY_IMPACT.equals(node);
+483 }
+484
+485
+486
+487
+488
+489
+490 public boolean isCVSSAvailabilityImpactNode() {
+491 return CVSS_AVAILABILITY_IMPACT.equals(node);
+492 }
+493 }
+494
+495 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.xml
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.xml
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.data.update.xml
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.data.update.xml
38 public class Dependency implements Comparable<Dependency> {
39
40
-41
+41
42
-43 private String actualFilePath;
+43 private static final Logger LOGGER = Logger.getLogger(Dependency.class .getName());
44
-45
+45
46
-47 private String filePath;
+47 private String actualFilePath;
48
-49
+49
50
-51 private String fileName;
+51 private String filePath;
52
-53
+53
54
-55 private String fileExtension;
+55 private String fileName;
56
-57
+57
58
-59 private String md5sum;
+59 private String fileExtension;
60
-61
+61
62
-63 private String sha1sum;
+63 private String md5sum;
64
-65
+65
66
-67 private Set<Identifier> identifiers;
+67 private String sha1sum;
68
-69
+69
70
-71 private final EvidenceCollection vendorEvidence;
+71 private Set<Identifier> identifiers;
72
-73
+73
74
-75 private final EvidenceCollection productEvidence;
+75 private final EvidenceCollection vendorEvidence;
76
-77
+77
78
-79 private final EvidenceCollection versionEvidence;
-80
-81
-82
-83
-84 public Dependency () {
-85 vendorEvidence = new EvidenceCollection ();
-86 productEvidence = new EvidenceCollection ();
-87 versionEvidence = new EvidenceCollection ();
-88 identifiers = new TreeSet<Identifier>();
-89 vulnerabilities = new TreeSet<Vulnerability>(new VulnerabilityComparator ());
-90 }
-91
-92
-93
-94
-95
-96
-97 public Dependency (File file) {
-98 this ();
-99 this .actualFilePath = file.getPath();
-100 this .filePath = this .actualFilePath;
-101 this .fileName = file.getName();
-102 this .fileExtension = FileUtils.getFileExtension(fileName);
-103 determineHashes(file);
-104 }
-105
-106
-107
-108
-109
-110
-111 public String getFileName() {
-112 return this .fileName;
-113 }
-114
-115
-116
-117
-118
-119
-120
-121 public String getFileNameForJavaScript() {
-122 return this .fileName.replace("\\" , "\\\\" );
-123 }
-124
-125
-126
-127
-128
-129
-130 public void setFileName(String fileName) {
-131 this .fileName = fileName;
-132 }
-133
-134
-135
-136
-137
-138
-139 public void setActualFilePath(String actualFilePath) {
-140 this .actualFilePath = actualFilePath;
-141 if (this .sha1sum == null ) {
-142 final File file = new File(this .actualFilePath);
-143 determineHashes(file);
-144 }
-145 }
-146
-147
-148
-149
-150
-151
-152 public String getActualFilePath() {
-153 return this .actualFilePath;
-154 }
-155
-156
-157
-158
-159
-160
-161 public File getActualFile() {
-162 return new File(this .actualFilePath);
-163 }
-164
-165
-166
-167
-168
-169
-170 public void setFilePath(String filePath) {
-171 this .filePath = filePath;
-172 }
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183 public String getFilePath() {
-184 return this .filePath;
-185 }
-186
-187
-188
-189
-190
-191
-192 public void setFileExtension(String fileExtension) {
-193 this .fileExtension = fileExtension;
-194 }
-195
-196
-197
-198
-199
-200
-201 public String getFileExtension() {
-202 return this .fileExtension;
-203 }
-204
-205
-206
-207
-208
-209
-210 public String getMd5sum() {
-211 return this .md5sum;
-212 }
-213
-214
-215
-216
-217
-218
-219 public void setMd5sum(String md5sum) {
-220 this .md5sum = md5sum;
-221 }
-222
-223
-224
-225
-226
-227
-228 public String getSha1sum() {
-229 return this .sha1sum;
-230 }
-231
-232
-233
-234
-235
-236
-237 public void setSha1sum(String sha1sum) {
-238 this .sha1sum = sha1sum;
-239 }
-240
-241
-242
-243
-244
-245
-246 public Set<Identifier> getIdentifiers() {
-247 return this .identifiers;
-248 }
-249
-250
-251
-252
-253
-254
-255 public void setIdentifiers(Set<Identifier> identifiers) {
-256 this .identifiers = identifiers;
-257 }
-258
-259
-260
-261
-262
-263
-264
-265
-266 public void addIdentifier(String type, String value, String url) {
-267 final Identifier i = new Identifier (type, value, url);
-268 this .identifiers.add(i);
-269 }
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279 public void addIdentifier(String type, String value, String url, Confidence confidence) {
-280 final Identifier i = new Identifier (type, value, url);
-281 i.setConfidence(confidence);
-282 this .identifiers.add(i);
-283 }
-284
-285
-286
-287
-288
-289
-290 public void addIdentifier(Identifier identifier) {
-291 this .identifiers.add(identifier);
-292 }
-293
-294
-295
-296
-297
-298
-299 public EvidenceCollection getEvidence() {
-300 return EvidenceCollection.merge(this .productEvidence, this .vendorEvidence, this .versionEvidence);
-301 }
-302
-303
-304
-305
-306
-307
-308 public EvidenceCollection getEvidenceUsed() {
-309 return EvidenceCollection.mergeUsed(this .productEvidence, this .vendorEvidence, this .versionEvidence);
-310 }
-311
-312
-313
-314
-315
-316
-317 public EvidenceCollection getVendorEvidence() {
-318 return this .vendorEvidence;
-319 }
-320
-321
-322
-323
-324
-325
-326 public EvidenceCollection getProductEvidence() {
-327 return this .productEvidence;
-328 }
-329
-330
-331
-332
-333
-334
-335 public EvidenceCollection getVersionEvidence() {
-336 return this .versionEvidence;
-337 }
-338
-339
+79 private final EvidenceCollection productEvidence;
+80
+81
+82
+83 private final EvidenceCollection versionEvidence;
+84
+85
+86
+87
+88 public Dependency () {
+89 vendorEvidence = new EvidenceCollection ();
+90 productEvidence = new EvidenceCollection ();
+91 versionEvidence = new EvidenceCollection ();
+92 identifiers = new TreeSet<Identifier>();
+93 vulnerabilities = new TreeSet<Vulnerability>(new VulnerabilityComparator ());
+94 suppressedIdentifiers = new TreeSet<Identifier>();
+95 suppressedVulnerabilities = new TreeSet<Vulnerability>(new VulnerabilityComparator ());
+96 }
+97
+98
+99
+100
+101
+102
+103 public Dependency (File file) {
+104 this ();
+105 this .actualFilePath = file.getPath();
+106 this .filePath = this .actualFilePath;
+107 this .fileName = file.getName();
+108 this .fileExtension = FileUtils.getFileExtension(fileName);
+109 determineHashes(file);
+110 }
+111
+112
+113
+114
+115
+116
+117 public String getFileName() {
+118 return this .fileName;
+119 }
+120
+121
+122
+123
+124
+125
+126
+127 public String getFileNameForJavaScript() {
+128 return this .fileName.replace("\\" , "\\\\" );
+129 }
+130
+131
+132
+133
+134
+135
+136 public void setFileName(String fileName) {
+137 this .fileName = fileName;
+138 }
+139
+140
+141
+142
+143
+144
+145 public void setActualFilePath(String actualFilePath) {
+146 this .actualFilePath = actualFilePath;
+147 if (this .sha1sum == null ) {
+148 final File file = new File(this .actualFilePath);
+149 determineHashes(file);
+150 }
+151 }
+152
+153
+154
+155
+156
+157
+158 public String getActualFilePath() {
+159 return this .actualFilePath;
+160 }
+161
+162
+163
+164
+165
+166
+167 public File getActualFile() {
+168 return new File(this .actualFilePath);
+169 }
+170
+171
+172
+173
+174
+175
+176 public void setFilePath(String filePath) {
+177 this .filePath = filePath;
+178 }
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189 public String getFilePath() {
+190 return this .filePath;
+191 }
+192
+193
+194
+195
+196
+197
+198 public void setFileExtension(String fileExtension) {
+199 this .fileExtension = fileExtension;
+200 }
+201
+202
+203
+204
+205
+206
+207 public String getFileExtension() {
+208 return this .fileExtension;
+209 }
+210
+211
+212
+213
+214
+215
+216 public String getMd5sum() {
+217 return this .md5sum;
+218 }
+219
+220
+221
+222
+223
+224
+225 public void setMd5sum(String md5sum) {
+226 this .md5sum = md5sum;
+227 }
+228
+229
+230
+231
+232
+233
+234 public String getSha1sum() {
+235 return this .sha1sum;
+236 }
+237
+238
+239
+240
+241
+242
+243 public void setSha1sum(String sha1sum) {
+244 this .sha1sum = sha1sum;
+245 }
+246
+247
+248
+249
+250
+251
+252 public Set<Identifier> getIdentifiers() {
+253 return this .identifiers;
+254 }
+255
+256
+257
+258
+259
+260
+261 public void setIdentifiers(Set<Identifier> identifiers) {
+262 this .identifiers = identifiers;
+263 }
+264
+265
+266
+267
+268
+269
+270
+271
+272 public void addIdentifier(String type, String value, String url) {
+273 final Identifier i = new Identifier (type, value, url);
+274 this .identifiers.add(i);
+275 }
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285 public void addIdentifier(String type, String value, String url, Confidence confidence) {
+286 final Identifier i = new Identifier (type, value, url);
+287 i.setConfidence(confidence);
+288 this .identifiers.add(i);
+289 }
+290
+291
+292
+293
+294
+295
+296 public void addIdentifier(Identifier identifier) {
+297 this .identifiers.add(identifier);
+298 }
+299
+300
+301
+302 private Set<Identifier> suppressedIdentifiers;
+303
+304
+305
+306
+307
+308
+309 public Set<Identifier> getSuppressedIdentifiers() {
+310 return suppressedIdentifiers;
+311 }
+312
+313
+314
+315
+316
+317
+318 public void setSuppressedIdentifiers(Set<Identifier> suppressedIdentifiers) {
+319 this .suppressedIdentifiers = suppressedIdentifiers;
+320 }
+321
+322
+323
+324
+325
+326
+327 public void addSuppressedIdentifier(Identifier identifier) {
+328 this .suppressedIdentifiers.add(identifier);
+329 }
+330
+331
+332
+333
+334 private SortedSet<Vulnerability> suppressedVulnerabilities;
+335
+336
+337
+338
+339
340
-341 private String description;
-342
-343
-344
-345
-346
-347
-348 public String getDescription() {
-349 return description;
-350 }
-351
-352
-353
-354
-355
-356
-357 public void setDescription(String description) {
-358 this .description = description;
-359 }
-360
-361
-362
-363 private String license;
-364
-365
-366
-367
-368
-369
-370 public String getLicense() {
-371 return license;
-372 }
-373
-374
-375
-376
-377
-378
-379 public void setLicense(String license) {
-380 this .license = license;
-381 }
-382
-383
-384
-385 private SortedSet<Vulnerability> vulnerabilities;
-386
-387
-388
-389
-390
-391
-392 public SortedSet<Vulnerability> getVulnerabilities() {
-393 return vulnerabilities;
-394 }
-395
-396
-397
-398
-399
-400
-401 public void setVulnerabilities(SortedSet<Vulnerability> vulnerabilities) {
-402 this .vulnerabilities = vulnerabilities;
-403 }
-404
-405
-406
-407
-408
+341 public SortedSet<Vulnerability> getSuppressedVulnerabilities() {
+342 return suppressedVulnerabilities;
+343 }
+344
+345
+346
+347
+348
+349
+350 public void setSuppressedVulnerabilities(SortedSet<Vulnerability> suppressedVulnerabilities) {
+351 this .suppressedVulnerabilities = suppressedVulnerabilities;
+352 }
+353
+354
+355
+356
+357
+358
+359 public void addSuppressedVulnerability(Vulnerability vulnerability) {
+360 this .suppressedVulnerabilities.add(vulnerability);
+361 }
+362
+363
+364
+365
+366
+367
+368 public EvidenceCollection getEvidence() {
+369 return EvidenceCollection.merge(this .productEvidence, this .vendorEvidence, this .versionEvidence);
+370 }
+371
+372
+373
+374
+375
+376
+377 public EvidenceCollection getEvidenceUsed() {
+378 return EvidenceCollection.mergeUsed(this .productEvidence, this .vendorEvidence, this .versionEvidence);
+379 }
+380
+381
+382
+383
+384
+385
+386 public EvidenceCollection getVendorEvidence() {
+387 return this .vendorEvidence;
+388 }
+389
+390
+391
+392
+393
+394
+395 public EvidenceCollection getProductEvidence() {
+396 return this .productEvidence;
+397 }
+398
+399
+400
+401
+402
+403
+404 public EvidenceCollection getVersionEvidence() {
+405 return this .versionEvidence;
+406 }
+407
+408
409
-410 private void determineHashes(File file) {
-411 String md5 = null ;
-412 String sha1 = null ;
-413 try {
-414 md5 = Checksum.getMD5Checksum(file);
-415 sha1 = Checksum.getSHA1Checksum(file);
-416 } catch (IOException ex) {
-417 final String msg = String.format("Unable to read '%s' to determine hashes." , file.getName());
-418 Logger.getLogger(Dependency.class .getName()).log(Level.WARNING, msg);
-419 Logger.getLogger(Dependency.class .getName()).log(Level.FINE, null , ex);
-420 } catch (NoSuchAlgorithmException ex) {
-421 final String msg = "Unable to use MD5 of SHA1 checksums." ;
-422 Logger.getLogger(Dependency.class .getName()).log(Level.WARNING, msg);
-423 Logger.getLogger(Dependency.class .getName()).log(Level.FINE, null , ex);
-424 }
-425 this .setMd5sum(md5);
-426 this .setSha1sum(sha1);
-427 }
-428
+410 private String description;
+411
+412
+413
+414
+415
+416
+417 public String getDescription() {
+418 return description;
+419 }
+420
+421
+422
+423
+424
+425
+426 public void setDescription(String description) {
+427 this .description = description;
+428 }
429
-430
-431
-432
-433
-434 public void addVulnerability(Vulnerability vulnerability) {
-435 this .vulnerabilities.add(vulnerability);
-436 }
-437
-438
-439
-440 private Set<Dependency> relatedDependencies = new TreeSet<Dependency>();
-441
-442
-443
-444
-445
-446
-447 public Set<Dependency> getRelatedDependencies() {
-448 return relatedDependencies;
-449 }
-450
+430
+431
+432 private String license;
+433
+434
+435
+436
+437
+438
+439 public String getLicense() {
+440 return license;
+441 }
+442
+443
+444
+445
+446
+447
+448 public void setLicense(String license) {
+449 this .license = license;
+450 }
451
-452
-453
-454
-455
-456 public void setRelatedDependencies(Set<Dependency> relatedDependencies) {
-457 this .relatedDependencies = relatedDependencies;
-458 }
-459
-460
-461
-462
-463
-464
-465 public void addRelatedDependency(Dependency dependency) {
-466 relatedDependencies.add(dependency);
-467 }
-468
-469
-470
-471
-472
-473
-474
-475 public int compareTo(Dependency o) {
-476 return this .getFileName().compareToIgnoreCase(o.getFileName());
-477 }
-478
-479
-480
-481
-482
-483
-484
-485 @Override
-486 public boolean equals(Object obj) {
-487 if (obj == null ) {
-488 return false;
-489 }
-490 if (getClass() != obj.getClass()) {
-491 return false;
-492 }
-493 final Dependency other = (Dependency) obj;
-494 if ((this .actualFilePath == null ) ? (other.actualFilePath != null ) : !this .actualFilePath.equals(other.actualFilePath)) {
-495 return false;
-496 }
-497 if ((this .filePath == null ) ? (other.filePath != null ) : !this .filePath.equals(other.filePath)) {
-498 return false;
-499 }
-500 if ((this .fileName == null ) ? (other.fileName != null ) : !this .fileName.equals(other.fileName)) {
-501 return false;
-502 }
-503 if ((this .fileExtension == null ) ? (other.fileExtension != null ) : !this .fileExtension.equals(other.fileExtension)) {
-504 return false;
-505 }
-506 if ((this .md5sum == null ) ? (other.md5sum != null ) : !this .md5sum.equals(other.md5sum)) {
-507 return false;
-508 }
-509 if ((this .sha1sum == null ) ? (other.sha1sum != null ) : !this .sha1sum.equals(other.sha1sum)) {
-510 return false;
-511 }
-512 if (this .identifiers != other.identifiers && (this .identifiers == null || !this .identifiers.equals(other.identifiers))) {
-513 return false;
-514 }
-515 if (this .vendorEvidence != other.vendorEvidence && (this .vendorEvidence == null || !this .vendorEvidence.equals(other.vendorEvidence))) {
-516 return false;
-517 }
-518 if (this .productEvidence != other.productEvidence && (this .productEvidence == null || !this .productEvidence.equals(other.productEvidence))) {
-519 return false;
-520 }
-521 if (this .versionEvidence != other.versionEvidence && (this .versionEvidence == null || !this .versionEvidence.equals(other.versionEvidence))) {
-522 return false;
-523 }
-524 if ((this .description == null ) ? (other.description != null ) : !this .description.equals(other.description)) {
-525 return false;
-526 }
-527 if ((this .license == null ) ? (other.license != null ) : !this .license.equals(other.license)) {
-528 return false;
-529 }
-530 if (this .vulnerabilities != other.vulnerabilities && (this .vulnerabilities == null || !this .vulnerabilities.equals(other.vulnerabilities))) {
-531 return false;
-532 }
-533 if (this .relatedDependencies != other.relatedDependencies
-534 && (this .relatedDependencies == null || !this .relatedDependencies.equals(other.relatedDependencies))) {
-535 return false;
-536 }
-537 return true ;
-538 }
-539
-540
-541
-542
-543
-544
-545 @Override
-546 public int hashCode() {
-547 int hash = 3;
-548 hash = 47 * hash + (this .actualFilePath != null ? this .actualFilePath.hashCode() : 0);
-549 hash = 47 * hash + (this .filePath != null ? this .filePath.hashCode() : 0);
-550 hash = 47 * hash + (this .fileName != null ? this .fileName.hashCode() : 0);
-551 hash = 47 * hash + (this .fileExtension != null ? this .fileExtension.hashCode() : 0);
-552 hash = 47 * hash + (this .md5sum != null ? this .md5sum.hashCode() : 0);
-553 hash = 47 * hash + (this .sha1sum != null ? this .sha1sum.hashCode() : 0);
-554 hash = 47 * hash + (this .identifiers != null ? this .identifiers.hashCode() : 0);
-555 hash = 47 * hash + (this .vendorEvidence != null ? this .vendorEvidence.hashCode() : 0);
-556 hash = 47 * hash + (this .productEvidence != null ? this .productEvidence.hashCode() : 0);
-557 hash = 47 * hash + (this .versionEvidence != null ? this .versionEvidence.hashCode() : 0);
-558 hash = 47 * hash + (this .description != null ? this .description.hashCode() : 0);
-559 hash = 47 * hash + (this .license != null ? this .license.hashCode() : 0);
-560 hash = 47 * hash + (this .vulnerabilities != null ? this .vulnerabilities.hashCode() : 0);
-561 hash = 47 * hash + (this .relatedDependencies != null ? this .relatedDependencies.hashCode() : 0);
-562 return hash;
-563 }
-564
-565
-566
-567
-568
-569
-570 @Override
-571 public String toString() {
-572 return "Dependency{ fileName='" + fileName + "', actualFilePath='" + actualFilePath + "', filePath='" + filePath + "'}" ;
-573 }
-574 }
+452
+453
+454 private SortedSet<Vulnerability> vulnerabilities;
+455
+456
+457
+458
+459
+460
+461 public SortedSet<Vulnerability> getVulnerabilities() {
+462 return vulnerabilities;
+463 }
+464
+465
+466
+467
+468
+469
+470 public void setVulnerabilities(SortedSet<Vulnerability> vulnerabilities) {
+471 this .vulnerabilities = vulnerabilities;
+472 }
+473
+474
+475
+476
+477
+478
+479 private void determineHashes(File file) {
+480 String md5 = null ;
+481 String sha1 = null ;
+482 try {
+483 md5 = Checksum.getMD5Checksum(file);
+484 sha1 = Checksum.getSHA1Checksum(file);
+485 } catch (IOException ex) {
+486 final String msg = String.format("Unable to read '%s' to determine hashes." , file.getName());
+487 LOGGER.log(Level.WARNING, msg);
+488 LOGGER.log(Level.FINE, null , ex);
+489 } catch (NoSuchAlgorithmException ex) {
+490 final String msg = "Unable to use MD5 of SHA1 checksums." ;
+491 LOGGER.log(Level.WARNING, msg);
+492 LOGGER.log(Level.FINE, null , ex);
+493 }
+494 this .setMd5sum(md5);
+495 this .setSha1sum(sha1);
+496 }
+497
+498
+499
+500
+501
+502
+503 public void addVulnerability(Vulnerability vulnerability) {
+504 this .vulnerabilities.add(vulnerability);
+505 }
+506
+507
+508
+509 private Set<Dependency> relatedDependencies = new TreeSet<Dependency>();
+510
+511
+512
+513
+514
+515
+516 public Set<Dependency> getRelatedDependencies() {
+517 return relatedDependencies;
+518 }
+519
+520
+521
+522
+523
+524
+525 public void setRelatedDependencies(Set<Dependency> relatedDependencies) {
+526 this .relatedDependencies = relatedDependencies;
+527 }
+528
+529
+530
+531
+532
+533
+534 public void addRelatedDependency(Dependency dependency) {
+535 relatedDependencies.add(dependency);
+536 }
+537
+538
+539
+540
+541
+542
+543
+544 public int compareTo(Dependency o) {
+545 return this .getFileName().compareToIgnoreCase(o.getFileName());
+546 }
+547
+548
+549
+550
+551
+552
+553
+554 @Override
+555 public boolean equals(Object obj) {
+556 if (obj == null ) {
+557 return false;
+558 }
+559 if (getClass() != obj.getClass()) {
+560 return false;
+561 }
+562 final Dependency other = (Dependency) obj;
+563 if ((this .actualFilePath == null ) ? (other.actualFilePath != null ) : !this .actualFilePath.equals(other.actualFilePath)) {
+564 return false;
+565 }
+566 if ((this .filePath == null ) ? (other.filePath != null ) : !this .filePath.equals(other.filePath)) {
+567 return false;
+568 }
+569 if ((this .fileName == null ) ? (other.fileName != null ) : !this .fileName.equals(other.fileName)) {
+570 return false;
+571 }
+572 if ((this .fileExtension == null ) ? (other.fileExtension != null ) : !this .fileExtension.equals(other.fileExtension)) {
+573 return false;
+574 }
+575 if ((this .md5sum == null ) ? (other.md5sum != null ) : !this .md5sum.equals(other.md5sum)) {
+576 return false;
+577 }
+578 if ((this .sha1sum == null ) ? (other.sha1sum != null ) : !this .sha1sum.equals(other.sha1sum)) {
+579 return false;
+580 }
+581 if (this .identifiers != other.identifiers && (this .identifiers == null || !this .identifiers.equals(other.identifiers))) {
+582 return false;
+583 }
+584 if (this .vendorEvidence != other.vendorEvidence && (this .vendorEvidence == null || !this .vendorEvidence.equals(other.vendorEvidence))) {
+585 return false;
+586 }
+587 if (this .productEvidence != other.productEvidence && (this .productEvidence == null || !this .productEvidence.equals(other.productEvidence))) {
+588 return false;
+589 }
+590 if (this .versionEvidence != other.versionEvidence && (this .versionEvidence == null || !this .versionEvidence.equals(other.versionEvidence))) {
+591 return false;
+592 }
+593 if ((this .description == null ) ? (other.description != null ) : !this .description.equals(other.description)) {
+594 return false;
+595 }
+596 if ((this .license == null ) ? (other.license != null ) : !this .license.equals(other.license)) {
+597 return false;
+598 }
+599 if (this .vulnerabilities != other.vulnerabilities && (this .vulnerabilities == null || !this .vulnerabilities.equals(other.vulnerabilities))) {
+600 return false;
+601 }
+602 if (this .relatedDependencies != other.relatedDependencies
+603 && (this .relatedDependencies == null || !this .relatedDependencies.equals(other.relatedDependencies))) {
+604 return false;
+605 }
+606 return true ;
+607 }
+608
+609
+610
+611
+612
+613
+614 @Override
+615 public int hashCode() {
+616 int hash = 3;
+617 hash = 47 * hash + (this .actualFilePath != null ? this .actualFilePath.hashCode() : 0);
+618 hash = 47 * hash + (this .filePath != null ? this .filePath.hashCode() : 0);
+619 hash = 47 * hash + (this .fileName != null ? this .fileName.hashCode() : 0);
+620 hash = 47 * hash + (this .fileExtension != null ? this .fileExtension.hashCode() : 0);
+621 hash = 47 * hash + (this .md5sum != null ? this .md5sum.hashCode() : 0);
+622 hash = 47 * hash + (this .sha1sum != null ? this .sha1sum.hashCode() : 0);
+623 hash = 47 * hash + (this .identifiers != null ? this .identifiers.hashCode() : 0);
+624 hash = 47 * hash + (this .vendorEvidence != null ? this .vendorEvidence.hashCode() : 0);
+625 hash = 47 * hash + (this .productEvidence != null ? this .productEvidence.hashCode() : 0);
+626 hash = 47 * hash + (this .versionEvidence != null ? this .versionEvidence.hashCode() : 0);
+627 hash = 47 * hash + (this .description != null ? this .description.hashCode() : 0);
+628 hash = 47 * hash + (this .license != null ? this .license.hashCode() : 0);
+629 hash = 47 * hash + (this .vulnerabilities != null ? this .vulnerabilities.hashCode() : 0);
+630 hash = 47 * hash + (this .relatedDependencies != null ? this .relatedDependencies.hashCode() : 0);
+631 return hash;
+632 }
+633
+634
+635
+636
+637
+638
+639 @Override
+640 public String toString() {
+641 return "Dependency{ fileName='" + fileName + "', actualFilePath='" + actualFilePath + "', filePath='" + filePath + "'}" ;
+642 }
+643 }
39 public class EvidenceCollection implements Iterable<Evidence> {
40
41
-42
+42
43
-44 private static final Filter<Evidence> HIGHEST_CONFIDENCE = new Filter<Evidence>() {
-45 public boolean passes(Evidence evidence) {
-46 return evidence.getConfidence() == Confidence.HIGHEST;
-47 }
-48 };
-49
-50
-51
-52 private static final Filter<Evidence> HIGH_CONFIDENCE = new Filter<Evidence>() {
-53 public boolean passes(Evidence evidence) {
-54 return evidence.getConfidence() == Confidence.HIGH;
-55 }
-56 };
-57
-58
-59
-60 private static final Filter<Evidence> MEDIUM_CONFIDENCE = new Filter<Evidence>() {
-61 public boolean passes(Evidence evidence) {
-62 return evidence.getConfidence() == Confidence.MEDIUM;
-63 }
-64 };
-65
-66
-67
-68 private static final Filter<Evidence> LOW_CONFIDENCE = new Filter<Evidence>() {
-69 public boolean passes(Evidence evidence) {
-70 return evidence.getConfidence() == Confidence.LOW;
-71 }
-72 };
-73
-74
-75
-76 private static final Filter<Evidence> EVIDENCE_USED = new Filter<Evidence>() {
-77 public boolean passes(Evidence evidence) {
-78 return evidence.isUsed();
-79 }
-80 };
-81
-82
-83
-84
-85
-86
-87
-88 public final Iterable<Evidence> iterator(Confidence confidence) {
-89 if (confidence == Confidence.HIGHEST) {
-90 return EvidenceCollection.HIGHEST_CONFIDENCE.filter(this .list);
-91 } else if (confidence == Confidence.HIGH) {
-92 return EvidenceCollection.HIGH_CONFIDENCE.filter(this .list);
-93 } else if (confidence == Confidence.MEDIUM) {
-94 return EvidenceCollection.MEDIUM_CONFIDENCE.filter(this .list);
-95 } else {
-96 return EvidenceCollection.LOW_CONFIDENCE.filter(this .list);
-97 }
-98 }
-99
-100
-101
-102 private final Set<Evidence> list;
+44 private static final Logger LOGGER = Logger.getLogger(EvidenceCollection.class .getName());
+45
+46
+47
+48 private static final Filter<Evidence> HIGHEST_CONFIDENCE = new Filter<Evidence>() {
+49 public boolean passes(Evidence evidence) {
+50 return evidence.getConfidence() == Confidence.HIGHEST;
+51 }
+52 };
+53
+54
+55
+56 private static final Filter<Evidence> HIGH_CONFIDENCE = new Filter<Evidence>() {
+57 public boolean passes(Evidence evidence) {
+58 return evidence.getConfidence() == Confidence.HIGH;
+59 }
+60 };
+61
+62
+63
+64 private static final Filter<Evidence> MEDIUM_CONFIDENCE = new Filter<Evidence>() {
+65 public boolean passes(Evidence evidence) {
+66 return evidence.getConfidence() == Confidence.MEDIUM;
+67 }
+68 };
+69
+70
+71
+72 private static final Filter<Evidence> LOW_CONFIDENCE = new Filter<Evidence>() {
+73 public boolean passes(Evidence evidence) {
+74 return evidence.getConfidence() == Confidence.LOW;
+75 }
+76 };
+77
+78
+79
+80 private static final Filter<Evidence> EVIDENCE_USED = new Filter<Evidence>() {
+81 public boolean passes(Evidence evidence) {
+82 return evidence.isUsed();
+83 }
+84 };
+85
+86
+87
+88
+89
+90
+91
+92 public final Iterable<Evidence> iterator(Confidence confidence) {
+93 if (confidence == Confidence.HIGHEST) {
+94 return EvidenceCollection.HIGHEST_CONFIDENCE.filter(this .list);
+95 } else if (confidence == Confidence.HIGH) {
+96 return EvidenceCollection.HIGH_CONFIDENCE.filter(this .list);
+97 } else if (confidence == Confidence.MEDIUM) {
+98 return EvidenceCollection.MEDIUM_CONFIDENCE.filter(this .list);
+99 } else {
+100 return EvidenceCollection.LOW_CONFIDENCE.filter(this .list);
+101 }
+102 }
103
-104
+104
105
-106 private final Set<String> weightedStrings;
-107
-108
-109
-110
-111 public EvidenceCollection () {
-112 list = new TreeSet<Evidence>();
-113 weightedStrings = new HashSet<String>();
-114 }
-115
-116
-117
-118
-119
-120
-121 public void addEvidence(Evidence e) {
-122 list.add(e);
-123 }
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133 public void addEvidence(String source, String name, String value, Confidence confidence) {
-134 final Evidence e = new Evidence (source, name, value, confidence);
-135 addEvidence(e);
-136 }
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149 public void addWeighting(String str) {
-150 weightedStrings.add(str);
-151 }
-152
-153
-154
-155
-156
-157
-158
-159 public Set<String> getWeighting() {
-160 return weightedStrings;
-161 }
-162
-163
-164
-165
-166
-167
-168 public Set<Evidence> getEvidence() {
-169 return list;
-170 }
-171
-172
-173
-174
-175
-176
-177
-178 public Set<Evidence> getEvidence(String source) {
-179 if (source == null ) {
-180 return null ;
-181 }
-182 final Set<Evidence> ret = new HashSet<Evidence>();
-183 for (Evidence e : list) {
-184 if (source.equals(e.getSource())) {
-185 ret.add(e);
-186 }
-187 }
-188 return ret;
-189 }
-190
-191
-192
-193
-194
-195
-196
-197
-198 public Set<Evidence> getEvidence(String source, String name) {
-199 if (source == null || name == null ) {
-200 return null ;
-201 }
-202 final Set<Evidence> ret = new HashSet<Evidence>();
-203 for (Evidence e : list) {
-204 if (source.equals(e.getSource()) && name.equals(e.getName())) {
-205 ret.add(e);
-206 }
-207 }
-208 return ret;
-209 }
-210
-211
-212
-213
-214
-215
-216 public Iterator<Evidence> iterator() {
-217 return list.iterator();
-218 }
-219
-220
-221
-222
-223
-224
-225
-226 public boolean containsUsedString(String text) {
-227 if (text == null ) {
-228 return false;
-229 }
-230 final String textToTest = text.toLowerCase();
-231
-232 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
-233
-234 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]" , "" );
-235 if (value.contains(textToTest)) {
-236 return true ;
-237 }
-238 }
-239 return false;
-240 }
-241
-242
-243
-244
-245
-246
-247
-248 public boolean containsUsedVersion(DependencyVersion version) {
-249 if (version == null ) {
-250 return false;
-251 }
-252
-253 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
-254 final DependencyVersion value = DependencyVersionUtil.parseVersion(e.getValue());
-255 if (value != null && value.matchesAtLeastThreeLevels(version)) {
-256 return true ;
-257 }
-258 }
-259 return false;
-260 }
-261
-262
-263
-264
-265
-266
-267
-268 public boolean contains(Confidence confidence) {
-269 for (Evidence e : list) {
-270 if (e.getConfidence().equals(confidence)) {
-271 return true ;
-272 }
-273 }
-274 return false;
-275 }
-276
-277
-278
-279
-280
-281
-282
-283 public static EvidenceCollection mergeUsed(EvidenceCollection... ec) {
-284 final EvidenceCollection ret = new EvidenceCollection ();
-285 for (EvidenceCollection col : ec) {
-286 for (Evidence e : col.list) {
-287 if (e.isUsed()) {
-288 ret.addEvidence(e);
-289 }
-290 }
-291 }
-292 return ret;
-293 }
-294
-295
-296
-297
-298
-299
-300
-301 public static EvidenceCollection merge(EvidenceCollection... ec) {
-302 final EvidenceCollection ret = new EvidenceCollection ();
-303 for (EvidenceCollection col : ec) {
-304 ret.list.addAll(col.list);
-305 ret.weightedStrings.addAll(col.weightedStrings);
-306 }
-307 return ret;
-308 }
-309
-310
-311
-312
-313
-314
-315 @Override
-316 public String toString() {
-317 final StringBuilder sb = new StringBuilder();
-318 for (Evidence e : this .list) {
-319 sb.append(e.getValue()).append(' ');
-320 }
-321 return sb.toString();
-322 }
-323
-324
-325
-326
-327
-328
-329 public int size() {
-330 return list.size();
-331 }
-332
-333
-334
-335
-336
-337
-338
-339
-340
+106 private final Set<Evidence> list;
+107
+108
+109
+110 private final Set<String> weightedStrings;
+111
+112
+113
+114
+115 public EvidenceCollection () {
+116 list = new TreeSet<Evidence>();
+117 weightedStrings = new HashSet<String>();
+118 }
+119
+120
+121
+122
+123
+124
+125 public void addEvidence(Evidence e) {
+126 list.add(e);
+127 }
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137 public void addEvidence(String source, String name, String value, Confidence confidence) {
+138 final Evidence e = new Evidence (source, name, value, confidence);
+139 addEvidence(e);
+140 }
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153 public void addWeighting(String str) {
+154 weightedStrings.add(str);
+155 }
+156
+157
+158
+159
+160
+161
+162
+163 public Set<String> getWeighting() {
+164 return weightedStrings;
+165 }
+166
+167
+168
+169
+170
+171
+172 public Set<Evidence> getEvidence() {
+173 return list;
+174 }
+175
+176
+177
+178
+179
+180
+181
+182 public Set<Evidence> getEvidence(String source) {
+183 if (source == null ) {
+184 return null ;
+185 }
+186 final Set<Evidence> ret = new HashSet<Evidence>();
+187 for (Evidence e : list) {
+188 if (source.equals(e.getSource())) {
+189 ret.add(e);
+190 }
+191 }
+192 return ret;
+193 }
+194
+195
+196
+197
+198
+199
+200
+201
+202 public Set<Evidence> getEvidence(String source, String name) {
+203 if (source == null || name == null ) {
+204 return null ;
+205 }
+206 final Set<Evidence> ret = new HashSet<Evidence>();
+207 for (Evidence e : list) {
+208 if (source.equals(e.getSource()) && name.equals(e.getName())) {
+209 ret.add(e);
+210 }
+211 }
+212 return ret;
+213 }
+214
+215
+216
+217
+218
+219
+220 public Iterator<Evidence> iterator() {
+221 return list.iterator();
+222 }
+223
+224
+225
+226
+227
+228
+229
+230 public boolean containsUsedString(String text) {
+231 if (text == null ) {
+232 return false;
+233 }
+234 final String textToTest = text.toLowerCase();
+235
+236 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
+237
+238 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]" , "" );
+239 if (value.contains(textToTest)) {
+240 return true ;
+241 }
+242 }
+243 return false;
+244 }
+245
+246
+247
+248
+249
+250
+251
+252 public boolean containsUsedVersion(DependencyVersion version) {
+253 if (version == null ) {
+254 return false;
+255 }
+256
+257 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
+258 final DependencyVersion value = DependencyVersionUtil.parseVersion(e.getValue());
+259 if (value != null && value.matchesAtLeastThreeLevels(version)) {
+260 return true ;
+261 }
+262 }
+263 return false;
+264 }
+265
+266
+267
+268
+269
+270
+271
+272 public boolean contains(Confidence confidence) {
+273 for (Evidence e : list) {
+274 if (e.getConfidence().equals(confidence)) {
+275 return true ;
+276 }
+277 }
+278 return false;
+279 }
+280
+281
+282
+283
+284
+285
+286
+287 public static EvidenceCollection mergeUsed(EvidenceCollection... ec) {
+288 final EvidenceCollection ret = new EvidenceCollection ();
+289 for (EvidenceCollection col : ec) {
+290 for (Evidence e : col.list) {
+291 if (e.isUsed()) {
+292 ret.addEvidence(e);
+293 }
+294 }
+295 }
+296 return ret;
+297 }
+298
+299
+300
+301
+302
+303
+304
+305 public static EvidenceCollection merge(EvidenceCollection... ec) {
+306 final EvidenceCollection ret = new EvidenceCollection ();
+307 for (EvidenceCollection col : ec) {
+308 ret.list.addAll(col.list);
+309 ret.weightedStrings.addAll(col.weightedStrings);
+310 }
+311 return ret;
+312 }
+313
+314
+315
+316
+317
+318
+319 @Override
+320 public String toString() {
+321 final StringBuilder sb = new StringBuilder();
+322 for (Evidence e : this .list) {
+323 sb.append(e.getValue()).append(' ');
+324 }
+325 return sb.toString();
+326 }
+327
+328
+329
+330
+331
+332
+333 public int size() {
+334 return list.size();
+335 }
+336
+337
+338
+339
+340
341
-342
-343
-344
-345
-346
-347
-348
-349
-350
-351 private String urlCorrection(String value) {
-352 if (value == null || !UrlStringUtils.containsUrl(value)) {
-353 return value;
-354 }
-355 final StringBuilder sb = new StringBuilder(value.length());
-356 final String[] parts = value.split("\\s" );
-357 for (String part : parts) {
-358 if (UrlStringUtils.isUrl(part)) {
-359 try {
-360 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
-361 sb.append(' ').append(StringUtils.join(data, ' '));
-362 } catch (MalformedURLException ex) {
-363 Logger.getLogger(EvidenceCollection.class .getName()).log(Level.FINE, "error parsing " + part, ex);
-364 sb.append(' ').append(part);
-365 }
-366 } else {
-367 sb.append(' ').append(part);
-368 }
-369 }
-370 return sb.toString().trim();
-371 }
-372 }
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355 private String urlCorrection(String value) {
+356 if (value == null || !UrlStringUtils.containsUrl(value)) {
+357 return value;
+358 }
+359 final StringBuilder sb = new StringBuilder(value.length());
+360 final String[] parts = value.split("\\s" );
+361 for (String part : parts) {
+362 if (UrlStringUtils.isUrl(part)) {
+363 try {
+364 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
+365 sb.append(' ').append(StringUtils.join(data, ' '));
+366 } catch (MalformedURLException ex) {
+367 LOGGER.log(Level.FINE, "error parsing " + part, ex);
+368 sb.append(' ').append(part);
+369 }
+370 } else {
+371 sb.append(' ').append(part);
+372 }
+373 }
+374 return sb.toString().trim();
+375 }
+376 }
32 public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable<VulnerableSoftware> {
33
34
-35
+35
36
-37 private static final long serialVersionUID = 307319490326651052L;
-38
-39
-40
-41
-42
-43
-44 public void setCpe(String cpe) {
-45 try {
-46 parseName(cpe);
-47 } catch (UnsupportedEncodingException ex) {
-48 final String msg = String.format("Character encoding is unsupported for CPE '%s'." , cpe);
-49 Logger.getLogger(VulnerableSoftware.class .getName()).log(Level.WARNING, msg);
-50 Logger.getLogger(VulnerableSoftware.class .getName()).log(Level.FINE, null , ex);
-51 setName(cpe);
-52 }
-53 }
-54
-55
-56
-57
-58
-59
-60
-61
-62
+37 private static final Logger LOGGER = Logger.getLogger(VulnerableSoftware.class .getName());
+38
+39
+40
+41 private static final long serialVersionUID = 307319490326651052L;
+42
+43
+44
+45
+46
+47
+48 public void setCpe(String cpe) {
+49 try {
+50 parseName(cpe);
+51 } catch (UnsupportedEncodingException ex) {
+52 final String msg = String.format("Character encoding is unsupported for CPE '%s'." , cpe);
+53 LOGGER.log(Level.WARNING, msg);
+54 LOGGER.log(Level.FINE, null , ex);
+55 setName(cpe);
+56 }
+57 }
+58
+59
+60
+61
+62
63
-64
-65
+64
+65
66
-67
-68
-69
-70 @Override
-71 public void parseName(String cpeName) throws UnsupportedEncodingException {
-72 this .name = cpeName;
-73 if (cpeName != null && cpeName.length() > 7) {
-74 final String[] data = cpeName.substring(7).split(":" );
-75 if (data.length >= 1) {
-76 this .setVendor(URLDecoder.decode(data[0].replace("+" , "%2B" ), "UTF-8" ));
-77 }
-78 if (data.length >= 2) {
-79 this .setProduct(URLDecoder.decode(data[1].replace("+" , "%2B" ), "UTF-8" ));
-80 }
-81 if (data.length >= 3) {
-82 version = URLDecoder.decode(data[2].replace("+" , "%2B" ), "UTF-8" );
-83 }
-84 if (data.length >= 4) {
-85 revision = URLDecoder.decode(data[3].replace("+" , "%2B" ), "UTF-8" );
-86 }
-87 if (data.length >= 5) {
-88 edition = URLDecoder.decode(data[4].replace("+" , "%2B" ), "UTF-8" );
-89 }
-90 }
-91 }
-92
-93
-94
-95 private String previousVersion;
-96
-97
-98
-99
-100
-101
-102 public boolean hasPreviousVersion() {
-103 return previousVersion != null ;
-104 }
-105
-106
-107
-108
-109
-110
-111 public String getPreviousVersion() {
-112 return previousVersion;
-113 }
-114
-115
-116
-117
-118
-119
-120 public void setPreviousVersion(String previousVersion) {
-121 this .previousVersion = previousVersion;
-122 }
-123
-124
-125
-126
-127
-128
-129
-130 @Override
-131 public boolean equals(Object obj) {
-132 if (obj == null ) {
-133 return false;
-134 }
-135 if (getClass() != obj.getClass()) {
-136 return false;
-137 }
-138 final VulnerableSoftware other = (VulnerableSoftware) obj;
-139 if ((this .getName() == null ) ? (other.getName() != null ) : !this .getName().equals(other.getName())) {
+67
+68
+69
+70
+71
+72
+73
+74 @Override
+75 public void parseName(String cpeName) throws UnsupportedEncodingException {
+76 this .name = cpeName;
+77 if (cpeName != null && cpeName.length() > 7) {
+78 final String[] data = cpeName.substring(7).split(":" );
+79 if (data.length >= 1) {
+80 this .setVendor(URLDecoder.decode(data[0].replace("+" , "%2B" ), "UTF-8" ));
+81 }
+82 if (data.length >= 2) {
+83 this .setProduct(URLDecoder.decode(data[1].replace("+" , "%2B" ), "UTF-8" ));
+84 }
+85 if (data.length >= 3) {
+86 version = URLDecoder.decode(data[2].replace("+" , "%2B" ), "UTF-8" );
+87 }
+88 if (data.length >= 4) {
+89 revision = URLDecoder.decode(data[3].replace("+" , "%2B" ), "UTF-8" );
+90 }
+91 if (data.length >= 5) {
+92 edition = URLDecoder.decode(data[4].replace("+" , "%2B" ), "UTF-8" );
+93 }
+94 }
+95 }
+96
+97
+98
+99 private String previousVersion;
+100
+101
+102
+103
+104
+105
+106 public boolean hasPreviousVersion() {
+107 return previousVersion != null ;
+108 }
+109
+110
+111
+112
+113
+114
+115 public String getPreviousVersion() {
+116 return previousVersion;
+117 }
+118
+119
+120
+121
+122
+123
+124 public void setPreviousVersion(String previousVersion) {
+125 this .previousVersion = previousVersion;
+126 }
+127
+128
+129
+130
+131
+132
+133
+134 @Override
+135 public boolean equals(Object obj) {
+136 if (obj == null ) {
+137 return false;
+138 }
+139 if (getClass() != obj.getClass()) {
140 return false;
141 }
-142 return true ;
-143 }
-144
-145
-146
-147
-148
-149
-150 @Override
-151 public int hashCode() {
-152 int hash = 7;
-153 hash = 83 * hash + (this .getName() != null ? this .getName().hashCode() : 0);
-154 return hash;
-155 }
-156
-157
-158
-159
-160
-161
-162 @Override
-163 public String toString() {
-164 return "VulnerableSoftware{ name=" + name + ", previousVersion=" + previousVersion + '}';
-165 }
-166
-167
-168
-169
-170
-171
-172
-173 @Override
-174 public int compareTo(VulnerableSoftware vs) {
-175 int result = 0;
-176 final String[] left = this .getName().split(":" );
-177 final String[] right = vs.getName().split(":" );
-178 final int max = (left.length <= right.length) ? left.length : right.length;
-179 if (max > 0) {
-180 for (int i = 0; result == 0 && i < max; i++) {
-181 final String[] subLeft = left[i].split("\\." );
-182 final String[] subRight = right[i].split("\\." );
-183 final int subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;
-184 if (subMax > 0) {
-185 for (int x = 0; result == 0 && x < subMax; x++) {
-186 if (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {
-187 try {
-188 result = Long.valueOf(subLeft[x]).compareTo(Long.valueOf(subRight[x]));
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198 } catch (NumberFormatException ex) {
-199
-200 if (!subLeft[x].equalsIgnoreCase(subRight[x])) {
-201 result = subLeft[x].compareToIgnoreCase(subRight[x]);
-202 }
-203 }
-204 } else {
-205 result = subLeft[x].compareToIgnoreCase(subRight[x]);
-206 }
-207 }
-208 if (result == 0) {
-209 if (subLeft.length > subRight.length) {
-210 result = 2;
-211 }
-212 if (subRight.length > subLeft.length) {
-213 result = -2;
-214 }
-215 }
-216 } else {
-217 result = left[i].compareToIgnoreCase(right[i]);
-218 }
-219 }
-220 if (result == 0) {
-221 if (left.length > right.length) {
-222 result = 2;
-223 }
-224 if (right.length > left.length) {
-225 result = -2;
-226 }
-227 }
-228 } else {
-229 result = this .getName().compareToIgnoreCase(vs.getName());
-230 }
-231 return result;
-232 }
-233
-234
-235
-236
-237
-238
-239
-240 private static boolean isPositiveInteger(final String str) {
-241 if (str == null || str.isEmpty()) {
-242 return false;
-243 }
-244 for (int i = 0; i < str.length(); i++) {
-245 final char c = str.charAt(i);
-246 if (c < '0' || c > '9') {
-247 return false;
-248 }
-249 }
-250 return true ;
-251 }
-252
-253
-254
-255 private String name;
-256
-257
-258
-259
-260
-261
-262 public String getName() {
-263 return name;
-264 }
-265
-266
-267
-268
-269
-270
-271 public void setName(String name) {
-272 this .name = name;
-273 }
-274
-275
-276
-277 private String version;
-278
-279
-280
-281
-282
-283
-284 public String getVersion() {
-285 return version;
-286 }
-287
-288
-289
-290
-291
-292
-293 public void setVersion(String version) {
-294 this .version = version;
-295 }
-296
-297
-298
-299 private String revision;
-300
-301
-302
-303
-304
-305
-306 public String getRevision() {
-307 return revision;
-308 }
-309
-310
-311
-312
-313
-314
-315 public void setRevision(String revision) {
-316 this .revision = revision;
-317 }
-318
-319
-320
-321 private String edition;
-322
-323
-324
-325
-326
-327
-328 public String getEdition() {
-329 return edition;
-330 }
-331
-332
-333
-334
-335
-336
-337 public void setEdition(String edition) {
-338 this .edition = edition;
-339 }
-340 }
+142 final VulnerableSoftware other = (VulnerableSoftware) obj;
+143 if ((this .getName() == null ) ? (other.getName() != null ) : !this .getName().equals(other.getName())) {
+144 return false;
+145 }
+146 return true ;
+147 }
+148
+149
+150
+151
+152
+153
+154 @Override
+155 public int hashCode() {
+156 int hash = 7;
+157 hash = 83 * hash + (this .getName() != null ? this .getName().hashCode() : 0);
+158 return hash;
+159 }
+160
+161
+162
+163
+164
+165
+166 @Override
+167 public String toString() {
+168 return "VulnerableSoftware{ name=" + name + ", previousVersion=" + previousVersion + '}';
+169 }
+170
+171
+172
+173
+174
+175
+176
+177 @Override
+178 public int compareTo(VulnerableSoftware vs) {
+179 int result = 0;
+180 final String[] left = this .getName().split(":" );
+181 final String[] right = vs.getName().split(":" );
+182 final int max = (left.length <= right.length) ? left.length : right.length;
+183 if (max > 0) {
+184 for (int i = 0; result == 0 && i < max; i++) {
+185 final String[] subLeft = left[i].split("\\." );
+186 final String[] subRight = right[i].split("\\." );
+187 final int subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;
+188 if (subMax > 0) {
+189 for (int x = 0; result == 0 && x < subMax; x++) {
+190 if (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {
+191 try {
+192 result = Long.valueOf(subLeft[x]).compareTo(Long.valueOf(subRight[x]));
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202 } catch (NumberFormatException ex) {
+203
+204 if (!subLeft[x].equalsIgnoreCase(subRight[x])) {
+205 result = subLeft[x].compareToIgnoreCase(subRight[x]);
+206 }
+207 }
+208 } else {
+209 result = subLeft[x].compareToIgnoreCase(subRight[x]);
+210 }
+211 }
+212 if (result == 0) {
+213 if (subLeft.length > subRight.length) {
+214 result = 2;
+215 }
+216 if (subRight.length > subLeft.length) {
+217 result = -2;
+218 }
+219 }
+220 } else {
+221 result = left[i].compareToIgnoreCase(right[i]);
+222 }
+223 }
+224 if (result == 0) {
+225 if (left.length > right.length) {
+226 result = 2;
+227 }
+228 if (right.length > left.length) {
+229 result = -2;
+230 }
+231 }
+232 } else {
+233 result = this .getName().compareToIgnoreCase(vs.getName());
+234 }
+235 return result;
+236 }
+237
+238
+239
+240
+241
+242
+243
+244 private static boolean isPositiveInteger(final String str) {
+245 if (str == null || str.isEmpty()) {
+246 return false;
+247 }
+248 for (int i = 0; i < str.length(); i++) {
+249 final char c = str.charAt(i);
+250 if (c < '0' || c > '9') {
+251 return false;
+252 }
+253 }
+254 return true ;
+255 }
+256
+257
+258
+259 private String name;
+260
+261
+262
+263
+264
+265
+266 public String getName() {
+267 return name;
+268 }
+269
+270
+271
+272
+273
+274
+275 public void setName(String name) {
+276 this .name = name;
+277 }
+278
+279
+280
+281 private String version;
+282
+283
+284
+285
+286
+287
+288 public String getVersion() {
+289 return version;
+290 }
+291
+292
+293
+294
+295
+296
+297 public void setVersion(String version) {
+298 this .version = version;
+299 }
+300
+301
+302
+303 private String revision;
+304
+305
+306
+307
+308
+309
+310 public String getRevision() {
+311 return revision;
+312 }
+313
+314
+315
+316
+317
+318
+319 public void setRevision(String revision) {
+320 this .revision = revision;
+321 }
+322
+323
+324
+325 private String edition;
+326
+327
+328
+329
+330
+331
+332 public String getEdition() {
+333 return edition;
+334 }
+335
+336
+337
+338
+339
+340
+341 public void setEdition(String edition) {
+342 this .edition = edition;
+343 }
+344 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.dependency
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.dependency
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.dependency
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.dependency
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.exception
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.exception
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.exception
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.exception
56
57
58
-59
+59
60
61
62 @Override
-63 public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-64 super .startElement(NAMESPACE, localName, qName, atts);
+63 public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+64 super .startElement(NAMESPACE, localName, qName, attributes);
65 }
66
67
-68
+68
69
70
71
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/jaxb/pom/generated/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/jaxb/pom/generated/package-frame.html
index 85a9a3600..e5660e0c9 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/jaxb/pom/generated/package-frame.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/jaxb/pom/generated/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.jaxb.pom.generated
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.jaxb.pom.generated
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.jaxb.pom.generated
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.jaxb.pom.generated
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.jaxb.pom
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.jaxb.pom
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.jaxb.pom
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.jaxb.pom
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck
26 import java.io.InputStreamReader;
27 import java.io.OutputStream;
28 import java.io.OutputStreamWriter;
-29 import java.util.List;
-30 import java.util.logging.Level;
-31 import java.util.logging.Logger;
-32 import org.apache.velocity.app.VelocityEngine;
-33 import org.apache.velocity.context.Context;
-34 import org.apache.velocity.runtime.RuntimeConstants;
-35 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-36 import org.apache.velocity.tools.ToolManager;
-37 import org.apache.velocity.tools.config.EasyFactoryConfiguration;
-38 import org.owasp.dependencycheck.analyzer.Analyzer;
-39 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
-40 import org.owasp.dependencycheck.dependency.Dependency;
-41 import org.owasp.dependencycheck.utils.Settings;
-42
-43
-44
-45
-46
-47
-48
-49 public class ReportGenerator {
-50
-51
-52
-53
-54 public enum Format {
-55
-56
-57
-58
-59 ALL,
-60
-61
-62
-63 XML,
-64
-65
-66
-67 HTML,
-68
-69
-70
-71 VULN
-72 }
-73
-74
-75
-76 private final VelocityEngine engine;
-77
-78
-79
-80 private final Context context;
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90 public ReportGenerator (String applicationName, List<Dependency> dependencies, List<Analyzer> analyzers, DatabaseProperties properties) {
-91 engine = createVelocityEngine();
-92 context = createContext();
-93
-94 engine.init();
-95
-96 context.put("applicationName" , applicationName);
-97 context.put("dependencies" , dependencies);
-98 context.put("analyzers" , analyzers);
-99 context.put("properties" , properties);
-100 context.put("version" , Settings.getString("application.version" , "Unknown" ));
-101 }
-102
-103
-104
-105
-106
-107
-108 private VelocityEngine createVelocityEngine() {
-109 final VelocityEngine ve = new VelocityEngine();
-110 ve.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, VelocityLoggerRedirect.class .getName());
-111 ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath" );
-112 ve.setProperty("classpath.resource.loader.class" , ClasspathResourceLoader.class .getName());
-113 return ve;
-114 }
-115
-116
-117
-118
-119
-120
-121 @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RV_RETURN_VALUE_IGNORED_INFERRED" ,
-122 justification = "No plan to fix this style issue" )
-123 private Context createContext() {
-124 final ToolManager manager = new ToolManager();
-125 final Context c = manager.createContext();
-126 final EasyFactoryConfiguration config = new EasyFactoryConfiguration();
-127 config.addDefaultTools();
-128 config.toolbox("application" ).tool("esc" , "org.apache.velocity.tools.generic.EscapeTool" ).tool("org.apache.velocity.tools.generic.DateTool" );
-129 manager.configure(config);
-130 return c;
-131 }
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141 public void generateReports(String outputDir, Format format) throws IOException, Exception {
-142 if (format == Format.XML || format == Format.ALL) {
-143 generateReport("XmlReport" , outputDir + File.separator + "dependency-check-report.xml" );
-144 }
-145 if (format == Format.HTML || format == Format.ALL) {
-146 generateReport("HtmlReport" , outputDir + File.separator + "dependency-check-report.html" );
-147 }
-148 if (format == Format.VULN || format == Format.ALL) {
-149 generateReport("VulnerabilityReport" , outputDir + File.separator + "dependency-check-vulnerability.html" );
-150 }
-151 }
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161 public void generateReports(String outputDir, String outputFormat) throws IOException, Exception {
-162 final String format = outputFormat.toUpperCase();
-163 if (format.matches("^(XML|HTML|VULN|ALL)$" )) {
-164 if ("XML" .equalsIgnoreCase(format)) {
-165 generateReports(outputDir, Format.XML);
-166 }
-167 if ("HTML" .equalsIgnoreCase(format)) {
-168 generateReports(outputDir, Format.HTML);
-169 }
-170 if ("VULN" .equalsIgnoreCase(format)) {
-171 generateReports(outputDir, Format.VULN);
-172 }
-173 if ("ALL" .equalsIgnoreCase(format)) {
-174 generateReports(outputDir, Format.ALL);
-175 }
-176 }
-177 }
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189 protected void generateReport(String templateName, String outFileName) throws IOException, Exception {
-190 InputStream input = null ;
-191 String templatePath = null ;
-192 final File f = new File(templateName);
-193 if (f.exists() && f.isFile()) {
-194 try {
-195 templatePath = templateName;
-196 input = new FileInputStream(f);
-197 } catch (FileNotFoundException ex) {
-198 final String msg = "Unable to generate the report, the report template file could not be found." ;
-199 Logger.getLogger(ReportGenerator.class .getName()).log(Level.SEVERE, msg);
-200 Logger.getLogger(ReportGenerator.class .getName()).log(Level.FINE, null , ex);
-201 }
-202 } else {
-203 templatePath = "templates/" + templateName + ".vsl" ;
-204 input = this .getClass().getClassLoader().getResourceAsStream(templatePath);
-205 }
-206 if (input == null ) {
-207 throw new IOException("Template file doesn't exist" );
-208 }
-209
-210 final InputStreamReader reader = new InputStreamReader(input, "UTF-8" );
-211 OutputStreamWriter writer = null ;
-212 OutputStream outputStream = null ;
-213
-214 try {
-215 final File outDir = new File(outFileName).getParentFile();
-216 if (!outDir.exists()) {
-217 final boolean created = outDir.mkdirs();
-218 if (!created) {
-219 throw new Exception("Unable to create directory '" + outDir.getAbsolutePath() + "'." );
-220 }
-221 }
-222
-223 outputStream = new FileOutputStream(outFileName);
-224 writer = new OutputStreamWriter(outputStream, "UTF-8" );
-225
-226 if (!engine.evaluate(context, writer, templatePath, reader)) {
-227 throw new Exception("Failed to convert the template into html." );
+29 import java.text.DateFormat;
+30 import java.text.SimpleDateFormat;
+31 import java.util.Date;
+32 import java.util.List;
+33 import java.util.logging.Level;
+34 import java.util.logging.Logger;
+35 import org.apache.velocity.VelocityContext;
+36 import org.apache.velocity.app.VelocityEngine;
+37 import org.apache.velocity.context.Context;
+38 import org.apache.velocity.runtime.RuntimeConstants;
+39 import org.owasp.dependencycheck.analyzer.Analyzer;
+40 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
+41 import org.owasp.dependencycheck.dependency.Dependency;
+42 import org.owasp.dependencycheck.utils.Settings;
+43
+44
+45
+46
+47
+48
+49
+50 public class ReportGenerator {
+51
+52
+53
+54
+55 private static final Logger LOGGER = Logger.getLogger(ReportGenerator.class .getName());
+56
+57
+58
+59
+60 public enum Format {
+61
+62
+63
+64
+65 ALL,
+66
+67
+68
+69 XML,
+70
+71
+72
+73 HTML,
+74
+75
+76
+77 VULN
+78 }
+79
+80
+81
+82 private final VelocityEngine engine;
+83
+84
+85
+86 private final Context context;
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96 public ReportGenerator (String applicationName, List<Dependency> dependencies, List<Analyzer> analyzers, DatabaseProperties properties) {
+97 engine = createVelocityEngine();
+98 context = createContext();
+99
+100 engine.init();
+101
+102 final DateFormat dateFormat = new SimpleDateFormat("MMM d, yyyy 'at' HH:mm:ss z" );
+103 final DateFormat dateFormatXML = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ" );
+104 final Date d = new Date();
+105 final String scanDate = dateFormat.format(d);
+106 final String scanDateXML = dateFormatXML.format(d);
+107 final EscapeTool enc = new EscapeTool ();
+108
+109 context.put("applicationName" , applicationName);
+110 context.put("dependencies" , dependencies);
+111 context.put("analyzers" , analyzers);
+112 context.put("properties" , properties);
+113 context.put("scanDate" , scanDate);
+114 context.put("scanDateXML" , scanDateXML);
+115 context.put("enc" , enc);
+116 context.put("version" , Settings.getString("application.version" , "Unknown" ));
+117 }
+118
+119
+120
+121
+122
+123
+124 private VelocityEngine createVelocityEngine() {
+125 final VelocityEngine engine = new VelocityEngine();
+126
+127 engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, VelocityLoggerRedirect.class .getName());
+128 return engine;
+129 }
+130
+131
+132
+133
+134
+135
+136 private Context createContext() {
+137 return new VelocityContext();
+138 }
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148 public void generateReports(String outputDir, Format format) throws IOException, Exception {
+149 if (format == Format.XML || format == Format.ALL) {
+150 generateReport("XmlReport" , outputDir + File.separator + "dependency-check-report.xml" );
+151 }
+152 if (format == Format.HTML || format == Format.ALL) {
+153 generateReport("HtmlReport" , outputDir + File.separator + "dependency-check-report.html" );
+154 }
+155 if (format == Format.VULN || format == Format.ALL) {
+156 generateReport("VulnerabilityReport" , outputDir + File.separator + "dependency-check-vulnerability.html" );
+157 }
+158 }
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168 public void generateReports(String outputDir, String outputFormat) throws IOException, Exception {
+169 final String format = outputFormat.toUpperCase();
+170 if (format.matches("^(XML|HTML|VULN|ALL)$" )) {
+171 if ("XML" .equalsIgnoreCase(format)) {
+172 generateReports(outputDir, Format.XML);
+173 }
+174 if ("HTML" .equalsIgnoreCase(format)) {
+175 generateReports(outputDir, Format.HTML);
+176 }
+177 if ("VULN" .equalsIgnoreCase(format)) {
+178 generateReports(outputDir, Format.VULN);
+179 }
+180 if ("ALL" .equalsIgnoreCase(format)) {
+181 generateReports(outputDir, Format.ALL);
+182 }
+183 }
+184 }
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196 protected void generateReport(String templateName, String outFileName) throws IOException, Exception {
+197 InputStream input = null ;
+198 String templatePath = null ;
+199 final File f = new File(templateName);
+200 if (f.exists() && f.isFile()) {
+201 try {
+202 templatePath = templateName;
+203 input = new FileInputStream(f);
+204 } catch (FileNotFoundException ex) {
+205 final String msg = "Unable to generate the report, the report template file could not be found." ;
+206 LOGGER.log(Level.SEVERE, msg);
+207 LOGGER.log(Level.FINE, null , ex);
+208 }
+209 } else {
+210 templatePath = "templates/" + templateName + ".vsl" ;
+211 input = this .getClass().getClassLoader().getResourceAsStream(templatePath);
+212 }
+213 if (input == null ) {
+214 throw new IOException("Template file doesn't exist" );
+215 }
+216
+217 final InputStreamReader reader = new InputStreamReader(input, "UTF-8" );
+218 OutputStreamWriter writer = null ;
+219 OutputStream outputStream = null ;
+220
+221 try {
+222 final File outDir = new File(outFileName).getParentFile();
+223 if (!outDir.exists()) {
+224 final boolean created = outDir.mkdirs();
+225 if (!created) {
+226 throw new Exception("Unable to create directory '" + outDir.getAbsolutePath() + "'." );
+227 }
228 }
-229 writer.flush();
-230 } finally {
-231 if (writer != null ) {
-232 try {
-233 writer.close();
-234 } catch (IOException ex) {
-235 Logger.getLogger(ReportGenerator.class .getName()).log(Level.FINEST, null , ex);
-236 }
-237 }
-238 if (outputStream != null ) {
+229
+230 outputStream = new FileOutputStream(outFileName);
+231 writer = new OutputStreamWriter(outputStream, "UTF-8" );
+232
+233 if (!engine.evaluate(context, writer, templatePath, reader)) {
+234 throw new Exception("Failed to convert the template into html." );
+235 }
+236 writer.flush();
+237 } finally {
+238 if (writer != null ) {
239 try {
-240 outputStream.close();
+240 writer.close();
241 } catch (IOException ex) {
-242 Logger.getLogger(ReportGenerator.class .getName()).log(Level.FINEST, null , ex);
+242 LOGGER.log(Level.FINEST, null , ex);
243 }
244 }
-245 try {
-246 reader.close();
-247 } catch (IOException ex) {
-248 Logger.getLogger(ReportGenerator.class .getName()).log(Level.FINEST, null , ex);
-249 }
-250 }
-251 }
-252 }
+245 if (outputStream != null ) {
+246 try {
+247 outputStream.close();
+248 } catch (IOException ex) {
+249 LOGGER.log(Level.FINEST, null , ex);
+250 }
+251 }
+252 try {
+253 reader.close();
+254 } catch (IOException ex) {
+255 LOGGER.log(Level.FINEST, null , ex);
+256 }
+257 }
+258 }
+259 }
19
20 import java.util.logging.Level;
21 import java.util.logging.Logger;
-22 import org.apache.velocity.app.Velocity;
-23 import org.apache.velocity.runtime.RuntimeServices;
-24 import org.apache.velocity.runtime.log.LogChute;
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38 public class VelocityLoggerRedirect implements LogChute {
-39
-40
-41
-42
-43
-44
-45 public void init(RuntimeServices rsvc) {
-46
-47 }
-48
-49
-50
-51
-52
-53
-54
-55
-56 public void log(int level, String message) {
-57 Logger.getLogger(Velocity.class .getName()).log(getLevel(level), message);
-58 }
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68 public void log(int level, String message, Throwable t) {
-69 Logger.getLogger(Velocity.class .getName()).log(getLevel(level), message, t);
-70 }
-71
-72
-73
-74
-75
-76
-77
-78 public boolean isLevelEnabled(int level) {
-79 return true ;
-80 }
-81
-82
-83
-84
-85
-86
-87
-88 private Level getLevel(int velocityLevel) {
-89 switch (velocityLevel) {
-90 case TRACE_ID:
-91 return Level.ALL;
-92 case DEBUG_ID:
-93 return Level.FINE;
-94 case INFO_ID:
-95 return Level.INFO;
-96 case WARN_ID:
-97 return Level.WARNING;
-98 case ERROR_ID:
-99 return Level.SEVERE;
-100 default :
-101 return Level.INFO;
-102 }
-103 }
-104 }
+22 import org.apache.velocity.runtime.RuntimeServices;
+23 import org.apache.velocity.runtime.log.LogChute;
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37 public class VelocityLoggerRedirect implements LogChute {
+38
+39
+40
+41
+42 private static final Logger LOGGER = Logger.getLogger(VelocityLoggerRedirect.class .getName());
+43
+44
+45
+46
+47
+48
+49 public void init(RuntimeServices rsvc) {
+50
+51 }
+52
+53
+54
+55
+56
+57
+58
+59
+60 public void log(int level, String message) {
+61 LOGGER.log(getLevel(level), message);
+62 }
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72 public void log(int level, String message, Throwable t) {
+73 LOGGER.log(getLevel(level), message, t);
+74 }
+75
+76
+77
+78
+79
+80
+81
+82 public boolean isLevelEnabled(int level) {
+83 return true ;
+84 }
+85
+86
+87
+88
+89
+90
+91
+92 private Level getLevel(int velocityLevel) {
+93 switch (velocityLevel) {
+94 case TRACE_ID:
+95 return Level.ALL;
+96 case DEBUG_ID:
+97 return Level.FINE;
+98 case INFO_ID:
+99 return Level.INFO;
+100 case WARN_ID:
+101 return Level.WARNING;
+102 case ERROR_ID:
+103 return Level.SEVERE;
+104 default :
+105 return Level.INFO;
+106 }
+107 }
+108 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.reporting
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.reporting
+ EscapeTool
+
+
Format
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html
index 3eda49ead..687fbc3ed 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.reporting
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.reporting
+
+ EscapeTool
+
+
+
Format
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.html b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.html
index 4ba714c43..a61ca22cf 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.html
@@ -39,65 +39,70 @@
31 public class SuppressionErrorHandler implements ErrorHandler {
32
33
-34
-35
-36
-37
-38
-39 private String getPrettyParseExceptionInfo(SAXParseException ex) {
-40
-41 final StringBuilder sb = new StringBuilder();
-42
-43 if (ex.getSystemId() != null ) {
-44 sb.append("systemId=" ).append(ex.getSystemId()).append(", " );
-45 }
-46 if (ex.getPublicId() != null ) {
-47 sb.append("publicId=" ).append(ex.getPublicId()).append(", " );
-48 }
-49 if (ex.getLineNumber() > 0) {
-50 sb.append("Line=" ).append(ex.getLineNumber());
-51 }
-52 if (ex.getColumnNumber() > 0) {
-53 sb.append(", Column=" ).append(ex.getColumnNumber());
-54 }
-55 sb.append(": " ).append(ex.getMessage());
-56
-57 return sb.toString();
-58 }
-59
-60
-61
-62
-63
-64
-65
-66 @Override
-67 public void warning(SAXParseException ex) throws SAXException {
-68 Logger.getLogger(SuppressionErrorHandler.class .getName()).log(Level.FINE, null , ex);
-69 }
-70
-71
-72
-73
-74
-75
-76
-77 @Override
-78 public void error(SAXParseException ex) throws SAXException {
-79 throw new SAXException(getPrettyParseExceptionInfo(ex));
-80 }
-81
-82
-83
-84
-85
-86
-87
-88 @Override
-89 public void fatalError(SAXParseException ex) throws SAXException {
-90 throw new SAXException(getPrettyParseExceptionInfo(ex));
-91 }
-92 }
+34
+35
+36 private static final Logger LOGGER = Logger.getLogger(SuppressionErrorHandler.class .getName());
+37
+38
+39
+40
+41
+42
+43
+44 private String getPrettyParseExceptionInfo(SAXParseException ex) {
+45
+46 final StringBuilder sb = new StringBuilder();
+47
+48 if (ex.getSystemId() != null ) {
+49 sb.append("systemId=" ).append(ex.getSystemId()).append(", " );
+50 }
+51 if (ex.getPublicId() != null ) {
+52 sb.append("publicId=" ).append(ex.getPublicId()).append(", " );
+53 }
+54 if (ex.getLineNumber() > 0) {
+55 sb.append("Line=" ).append(ex.getLineNumber());
+56 }
+57 if (ex.getColumnNumber() > 0) {
+58 sb.append(", Column=" ).append(ex.getColumnNumber());
+59 }
+60 sb.append(": " ).append(ex.getMessage());
+61
+62 return sb.toString();
+63 }
+64
+65
+66
+67
+68
+69
+70
+71 @Override
+72 public void warning(SAXParseException ex) throws SAXException {
+73 LOGGER.log(Level.FINE, null , ex);
+74 }
+75
+76
+77
+78
+79
+80
+81
+82 @Override
+83 public void error(SAXParseException ex) throws SAXException {
+84 throw new SAXException(getPrettyParseExceptionInfo(ex));
+85 }
+86
+87
+88
+89
+90
+91
+92
+93 @Override
+94 public void fatalError(SAXParseException ex) throws SAXException {
+95 throw new SAXException(getPrettyParseExceptionInfo(ex));
+96 }
+97 }
164 pt.setRegex(Boolean.parseBoolean(regex));
165 }
166 final String caseSensitive = currentAttributes.getValue("caseSensitive" );
-167 if (regex != null ) {
+167 if (caseSensitive != null ) {
168 pt.setCaseSensitive(Boolean.parseBoolean(caseSensitive));
169 }
170 }
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionParser.html b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionParser.html
index a78c848e3..246b48491 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionParser.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/SuppressionParser.html
@@ -50,63 +50,67 @@
42 public class SuppressionParser {
43
44
-45
+45
46
-47 public static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage" ;
+47 private static final Logger LOGGER = Logger.getLogger(SuppressionParser.class .getName());
48
-49
+49
50
-51 public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema" ;
+51 public static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage" ;
52
-53
+53
54
-55 public static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource" ;
-56
-57
-58
-59
-60
-61
-62
-63
-64 public List<SuppressionRule> parseSuppressionRules(File file) throws SuppressionParseException {
-65 try {
-66 final InputStream schemaStream = this .getClass().getClassLoader().getResourceAsStream("schema/suppression.xsd" );
-67 final SuppressionHandler handler = new SuppressionHandler ();
-68
-69 final SAXParserFactory factory = SAXParserFactory.newInstance();
-70 factory.setNamespaceAware(true );
-71 factory.setValidating(true );
-72 final SAXParser saxParser = factory.newSAXParser();
-73 saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_LANGUAGE, SuppressionParser.W3C_XML_SCHEMA);
-74 saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_SOURCE, new InputSource(schemaStream));
-75 final XMLReader xmlReader = saxParser.getXMLReader();
-76 xmlReader.setErrorHandler(new SuppressionErrorHandler ());
-77 xmlReader.setContentHandler(handler);
-78
-79 final InputStream inputStream = new FileInputStream(file);
-80 final Reader reader = new InputStreamReader(inputStream, "UTF-8" );
-81 final InputSource in = new InputSource(reader);
-82
-83
-84 xmlReader.parse(in);
-85
-86 return handler.getSuppressionRules();
-87 } catch (ParserConfigurationException ex) {
-88 Logger.getLogger(SuppressionParser.class .getName()).log(Level.FINE, null , ex);
-89 throw new SuppressionParseException (ex);
-90 } catch (SAXException ex) {
-91 Logger.getLogger(SuppressionParser.class .getName()).log(Level.FINE, null , ex);
-92 throw new SuppressionParseException (ex);
-93 } catch (FileNotFoundException ex) {
-94 Logger.getLogger(SuppressionParser.class .getName()).log(Level.FINE, null , ex);
-95 throw new SuppressionParseException (ex);
-96 } catch (IOException ex) {
-97 Logger.getLogger(SuppressionParser.class .getName()).log(Level.FINE, null , ex);
-98 throw new SuppressionParseException (ex);
-99 }
-100 }
-101 }
+55 public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema" ;
+56
+57
+58
+59 public static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource" ;
+60
+61
+62
+63
+64
+65
+66
+67
+68 public List<SuppressionRule> parseSuppressionRules(File file) throws SuppressionParseException {
+69 try {
+70 final InputStream schemaStream = this .getClass().getClassLoader().getResourceAsStream("schema/suppression.xsd" );
+71 final SuppressionHandler handler = new SuppressionHandler ();
+72
+73 final SAXParserFactory factory = SAXParserFactory.newInstance();
+74 factory.setNamespaceAware(true );
+75 factory.setValidating(true );
+76 final SAXParser saxParser = factory.newSAXParser();
+77 saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_LANGUAGE, SuppressionParser.W3C_XML_SCHEMA);
+78 saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_SOURCE, new InputSource(schemaStream));
+79 final XMLReader xmlReader = saxParser.getXMLReader();
+80 xmlReader.setErrorHandler(new SuppressionErrorHandler ());
+81 xmlReader.setContentHandler(handler);
+82
+83 final InputStream inputStream = new FileInputStream(file);
+84 final Reader reader = new InputStreamReader(inputStream, "UTF-8" );
+85 final InputSource in = new InputSource(reader);
+86
+87
+88 xmlReader.parse(in);
+89
+90 return handler.getSuppressionRules();
+91 } catch (ParserConfigurationException ex) {
+92 LOGGER.log(Level.FINE, null , ex);
+93 throw new SuppressionParseException (ex);
+94 } catch (SAXException ex) {
+95 LOGGER.log(Level.FINE, null , ex);
+96 throw new SuppressionParseException (ex);
+97 } catch (FileNotFoundException ex) {
+98 LOGGER.log(Level.FINE, null , ex);
+99 throw new SuppressionParseException (ex);
+100 } catch (IOException ex) {
+101 LOGGER.log(Level.FINE, null , ex);
+102 throw new SuppressionParseException (ex);
+103 }
+104 }
+105 }
254 final Identifier i = itr.next();
255 for (PropertyType c : this .cpe) {
256 if (cpeMatches(c, i)) {
-257 itr.remove();
-258 break ;
-259 }
-260 }
-261 }
-262 }
-263 if (hasCve() || hasCwe() || hasCvssBelow()) {
-264 final Iterator<Vulnerability> itr = dependency.getVulnerabilities().iterator();
-265 while (itr.hasNext()) {
-266 boolean remove = false;
-267 final Vulnerability v = itr.next();
-268 for (String entry : this .cve) {
-269 if (entry.equalsIgnoreCase(v.getName())) {
-270 remove = true ;
-271 break ;
-272 }
-273 }
-274 if (!remove) {
-275 for (String entry : this .cwe) {
-276 if (v.getCwe() != null ) {
-277 final String toMatch = String.format("CWE-%s " , entry);
-278 final String toTest = v.getCwe().substring(0, toMatch.length()).toUpperCase();
-279 if (toTest.equals(toMatch)) {
-280 remove = true ;
-281 break ;
-282 }
-283 }
-284 }
-285 }
-286 if (!remove) {
-287 for (float cvss : this .cvssBelow) {
-288 if (v.getCvssScore() < cvss) {
-289 remove = true ;
-290 break ;
-291 }
-292 }
-293 }
-294 if (remove) {
-295 itr.remove();
-296 }
-297 }
-298 }
-299 }
-300
-301
-302
-303
-304
-305
-306
-307 boolean cpeHasNoVersion(PropertyType c) {
-308 if (c.isRegex()) {
-309 return false;
-310 }
-311 if (countCharacter(c.getValue(), ':') == 3) {
-312 return true ;
-313 }
-314 return false;
-315 }
-316
-317
-318
-319
-320
-321
-322
-323
-324 int countCharacter(String str, char c) {
-325 int count = 0;
-326 int pos = str.indexOf(c) + 1;
-327 while (pos > 0) {
-328 count += 1;
-329 pos = str.indexOf(c, pos) + 1;
-330 }
-331 return count;
-332 }
-333
-334
-335
-336
-337
-338
-339
-340
-341 boolean cpeMatches(PropertyType cpeEntry, Identifier identifier) {
-342 if (cpeEntry.matches(identifier.getValue())) {
-343 return true ;
-344 } else if (cpeHasNoVersion(cpeEntry)) {
-345 if (cpeEntry.isCaseSensitive()) {
-346 if (identifier.getValue().startsWith(cpeEntry.getValue())) {
-347 return true ;
-348 }
-349 } else {
-350 final String id = identifier.getValue().toLowerCase();
-351 final String check = cpeEntry.getValue().toLowerCase();
-352 if (id.startsWith(check)) {
-353 return true ;
-354 }
-355 }
-356 }
-357 return false;
-358 }
-359 }
+257 dependency.addSuppressedIdentifier(i);
+258 itr.remove();
+259 break ;
+260 }
+261 }
+262 }
+263 }
+264 if (hasCve() || hasCwe() || hasCvssBelow()) {
+265 final Iterator<Vulnerability> itr = dependency.getVulnerabilities().iterator();
+266 while (itr.hasNext()) {
+267 boolean remove = false;
+268 final Vulnerability v = itr.next();
+269 for (String entry : this .cve) {
+270 if (entry.equalsIgnoreCase(v.getName())) {
+271 remove = true ;
+272 break ;
+273 }
+274 }
+275 if (!remove) {
+276 for (String entry : this .cwe) {
+277 if (v.getCwe() != null ) {
+278 final String toMatch = String.format("CWE-%s " , entry);
+279 final String toTest = v.getCwe().substring(0, toMatch.length()).toUpperCase();
+280 if (toTest.equals(toMatch)) {
+281 remove = true ;
+282 break ;
+283 }
+284 }
+285 }
+286 }
+287 if (!remove) {
+288 for (float cvss : this .cvssBelow) {
+289 if (v.getCvssScore() < cvss) {
+290 remove = true ;
+291 break ;
+292 }
+293 }
+294 }
+295 if (remove) {
+296 dependency.addSuppressedVulnerability(v);
+297 itr.remove();
+298 }
+299 }
+300 }
+301 }
+302
+303
+304
+305
+306
+307
+308
+309 boolean cpeHasNoVersion(PropertyType c) {
+310 if (c.isRegex()) {
+311 return false;
+312 }
+313 if (countCharacter(c.getValue(), ':') == 3) {
+314 return true ;
+315 }
+316 return false;
+317 }
+318
+319
+320
+321
+322
+323
+324
+325
+326 int countCharacter(String str, char c) {
+327 int count = 0;
+328 int pos = str.indexOf(c) + 1;
+329 while (pos > 0) {
+330 count += 1;
+331 pos = str.indexOf(c, pos) + 1;
+332 }
+333 return count;
+334 }
+335
+336
+337
+338
+339
+340
+341
+342
+343 boolean cpeMatches(PropertyType cpeEntry, Identifier identifier) {
+344 if (cpeEntry.matches(identifier.getValue())) {
+345 return true ;
+346 } else if (cpeHasNoVersion(cpeEntry)) {
+347 if (cpeEntry.isCaseSensitive()) {
+348 if (identifier.getValue().startsWith(cpeEntry.getValue())) {
+349 return true ;
+350 }
+351 } else {
+352 final String id = identifier.getValue().toLowerCase();
+353 final String check = cpeEntry.getValue().toLowerCase();
+354 if (id.startsWith(check)) {
+355 return true ;
+356 }
+357 }
+358 }
+359 return false;
+360 }
+361 }
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.suppression
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.suppression
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.suppression
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.suppression
20
21
22 public final class Checksum {
-23
+23
24
-25
+25
26
-27 private Checksum () {
-28 }
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42 public static byte[] getChecksum(String algorithm, File file) throws NoSuchAlgorithmException, IOException {
-43 InputStream fis = null ;
-44 byte[] buffer = new byte[1024];
-45 MessageDigest complete = MessageDigest.getInstance(algorithm);
-46 int numRead;
-47 try {
-48 fis = new FileInputStream(file);
-49 do {
-50 numRead = fis.read(buffer);
-51 if (numRead > 0) {
-52 complete.update(buffer, 0, numRead);
-53 }
-54 } while (numRead != -1);
-55 } finally {
-56 if (fis != null ) {
-57 try {
-58 fis.close();
-59 } catch (IOException ex) {
-60 Logger.getLogger(Checksum.class .getName()).log(Level.FINEST, "Error closing file '" + file.getName() + "'." , ex);
-61 }
-62 }
-63 }
-64 return complete.digest();
-65 }
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75 public static String getMD5Checksum(File file) throws IOException, NoSuchAlgorithmException {
-76 byte[] b = getChecksum("MD5" , file);
-77 return getHex(b);
-78 }
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88 public static String getSHA1Checksum(File file) throws IOException, NoSuchAlgorithmException {
-89 byte[] b = getChecksum("SHA1" , file);
-90 return getHex(b);
-91 }
-92 private static final String HEXES = "0123456789ABCDEF" ;
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103 public static String getHex(byte[] raw) {
-104 if (raw == null ) {
-105 return null ;
-106 }
-107 final StringBuilder hex = new StringBuilder(2 * raw.length);
-108 for (final byte b : raw) {
-109 hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
+27 private static final Logger LOGGER = Logger.getLogger(Checksum.class .getName());
+28
+29
+30
+31 private Checksum () {
+32 }
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46 public static byte[] getChecksum(String algorithm, File file) throws NoSuchAlgorithmException, IOException {
+47 InputStream fis = null ;
+48 byte[] buffer = new byte[1024];
+49 MessageDigest complete = MessageDigest.getInstance(algorithm);
+50 int numRead;
+51 try {
+52 fis = new FileInputStream(file);
+53 do {
+54 numRead = fis.read(buffer);
+55 if (numRead > 0) {
+56 complete.update(buffer, 0, numRead);
+57 }
+58 } while (numRead != -1);
+59 } finally {
+60 if (fis != null ) {
+61 try {
+62 fis.close();
+63 } catch (IOException ex) {
+64 LOGGER.log(Level.FINEST, "Error closing file '" + file.getName() + "'." , ex);
+65 }
+66 }
+67 }
+68 return complete.digest();
+69 }
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79 public static String getMD5Checksum(File file) throws IOException, NoSuchAlgorithmException {
+80 byte[] b = getChecksum("MD5" , file);
+81 return getHex(b);
+82 }
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92 public static String getSHA1Checksum(File file) throws IOException, NoSuchAlgorithmException {
+93 byte[] b = getChecksum("SHA1" , file);
+94 return getHex(b);
+95 }
+96 private static final String HEXES = "0123456789ABCDEF" ;
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107 public static String getHex(byte[] raw) {
+108 if (raw == null ) {
+109 return null ;
110 }
-111 return hex.toString();
-112 }
-113 }
+111 final StringBuilder hex = new StringBuilder(2 * raw.length);
+112 for (final byte b : raw) {
+113 hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
+114 }
+115 return hex.toString();
+116 }
+117 }
23 import java.sql.Statement;
24 import java.util.logging.Level;
25 import java.util.logging.Logger;
-26 import org.owasp.dependencycheck.data.nvdcve.CveDB;
-27 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
-28
-29
-30
-31
-32
-33 public final class DBUtils {
-34
-35
-36
-37
-38 private DBUtils () {
-39 }
-40
-41
-42
-43
-44
-45
-46
-47
-48 public static int getGeneratedKey(PreparedStatement statement) throws DatabaseException {
-49 ResultSet rs = null ;
-50 int id = 0;
-51 try {
-52 rs = statement.getGeneratedKeys();
-53 rs.next();
-54 id = rs.getInt(1);
-55 } catch (SQLException ex) {
-56 throw new DatabaseException ("Unable to get primary key for inserted row" );
-57 } finally {
-58 closeResultSet(rs);
-59 }
-60 return id;
-61 }
-62
-63
-64
-65
-66
-67
-68 public static void closeStatement(Statement statement) {
-69 if (statement != null ) {
-70 try {
-71 statement.close();
-72 } catch (SQLException ex) {
-73 Logger.getLogger(CveDB.class
-74 .getName()).log(Level.FINEST, statement.toString(), ex);
-75 }
-76 }
-77 }
-78
-79
-80
-81
-82
-83
-84 public static void closeResultSet(ResultSet rs) {
-85 if (rs != null ) {
-86 try {
-87 rs.close();
-88 } catch (SQLException ex) {
-89 Logger.getLogger(CveDB.class
-90 .getName()).log(Level.FINEST, rs.toString(), ex);
-91 }
-92 }
-93 }
-94 }
+26 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
+27
+28
+29
+30
+31
+32 public final class DBUtils {
+33
+34
+35
+36
+37 private static final Logger LOGGER = Logger.getLogger(DBUtils.class .getName());
+38
+39
+40
+41
+42 private DBUtils () {
+43 }
+44
+45
+46
+47
+48
+49
+50
+51
+52 public static int getGeneratedKey(PreparedStatement statement) throws DatabaseException {
+53 ResultSet rs = null ;
+54 int id = 0;
+55 try {
+56 rs = statement.getGeneratedKeys();
+57 rs.next();
+58 id = rs.getInt(1);
+59 } catch (SQLException ex) {
+60 throw new DatabaseException ("Unable to get primary key for inserted row" );
+61 } finally {
+62 closeResultSet(rs);
+63 }
+64 return id;
+65 }
+66
+67
+68
+69
+70
+71
+72 public static void closeStatement(Statement statement) {
+73 if (statement != null ) {
+74 try {
+75 statement.close();
+76 } catch (SQLException ex) {
+77 LOGGER.log(Level.FINEST, statement.toString(), ex);
+78 }
+79 }
+80 }
+81
+82
+83
+84
+85
+86
+87 public static void closeResultSet(ResultSet rs) {
+88 if (rs != null ) {
+89 try {
+90 rs.close();
+91 } catch (SQLException ex) {
+92 LOGGER.log(Level.FINEST, rs.toString(), ex);
+93 }
+94 }
+95 }
+96 }
47
48
49
-50
+50
51
52
-53
+53
54
55 public DependencyVersion (String version) {
56 parseVersion(version);
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/utils/Downloader.html b/dependency-check-core/xref/org/owasp/dependencycheck/utils/Downloader.html
index 7589a994d..620d7953f 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/utils/Downloader.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/utils/Downloader.html
@@ -46,157 +46,162 @@
38 public final class Downloader {
39
40
-41
+41
42
-43 private Downloader () {
-44 }
-45
-46
-47
-48
-49
-50
-51
-52
-53 public static void fetchFile(URL url, File outputPath) throws DownloadFailedException {
-54 fetchFile(url, outputPath, true );
-55 }
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65 public static void fetchFile(URL url, File outputPath, boolean useProxy) throws DownloadFailedException {
-66 if ("file" .equalsIgnoreCase(url.getProtocol())) {
-67 File file;
-68 try {
-69 file = new File(url.toURI());
-70 } catch (URISyntaxException ex) {
-71 final String msg = String.format("Download failed, unable to locate '%s'" , url.toString());
-72 throw new DownloadFailedException (msg);
-73 }
-74 if (file.exists()) {
-75 try {
-76 org.apache.commons.io.FileUtils.copyFile(file, outputPath);
-77 } catch (IOException ex) {
-78 final String msg = String.format("Download failed, unable to copy '%s'" , url.toString());
-79 throw new DownloadFailedException (msg);
-80 }
-81 } else {
-82 final String msg = String.format("Download failed, file does not exist '%s'" , url.toString());
-83 throw new DownloadFailedException (msg);
-84 }
-85 } else {
-86 HttpURLConnection conn = null ;
-87 try {
-88 conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
-89 conn.setRequestProperty("Accept-Encoding" , "gzip, deflate" );
-90 conn.connect();
-91 } catch (IOException ex) {
-92 try {
-93 if (conn != null ) {
-94 conn.disconnect();
-95 }
-96 } finally {
-97 conn = null ;
-98 }
-99 throw new DownloadFailedException ("Error downloading file." , ex);
-100 }
-101 final String encoding = conn.getContentEncoding();
-102
-103 BufferedOutputStream writer = null ;
-104 InputStream reader = null ;
-105 try {
-106 if (encoding != null && "gzip" .equalsIgnoreCase(encoding)) {
-107 reader = new GZIPInputStream(conn.getInputStream());
-108 } else if (encoding != null && "deflate" .equalsIgnoreCase(encoding)) {
-109 reader = new InflaterInputStream(conn.getInputStream());
-110 } else {
-111 reader = conn.getInputStream();
-112 }
-113
-114 writer = new BufferedOutputStream(new FileOutputStream(outputPath));
-115 final byte[] buffer = new byte[4096];
-116 int bytesRead;
-117 while ((bytesRead = reader.read(buffer)) > 0) {
-118 writer.write(buffer, 0, bytesRead);
-119 }
-120 } catch (Throwable ex) {
-121 throw new DownloadFailedException ("Error saving downloaded file." , ex);
-122 } finally {
-123 if (writer != null ) {
-124 try {
-125 writer.close();
-126 } catch (Throwable ex) {
-127 Logger.getLogger(Downloader.class .getName()).log(Level.FINEST,
-128 "Error closing the writer in Downloader." , ex);
-129 }
-130 }
-131 if (reader != null ) {
-132 try {
-133 reader.close();
-134 } catch (Throwable ex) {
-135 Logger.getLogger(Downloader.class .getName()).log(Level.FINEST,
-136 "Error closing the reader in Downloader." , ex);
-137 }
-138 }
-139 try {
-140 conn.disconnect();
-141 } finally {
-142 conn = null ;
+43 private static final Logger LOGGER = Logger.getLogger(Downloader.class .getName());
+44
+45
+46
+47
+48 private Downloader () {
+49 }
+50
+51
+52
+53
+54
+55
+56
+57
+58 public static void fetchFile(URL url, File outputPath) throws DownloadFailedException {
+59 fetchFile(url, outputPath, true );
+60 }
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70 public static void fetchFile(URL url, File outputPath, boolean useProxy) throws DownloadFailedException {
+71 if ("file" .equalsIgnoreCase(url.getProtocol())) {
+72 File file;
+73 try {
+74 file = new File(url.toURI());
+75 } catch (URISyntaxException ex) {
+76 final String msg = String.format("Download failed, unable to locate '%s'" , url.toString());
+77 throw new DownloadFailedException (msg);
+78 }
+79 if (file.exists()) {
+80 try {
+81 org.apache.commons.io.FileUtils.copyFile(file, outputPath);
+82 } catch (IOException ex) {
+83 final String msg = String.format("Download failed, unable to copy '%s'" , url.toString());
+84 throw new DownloadFailedException (msg);
+85 }
+86 } else {
+87 final String msg = String.format("Download failed, file does not exist '%s'" , url.toString());
+88 throw new DownloadFailedException (msg);
+89 }
+90 } else {
+91 HttpURLConnection conn = null ;
+92 try {
+93 conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
+94 conn.setRequestProperty("Accept-Encoding" , "gzip, deflate" );
+95 conn.connect();
+96 } catch (IOException ex) {
+97 try {
+98 if (conn != null ) {
+99 conn.disconnect();
+100 }
+101 } finally {
+102 conn = null ;
+103 }
+104 throw new DownloadFailedException ("Error downloading file." , ex);
+105 }
+106 final String encoding = conn.getContentEncoding();
+107
+108 BufferedOutputStream writer = null ;
+109 InputStream reader = null ;
+110 try {
+111 if (encoding != null && "gzip" .equalsIgnoreCase(encoding)) {
+112 reader = new GZIPInputStream(conn.getInputStream());
+113 } else if (encoding != null && "deflate" .equalsIgnoreCase(encoding)) {
+114 reader = new InflaterInputStream(conn.getInputStream());
+115 } else {
+116 reader = conn.getInputStream();
+117 }
+118
+119 writer = new BufferedOutputStream(new FileOutputStream(outputPath));
+120 final byte[] buffer = new byte[4096];
+121 int bytesRead;
+122 while ((bytesRead = reader.read(buffer)) > 0) {
+123 writer.write(buffer, 0, bytesRead);
+124 }
+125 } catch (Throwable ex) {
+126 throw new DownloadFailedException ("Error saving downloaded file." , ex);
+127 } finally {
+128 if (writer != null ) {
+129 try {
+130 writer.close();
+131 } catch (Throwable ex) {
+132 LOGGER.log(Level.FINEST,
+133 "Error closing the writer in Downloader." , ex);
+134 }
+135 }
+136 if (reader != null ) {
+137 try {
+138 reader.close();
+139 } catch (Throwable ex) {
+140 LOGGER.log(Level.FINEST,
+141 "Error closing the reader in Downloader." , ex);
+142 }
143 }
-144 }
-145 }
-146 }
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156 public static long getLastModified(URL url) throws DownloadFailedException {
-157 long timestamp = 0;
-158
-159 if ("file" .equalsIgnoreCase(url.getProtocol())) {
-160 File lastModifiedFile;
-161 try {
-162 lastModifiedFile = new File(url.toURI());
-163 } catch (URISyntaxException ex) {
-164 final String msg = String.format("Unable to locate '%s'; is the cve.url-2.0.modified property set correctly?" , url.toString());
-165 throw new DownloadFailedException (msg);
-166 }
-167 timestamp = lastModifiedFile.lastModified();
-168 } else {
-169 HttpURLConnection conn = null ;
-170 try {
-171 conn = URLConnectionFactory.createHttpURLConnection(url);
-172 conn.setRequestMethod("HEAD" );
-173 conn.connect();
-174 timestamp = conn.getLastModified();
-175 } catch (URLConnectionFailureException ex) {
-176 throw new DownloadFailedException ("Error creating URL Connection for HTTP HEAD request." , ex);
-177 } catch (IOException ex) {
-178 throw new DownloadFailedException ("Error making HTTP HEAD request." , ex);
-179 } finally {
-180 if (conn != null ) {
-181 try {
-182 conn.disconnect();
-183 } finally {
-184 conn = null ;
-185 }
-186 }
-187 }
-188 }
-189 return timestamp;
-190 }
-191 }
+144 try {
+145 conn.disconnect();
+146 } finally {
+147 conn = null ;
+148 }
+149 }
+150 }
+151 }
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161 public static long getLastModified(URL url) throws DownloadFailedException {
+162 long timestamp = 0;
+163
+164 if ("file" .equalsIgnoreCase(url.getProtocol())) {
+165 File lastModifiedFile;
+166 try {
+167 lastModifiedFile = new File(url.toURI());
+168 } catch (URISyntaxException ex) {
+169 final String msg = String.format("Unable to locate '%s'; is the cve.url-2.0.modified property set correctly?" , url.toString());
+170 throw new DownloadFailedException (msg);
+171 }
+172 timestamp = lastModifiedFile.lastModified();
+173 } else {
+174 HttpURLConnection conn = null ;
+175 try {
+176 conn = URLConnectionFactory.createHttpURLConnection(url);
+177 conn.setRequestMethod("HEAD" );
+178 conn.connect();
+179 timestamp = conn.getLastModified();
+180 } catch (URLConnectionFailureException ex) {
+181 throw new DownloadFailedException ("Error creating URL Connection for HTTP HEAD request." , ex);
+182 } catch (IOException ex) {
+183 throw new DownloadFailedException ("Error making HTTP HEAD request." , ex);
+184 } finally {
+185 if (conn != null ) {
+186 try {
+187 conn.disconnect();
+188 } finally {
+189 conn = null ;
+190 }
+191 }
+192 }
+193 }
+194 return timestamp;
+195 }
+196 }
41 public final class FileUtils {
42
43
-44
+44
45
-46 private static final String BIT_BUCKET_UNIX = "/dev/null" ;
-47
-48
-49
-50
-51 private static final String BIT_BUCKET_WIN = "NUL" ;
-52
-53
-54
-55
-56 private static final int BUFFER_SIZE = 4096;
-57
-58
-59
-60
-61 private FileUtils () {
-62 }
-63
-64
-65
-66
-67
-68
-69
-70 public static String getFileExtension(String fileName) {
-71 String ret = null ;
-72 final int pos = fileName.lastIndexOf("." );
-73 if (pos >= 0) {
-74 ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();
-75 }
-76 return ret;
-77 }
-78
-79
-80
-81
-82
-83
-84
-85 public static boolean delete(File file) {
-86 boolean success = true ;
-87 if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {
-88 success = false;
-89 final String msg = String.format("Failed to delete file: %s; attempting to delete on exit." , file.getPath());
-90 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, msg);
-91 file.deleteOnExit();
-92 }
-93 return success;
-94 }
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104 public static File getTempFile(String prefix, String extension) throws IOException {
-105 final File dir = Settings.getTempDirectory();
-106 if (!dir.exists()) {
-107 if (!dir.mkdirs()) {
-108 throw new IOException("Unable to create temporary folder" );
-109 }
-110 }
-111 final String tempFileName = String.format("%s%s.%s" , prefix, UUID.randomUUID().toString(), extension);
-112 final File tempFile = new File(dir, tempFileName);
-113 if (tempFile.exists()) {
-114 return getTempFile(prefix, extension);
-115 }
-116 return tempFile;
-117 }
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131 @java.lang.Deprecated
-132 public static File getDataDirectory(String configuredFilePath, Class clazz) throws IOException {
-133 final File file = new File(configuredFilePath);
-134 if (file.isDirectory() && file.canWrite()) {
-135 return new File(file.getCanonicalPath());
-136 } else {
-137 final File exePath = getPathToJar(clazz);
-138 return new File(exePath, configuredFilePath);
-139 }
-140 }
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151 @java.lang.Deprecated
-152 public static File getPathToJar(Class clazz) throws UnsupportedEncodingException {
-153 final String filePath = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
-154 final String decodedPath = URLDecoder.decode(filePath, "UTF-8" );
-155 final File jarPath = new File(decodedPath);
-156 return jarPath.getParentFile();
-157 }
-158
-159
-160
-161
-162
-163
-164
-165
-166 public static void extractFiles(File archive, File extractTo) throws ExtractionException {
-167 extractFiles(archive, extractTo, null );
-168 }
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180 public static void extractFiles(File archive, File extractTo, Engine engine) throws ExtractionException {
-181 if (archive == null || extractTo == null ) {
-182 return ;
-183 }
-184
-185 FileInputStream fis = null ;
-186 ZipInputStream zis = null ;
-187
-188 try {
-189 fis = new FileInputStream(archive);
-190 } catch (FileNotFoundException ex) {
-191 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
-192 throw new ExtractionException ("Archive file was not found." , ex);
-193 }
-194 zis = new ZipInputStream(new BufferedInputStream(fis));
-195 ZipEntry entry;
-196 try {
-197 while ((entry = zis.getNextEntry()) != null ) {
-198 if (entry.isDirectory()) {
-199 final File d = new File(extractTo, entry.getName());
-200 if (!d.exists() && !d.mkdirs()) {
-201 final String msg = String.format("Unable to create '%s'." , d.getAbsolutePath());
-202 throw new ExtractionException (msg);
-203 }
-204 } else {
-205 final File file = new File(extractTo, entry.getName());
-206 final String ext = getFileExtension(file.getName());
-207 if (engine == null || engine.supportsExtension(ext)) {
-208 BufferedOutputStream bos = null ;
-209 FileOutputStream fos;
-210 try {
-211 fos = new FileOutputStream(file);
-212 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
-213 int count;
-214 final byte data[] = new byte[BUFFER_SIZE];
-215 while ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {
-216 bos.write(data, 0, count);
-217 }
-218 bos.flush();
-219 } catch (FileNotFoundException ex) {
-220 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
-221 final String msg = String.format("Unable to find file '%s'." , file.getName());
-222 throw new ExtractionException (msg, ex);
-223 } catch (IOException ex) {
-224 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
-225 final String msg = String.format("IO Exception while parsing file '%s'." , file.getName());
-226 throw new ExtractionException (msg, ex);
-227 } finally {
-228 if (bos != null ) {
-229 try {
-230 bos.close();
-231 } catch (IOException ex) {
-232 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
-233 }
-234 }
-235 }
-236 }
-237 }
-238 }
-239 } catch (IOException ex) {
-240 final String msg = String.format("Exception reading archive '%s'." , archive.getName());
-241 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, msg, ex);
-242 throw new ExtractionException (msg, ex);
-243 } finally {
-244 try {
-245 zis.close();
-246 } catch (IOException ex) {
-247 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
-248 }
-249 }
-250 }
-251
-252
-253
-254
-255
-256
-257 public static String getBitBucket() {
-258 if (System.getProperty("os.name" ).startsWith("Windows" )) {
-259 return BIT_BUCKET_WIN;
-260 } else {
-261 return BIT_BUCKET_UNIX;
-262 }
-263 }
-264 }
+46 private static final Logger LOGGER = Logger.getLogger(FileUtils.class .getName());
+47
+48
+49
+50 private static final String BIT_BUCKET_UNIX = "/dev/null" ;
+51
+52
+53
+54
+55 private static final String BIT_BUCKET_WIN = "NUL" ;
+56
+57
+58
+59
+60 private static final int BUFFER_SIZE = 4096;
+61
+62
+63
+64
+65 private FileUtils () {
+66 }
+67
+68
+69
+70
+71
+72
+73
+74 public static String getFileExtension(String fileName) {
+75 String ret = null ;
+76 final int pos = fileName.lastIndexOf("." );
+77 if (pos >= 0) {
+78 ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();
+79 }
+80 return ret;
+81 }
+82
+83
+84
+85
+86
+87
+88
+89 public static boolean delete(File file) {
+90 boolean success = true ;
+91 if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {
+92 success = false;
+93 final String msg = String.format("Failed to delete file: %s; attempting to delete on exit." , file.getPath());
+94 LOGGER.log(Level.FINE, msg);
+95 file.deleteOnExit();
+96 }
+97 return success;
+98 }
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108 public static File getTempFile(String prefix, String extension) throws IOException {
+109 final File dir = Settings.getTempDirectory();
+110 final String tempFileName = String.format("%s%s.%s" , prefix, UUID.randomUUID().toString(), extension);
+111 final File tempFile = new File(dir, tempFileName);
+112 if (tempFile.exists()) {
+113 return getTempFile(prefix, extension);
+114 }
+115 return tempFile;
+116 }
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130 @java.lang.Deprecated
+131 public static File getDataDirectory(String configuredFilePath, Class clazz) throws IOException {
+132 final File file = new File(configuredFilePath);
+133 if (file.isDirectory() && file.canWrite()) {
+134 return new File(file.getCanonicalPath());
+135 } else {
+136 final File exePath = getPathToJar(clazz);
+137 return new File(exePath, configuredFilePath);
+138 }
+139 }
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150 @java.lang.Deprecated
+151 public static File getPathToJar(Class clazz) throws UnsupportedEncodingException {
+152 final String filePath = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
+153 final String decodedPath = URLDecoder.decode(filePath, "UTF-8" );
+154 final File jarPath = new File(decodedPath);
+155 return jarPath.getParentFile();
+156 }
+157
+158
+159
+160
+161
+162
+163
+164
+165 public static void extractFiles(File archive, File extractTo) throws ExtractionException {
+166 extractFiles(archive, extractTo, null );
+167 }
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179 public static void extractFiles(File archive, File extractTo, Engine engine) throws ExtractionException {
+180 if (archive == null || extractTo == null ) {
+181 return ;
+182 }
+183
+184 FileInputStream fis = null ;
+185 ZipInputStream zis = null ;
+186
+187 try {
+188 fis = new FileInputStream(archive);
+189 } catch (FileNotFoundException ex) {
+190 LOGGER.log(Level.FINE, null , ex);
+191 throw new ExtractionException ("Archive file was not found." , ex);
+192 }
+193 zis = new ZipInputStream(new BufferedInputStream(fis));
+194 ZipEntry entry;
+195 try {
+196 while ((entry = zis.getNextEntry()) != null ) {
+197 if (entry.isDirectory()) {
+198 final File d = new File(extractTo, entry.getName());
+199 if (!d.exists() && !d.mkdirs()) {
+200 final String msg = String.format("Unable to create '%s'." , d.getAbsolutePath());
+201 throw new ExtractionException (msg);
+202 }
+203 } else {
+204 final File file = new File(extractTo, entry.getName());
+205 final String ext = getFileExtension(file.getName());
+206 if (engine == null || engine.supportsExtension(ext)) {
+207 BufferedOutputStream bos = null ;
+208 FileOutputStream fos;
+209 try {
+210 fos = new FileOutputStream(file);
+211 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
+212 int count;
+213 final byte data[] = new byte[BUFFER_SIZE];
+214 while ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {
+215 bos.write(data, 0, count);
+216 }
+217 bos.flush();
+218 } catch (FileNotFoundException ex) {
+219 LOGGER.log(Level.FINE, null , ex);
+220 final String msg = String.format("Unable to find file '%s'." , file.getName());
+221 throw new ExtractionException (msg, ex);
+222 } catch (IOException ex) {
+223 LOGGER.log(Level.FINE, null , ex);
+224 final String msg = String.format("IO Exception while parsing file '%s'." , file.getName());
+225 throw new ExtractionException (msg, ex);
+226 } finally {
+227 if (bos != null ) {
+228 try {
+229 bos.close();
+230 } catch (IOException ex) {
+231 LOGGER.log(Level.FINEST, null , ex);
+232 }
+233 }
+234 }
+235 }
+236 }
+237 }
+238 } catch (IOException ex) {
+239 final String msg = String.format("Exception reading archive '%s'." , archive.getName());
+240 LOGGER.log(Level.FINE, msg, ex);
+241 throw new ExtractionException (msg, ex);
+242 } finally {
+243 try {
+244 zis.close();
+245 } catch (IOException ex) {
+246 LOGGER.log(Level.FINEST, null , ex);
+247 }
+248 }
+249 }
+250
+251
+252
+253
+254
+255
+256 public static String getBitBucket() {
+257 if (System.getProperty("os.name" ).startsWith("Windows" )) {
+258 return BIT_BUCKET_WIN;
+259 } else {
+260 return BIT_BUCKET_UNIX;
+261 }
+262 }
+263 }
33 public final class LogUtils {
34
35
-36
+36
37
-38 private LogUtils () {
-39 }
-40
-41
-42
-43
-44
-45
-46
-47 public static void prepareLogger(InputStream in, String verboseLogFile) {
-48 try {
-49 LogManager.getLogManager().reset();
-50 LogManager.getLogManager().readConfiguration(in);
-51 if (verboseLogFile != null && !verboseLogFile.isEmpty()) {
-52 verboseLoggingEnabled = true ;
-53 final Logger logger = Logger.getLogger("" );
-54 final FileHandler handler = new FileHandler(verboseLogFile, true );
-55 handler.setFormatter(new SimpleFormatter());
-56 handler.setLevel(Level.FINE);
-57 handler.setFilter(new LogFilter ());
-58 logger.addHandler(handler);
-59 logger.setLevel(Level.FINE);
-60 }
-61 } catch (IOException ex) {
-62 Logger.getLogger(LogUtils.class .getName()).log(Level.FINE, "IO Error preparing the logger" , ex);
-63 } catch (SecurityException ex) {
-64 Logger.getLogger(LogUtils.class .getName()).log(Level.FINE, "Error preparing the logger" , ex);
-65 } finally {
-66 if (in != null ) {
-67 try {
-68 in.close();
-69 } catch (Throwable ex) {
-70 Logger.getLogger(LogUtils.class .getName()).log(Level.FINEST, "Error closing resource stream" , ex);
-71 }
-72 }
-73 }
-74 }
-75
-76
-77
-78 private static boolean verboseLoggingEnabled = false;
-79
+38 private static final Logger LOGGER = Logger.getLogger(LogUtils.class .getName());
+39
+40
+41
+42
+43 private LogUtils () {
+44 }
+45
+46
+47
+48
+49
+50
+51
+52 public static void prepareLogger(InputStream in, String verboseLogFile) {
+53 try {
+54 LogManager.getLogManager().reset();
+55 LogManager.getLogManager().readConfiguration(in);
+56 if (verboseLogFile != null && !verboseLogFile.isEmpty()) {
+57 verboseLoggingEnabled = true ;
+58 final Logger logger = Logger.getLogger("" );
+59 final FileHandler handler = new FileHandler(verboseLogFile, true );
+60 handler.setFormatter(new SimpleFormatter());
+61 handler.setLevel(Level.FINE);
+62 handler.setFilter(new LogFilter ());
+63 logger.addHandler(handler);
+64 logger.setLevel(Level.FINE);
+65 }
+66 } catch (IOException ex) {
+67 LOGGER.log(Level.FINE, "IO Error preparing the logger" , ex);
+68 } catch (SecurityException ex) {
+69 LOGGER.log(Level.FINE, "Error preparing the logger" , ex);
+70 } finally {
+71 if (in != null ) {
+72 try {
+73 in.close();
+74 } catch (Throwable ex) {
+75 LOGGER.log(Level.FINEST, "Error closing resource stream" , ex);
+76 }
+77 }
+78 }
+79 }
80
-81
-82
-83
-84
-85 public static boolean isVerboseLoggingEnabled() {
-86 return verboseLoggingEnabled;
-87 }
-88 }
+81
+82
+83 private static boolean verboseLoggingEnabled = false;
+84
+85
+86
+87
+88
+89
+90 public static boolean isVerboseLoggingEnabled() {
+91 return verboseLoggingEnabled;
+92 }
+93 }
38
39 public final class Settings {
40
-41
-42
-43
-44 private static final Logger LOGGER = Logger.getLogger(Settings.class .getName());
-45
-46
-47
-48
-49 public static final class KEYS {
-50
-51
-52
-53
-54 private KEYS () {
-55
-56 }
+41
+42
+43
+44
+45 public static final class KEYS {
+46
+47
+48
+49
+50 private KEYS () {
+51
+52 }
+53
+54
+55
+56 public static final String AUTO_UPDATE = "autoupdate" ;
57
-58
+58
59
-60 public static final String AUTO_UPDATE = "autoupdate" ;
+60 public static final String DB_DRIVER_NAME = "data.driver_name" ;
61
62
63
-64 public static final String DB_DRIVER_NAME = "data.driver_name" ;
+64 public static final String DB_DRIVER_PATH = "data.driver_path" ;
65
-66
+66
67
-68 public static final String DB_DRIVER_PATH = "data.driver_path" ;
+68 public static final String DB_CONNECTION_STRING = "data.connection_string" ;
69
-70
+70
71
-72 public static final String DB_CONNECTION_STRING = "data.connection_string" ;
+72 public static final String DB_USER = "data.user" ;
73
-74
+74
75
-76 public static final String DB_USER = "data.user" ;
+76 public static final String DB_PASSWORD = "data.password" ;
77
-78
+78
79
-80 public static final String DB_PASSWORD = "data.password" ;
+80 public static final String DATA_DIRECTORY = "data.directory" ;
81
-82
+82
83
-84 public static final String DATA_DIRECTORY = "data.directory" ;
+84 public static final String CVE_META_URL = "cve.url.meta" ;
85
-86
-87
-88 public static final String CVE_META_URL = "cve.url.meta" ;
-89
-90
-91
-92
-93 public static final String CVE_MODIFIED_20_URL = "cve.url-2.0.modified" ;
-94
-95
-96
+86
+87
+88
+89 public static final String CVE_MODIFIED_20_URL = "cve.url-2.0.modified" ;
+90
+91
+92
+93
+94 public static final String CVE_MODIFIED_12_URL = "cve.url-1.2.modified" ;
+95
+96
97
-98 public static final String CVE_MODIFIED_12_URL = "cve.url-1.2.modified" ;
+98 public static final String CVE_MODIFIED_VALID_FOR_DAYS = "cve.url.modified.validfordays" ;
99
-100
-101
-102 public static final String CVE_MODIFIED_VALID_FOR_DAYS = "cve.url.modified.validfordays" ;
-103
-104
-105
+100
+101
+102
+103 public static final String CVE_START_YEAR = "cve.startyear" ;
+104
+105
106
-107 public static final String CVE_START_YEAR = "cve.startyear" ;
+107 public static final String CVE_SCHEMA_1_2 = "cve.url-1.2.base" ;
108
-109
+109
110
-111 public static final String CVE_SCHEMA_1_2 = "cve.url-1.2.base" ;
+111 public static final String CVE_SCHEMA_2_0 = "cve.url-2.0.base" ;
112
-113
+113
114
-115 public static final String CVE_SCHEMA_2_0 = "cve.url-2.0.base" ;
+115 public static final String PROXY_URL = "proxy.url" ;
116
-117
+117
118
-119 public static final String PROXY_URL = "proxy.url" ;
+119 public static final String PROXY_PORT = "proxy.port" ;
120
-121
+121
122
-123 public static final String PROXY_PORT = "proxy.port" ;
+123 public static final String PROXY_USERNAME = "proxy.username" ;
124
-125
+125
126
-127 public static final String PROXY_USERNAME = "proxy.username" ;
+127 public static final String PROXY_PASSWORD = "proxy.password" ;
128
-129
+129
130
-131 public static final String PROXY_PASSWORD = "proxy.password" ;
+131 public static final String CONNECTION_TIMEOUT = "connection.timeout" ;
132
-133
+133
134
-135 public static final String CONNECTION_TIMEOUT = "connection.timeout" ;
+135 public static final String TEMP_DIRECTORY = "temp.directory" ;
136
-137
+137
138
-139 public static final String TEMP_DIRECTORY = "temp.directory" ;
+139 public static final String MAX_DOWNLOAD_THREAD_POOL_SIZE = "max.download.threads" ;
140
-141
+141
142
-143 public static final String MAX_DOWNLOAD_THREAD_POOL_SIZE = "max.download.threads" ;
+143 public static final String SUPPRESSION_FILE = "suppression.file" ;
144
-145
+145
146
-147 public static final String SUPPRESSION_FILE = "suppression.file" ;
+147 public static final String ANALYZER_JAR_ENABLED = "analyzer.jar.enabled" ;
148
-149
+149
150
-151 public static final String ANALYZER_JAR_ENABLED = "analyzer.jar.enabled" ;
+151 public static final String ANALYZER_ARCHIVE_ENABLED = "analyzer.archive.enabled" ;
152
-153
+153
154
-155 public static final String ANALYZER_ARCHIVE_ENABLED = "analyzer.archive.enabled" ;
+155 public static final String ANALYZER_ASSEMBLY_ENABLED = "analyzer.assembly.enabled" ;
156
-157
+157
158
-159 public static final String ANALYZER_ASSEMBLY_ENABLED = "analyzer.assembly.enabled" ;
+159 public static final String ANALYZER_NUSPEC_ENABLED = "analyzer.nuspec.enabled" ;
160
-161
+161
162
-163 public static final String ANALYZER_NUSPEC_ENABLED = "analyzer.nuspec.enabled" ;
+163 public static final String ANALYZER_JAVASCRIPT_ENABLED = "analyzer.javascript.enabled" ;
164
-165
+165
166
-167 public static final String ANALYZER_JAVASCRIPT_ENABLED = "analyzer.javascript.enabled" ;
+167 public static final String ANALYZER_NEXUS_ENABLED = "analyzer.nexus.enabled" ;
168
-169
+169
170
-171 public static final String ANALYZER_NEXUS_ENABLED = "analyzer.nexus.enabled" ;
+171 public static final String ANALYZER_NEXUS_URL = "analyzer.nexus.url" ;
172
-173
+173
174
-175 public static final String ANALYZER_NEXUS_URL = "analyzer.nexus.url" ;
+175 public static final String ANALYZER_NEXUS_PROXY = "analyzer.nexus.proxy" ;
176
-177
+177
178
-179 public static final String ANALYZER_NEXUS_PROXY = "analyzer.nexus.proxy" ;
+179 public static final String ANALYZER_ASSEMBLY_MONO_PATH = "analyzer.assembly.mono.path" ;
180
-181
+181
182
-183 public static final String ANALYZER_ASSEMBLY_MONO_PATH = "analyzer.assembly.mono.path" ;
+183 public static final String ADDITIONAL_ZIP_EXTENSIONS = "extensions.zip" ;
184
-185
+185
186
-187 public static final String ADDITIONAL_ZIP_EXTENSIONS = "extensions.zip" ;
+187 public static final String SKIP_TEST_SCOPE = "skip.test.scope" ;
188
-189
+189
190
-191 public static final String SKIP_TEST_SCOPE = "skip.test.scope" ;
+191 public static final String SKIP_RUNTIME_SCOPE = "skip.runtime.scope" ;
192
-193
+193
194
-195 public static final String SKIP_RUNTIME_SCOPE = "skip.runtime.scope" ;
-196
-197
-198
-199 public static final String SKIP_PROVIDED_SCOPE = "skip.provided.scope" ;
-200 }
-201
-202
-203
-204 private static final String PROPERTIES_FILE = "dependencycheck.properties" ;
-205
-206
-207
-208 private static final Settings INSTANCE = new Settings ();
-209
-210
-211
-212 private Properties props = null ;
-213
-214
-215
-216
-217 private Settings () {
-218 InputStream in = null ;
-219 props = new Properties();
-220 try {
-221 in = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
-222 props.load(in);
-223 } catch (IOException ex) {
-224 Logger.getLogger(Settings.class .getName()).log(Level.SEVERE, "Unable to load default settings." );
-225 Logger.getLogger(Settings.class .getName()).log(Level.FINE, null , ex);
-226 } finally {
-227 if (in != null ) {
-228 try {
-229 in.close();
-230 } catch (IOException ex) {
-231 Logger.getLogger(Settings.class .getName()).log(Level.FINEST, null , ex);
-232 }
-233 }
-234 }
-235 logProperties("Properties loaded" , props);
-236 }
-237
-238
-239
-240
-241
-242
+195 public static final String SKIP_PROVIDED_SCOPE = "skip.provided.scope" ;
+196 }
+197
+198
+199
+200
+201
+202 private static final Logger LOGGER = Logger.getLogger(Settings.class .getName());
+203
+204
+205
+206 private static final String PROPERTIES_FILE = "dependencycheck.properties" ;
+207
+208
+209
+210 private static ThreadLocal<Settings> localSettings = new ThreadLocal();
+211
+212
+213
+214 private Properties props = null ;
+215
+216
+217
+218
+219 private Settings () {
+220 InputStream in = null ;
+221 props = new Properties();
+222 try {
+223 in = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
+224 props.load(in);
+225 } catch (IOException ex) {
+226 LOGGER.log(Level.SEVERE, "Unable to load default settings." );
+227 LOGGER.log(Level.FINE, null , ex);
+228 } finally {
+229 if (in != null ) {
+230 try {
+231 in.close();
+232 } catch (IOException ex) {
+233 LOGGER.log(Level.FINEST, null , ex);
+234 }
+235 }
+236 }
+237 logProperties("Properties loaded" , props);
+238 }
+239
+240
+241
+242
243
-244 private static void logProperties(String header, Properties properties) {
-245 if (LOGGER.isLoggable(Level.FINE)) {
-246 final StringWriter sw = new StringWriter();
-247 PrintWriter pw = null ;
-248 try {
-249 pw = new PrintWriter(sw);
-250 pw.format("%s:%n%n" , header);
-251 final Enumeration e = properties.propertyNames();
-252 while (e.hasMoreElements()) {
-253 final String key = (String) e.nextElement();
-254 if (key.contains("password" )) {
-255 pw.format("%s='*****'%n" , key);
-256 } else {
-257 final String value = properties.getProperty(key);
-258 if (value != null ) {
-259 pw.format("%s='%s'%n" , key, value);
-260 }
-261 }
-262 }
-263 pw.flush();
-264 LOGGER.fine(sw.toString());
-265 } finally {
-266 if (pw != null ) {
-267 pw.close();
-268 }
-269 }
+244 public static void initialize() {
+245 localSettings.set(new Settings ());
+246 }
+247
+248
+249
+250
+251 public static void cleanup() {
+252 if (tempDirectory != null && tempDirectory.exists()) {
+253 FileUtils.delete(tempDirectory);
+254 }
+255 try {
+256 localSettings.remove();
+257 } catch (Throwable ex) {
+258 LOGGER.log(Level.FINE, "Error cleaning up Settings" , ex);
+259 }
+260 }
+261
+262
+263
+264
+265
+266
+267 public static Settings getInstance() {
+268 return localSettings.get();
+269 }
270
-271 }
-272 }
-273
-274
-275
-276
-277
-278
-279
-280 public static void setString(String key, String value) {
-281 INSTANCE.props.setProperty(key, value);
-282 if (LOGGER.isLoggable(Level.FINE)) {
-283 LOGGER.fine(String.format("Setting: %s='%s'" , key, value));
-284 }
-285 }
-286
-287
-288
-289
-290
-291
-292
-293 public static void setBoolean(String key, boolean value) {
-294 if (value) {
-295 INSTANCE.props.setProperty(key, Boolean.TRUE.toString());
-296 } else {
-297 INSTANCE.props.setProperty(key, Boolean.FALSE.toString());
-298 }
-299 if (LOGGER.isLoggable(Level.FINE)) {
-300 LOGGER.fine(String.format("Setting: %s='%b'" , key, value));
-301 }
-302 }
-303
-304
-305
-306
-307
-308
-309
-310
-311
-312
-313 public static void mergeProperties(File filePath) throws FileNotFoundException, IOException {
-314 final FileInputStream fis = new FileInputStream(filePath);
-315 mergeProperties(fis);
-316 }
-317
-318
-319
-320
-321
-322
-323
-324
-325
-326
-327 public static void mergeProperties(String filePath) throws FileNotFoundException, IOException {
-328 final FileInputStream fis = new FileInputStream(filePath);
-329 mergeProperties(fis);
-330 }
-331
-332
-333
-334
-335
-336
-337
-338
-339
-340 public static void mergeProperties(InputStream stream) throws IOException {
-341 INSTANCE.props.load(stream);
-342 logProperties("Properties updated via merge" , INSTANCE.props);
-343 }
-344
-345
-346
-347
-348
-349
-350
-351
-352
-353 public static File getFile(String key) {
-354 final String file = getString(key);
-355 if (file == null ) {
-356 return null ;
-357 }
-358 return new File(file);
-359 }
-360
-361
-362
-363
-364
-365
-366
-367
-368
-369
-370
-371
-372
-373 public static File getDataFile(String key) {
-374 final String file = getString(key);
-375 Logger.getLogger(Settings.class .getName()).log(Level.FINE, String.format("Settings.getDataFile() - file: '%s'" , file));
-376 if (file == null ) {
-377 return null ;
-378 }
-379 if (file.startsWith("[JAR]" )) {
-380 Logger.getLogger(Settings.class .getName()).log(Level.FINE, "Settings.getDataFile() - transforming filename" );
-381 final File jarPath = getJarPath();
-382 Logger.getLogger(Settings.class .getName()).log(Level.FINE, String.format("Settings.getDataFile() - jar file: '%s'" , jarPath.toString()));
-383 final File retVal = new File(jarPath, file.substring(6));
-384 Logger.getLogger(Settings.class .getName()).log(Level.FINE, String.format("Settings.getDataFile() - returning: '%s'" , retVal.toString()));
-385 return retVal;
-386 }
-387 return new File(file);
-388 }
-389
-390
-391
-392
-393
+271
+272
+273
+274
+275
+276 public static void setInstance(Settings instance) {
+277 localSettings.set(instance);
+278 }
+279
+280
+281
+282
+283
+284
+285
+286 private static void logProperties(String header, Properties properties) {
+287 if (LOGGER.isLoggable(Level.FINE)) {
+288 final StringWriter sw = new StringWriter();
+289 PrintWriter pw = null ;
+290 try {
+291 pw = new PrintWriter(sw);
+292 pw.format("%s:%n%n" , header);
+293 final Enumeration e = properties.propertyNames();
+294 while (e.hasMoreElements()) {
+295 final String key = (String) e.nextElement();
+296 if (key.contains("password" )) {
+297 pw.format("%s='*****'%n" , key);
+298 } else {
+299 final String value = properties.getProperty(key);
+300 if (value != null ) {
+301 pw.format("%s='%s'%n" , key, value);
+302 }
+303 }
+304 }
+305 pw.flush();
+306 LOGGER.fine(sw.toString());
+307 } finally {
+308 if (pw != null ) {
+309 pw.close();
+310 }
+311 }
+312
+313 }
+314 }
+315
+316
+317
+318
+319
+320
+321
+322 public static void setString(String key, String value) {
+323 localSettings.get().props.setProperty(key, value);
+324 if (LOGGER.isLoggable(Level.FINE)) {
+325 LOGGER.fine(String.format("Setting: %s='%s'" , key, value));
+326 }
+327 }
+328
+329
+330
+331
+332
+333
+334
+335 public static void setBoolean(String key, boolean value) {
+336 if (value) {
+337 localSettings.get().props.setProperty(key, Boolean.TRUE.toString());
+338 } else {
+339 localSettings.get().props.setProperty(key, Boolean.FALSE.toString());
+340 }
+341 if (LOGGER.isLoggable(Level.FINE)) {
+342 LOGGER.fine(String.format("Setting: %s='%b'" , key, value));
+343 }
+344 }
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355 public static void mergeProperties(File filePath) throws FileNotFoundException, IOException {
+356 final FileInputStream fis = new FileInputStream(filePath);
+357 mergeProperties(fis);
+358 }
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369 public static void mergeProperties(String filePath) throws FileNotFoundException, IOException {
+370 final FileInputStream fis = new FileInputStream(filePath);
+371 mergeProperties(fis);
+372 }
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382 public static void mergeProperties(InputStream stream) throws IOException {
+383 localSettings.get().props.load(stream);
+384 logProperties("Properties updated via merge" , localSettings.get().props);
+385 }
+386
+387
+388
+389
+390
+391
+392
+393
394
-395 private static File getJarPath() {
-396 final String jarPath = Settings.class .getProtectionDomain().getCodeSource().getLocation().getPath();
-397 String decodedPath = "." ;
-398 try {
-399 decodedPath = URLDecoder.decode(jarPath, "UTF-8" );
-400 } catch (UnsupportedEncodingException ex) {
-401 Logger.getLogger(Settings.class .getName()).log(Level.FINEST, null , ex);
-402 }
-403
-404 final File path = new File(decodedPath);
-405 if (path.getName().toLowerCase().endsWith(".jar" )) {
-406 return path.getParentFile();
-407 } else {
-408 return new File("." );
-409 }
-410 }
-411
-412
-413
-414
-415
-416
-417
-418
-419
-420
-421 public static String getString(String key, String defaultValue) {
-422 final String str = System.getProperty(key, INSTANCE.props.getProperty(key, defaultValue));
-423 return str;
-424 }
-425
-426
-427
-428
-429
-430
-431 public static File getTempDirectory() {
-432 return new File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir" )));
-433 }
-434
-435
-436
-437
-438
-439
-440
-441
-442
-443 public static String getString(String key) {
-444 return System.getProperty(key, INSTANCE.props.getProperty(key));
-445 }
-446
-447
-448
-449
-450
-451
-452 public static void removeProperty(String key) {
-453 INSTANCE.props.remove(key);
-454 }
-455
-456
-457
-458
-459
-460
-461
-462
-463
-464
-465 public static int getInt(String key) throws InvalidSettingException {
-466 int value;
-467 try {
-468 value = Integer.parseInt(Settings.getString(key));
-469 } catch (NumberFormatException ex) {
-470 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
-471 }
-472 return value;
-473 }
-474
-475
-476
-477
-478
-479
-480
-481
-482
-483
-484
-485 public static int getInt(String key, int defaultValue) {
-486 int value;
-487 try {
-488 value = Integer.parseInt(Settings.getString(key));
-489 } catch (NumberFormatException ex) {
-490 final String msg = String.format("Could not convert property '%s' to an int." , key);
-491 Logger.getLogger(Settings.class .getName()).log(Level.FINEST, msg, ex);
-492 value = defaultValue;
-493 }
-494 return value;
-495 }
-496
-497
-498
-499
-500
-501
-502
-503
-504
-505
-506 public static long getLong(String key) throws InvalidSettingException {
-507 long value;
-508 try {
-509 value = Long.parseLong(Settings.getString(key));
-510 } catch (NumberFormatException ex) {
-511 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
-512 }
-513 return value;
-514 }
-515
-516
-517
-518
-519
-520
-521
-522
-523
-524
-525 public static boolean getBoolean(String key) throws InvalidSettingException {
-526 boolean value;
-527 try {
-528 value = Boolean.parseBoolean(Settings.getString(key));
-529 } catch (NumberFormatException ex) {
-530 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
-531 }
-532 return value;
-533 }
-534
-535
-536
-537
-538
-539
-540
-541
-542
-543
-544
-545 public static boolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException {
-546 boolean value;
-547 try {
-548 final String strValue = Settings.getString(key);
-549 if (strValue == null ) {
-550 return defaultValue;
-551 }
-552 value = Boolean.parseBoolean(strValue);
-553 } catch (NumberFormatException ex) {
-554 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
-555 }
-556 return value;
-557 }
-558 }
+395 public static File getFile(String key) {
+396 final String file = getString(key);
+397 if (file == null ) {
+398 return null ;
+399 }
+400 return new File(file);
+401 }
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415 public static File getDataFile(String key) {
+416 final String file = getString(key);
+417 LOGGER.log(Level.FINE, String.format("Settings.getDataFile() - file: '%s'" , file));
+418 if (file == null ) {
+419 return null ;
+420 }
+421 if (file.startsWith("[JAR]" )) {
+422 LOGGER.log(Level.FINE, "Settings.getDataFile() - transforming filename" );
+423 final File jarPath = getJarPath();
+424 LOGGER.log(Level.FINE, String.format("Settings.getDataFile() - jar file: '%s'" , jarPath.toString()));
+425 final File retVal = new File(jarPath, file.substring(6));
+426 LOGGER.log(Level.FINE, String.format("Settings.getDataFile() - returning: '%s'" , retVal.toString()));
+427 return retVal;
+428 }
+429 return new File(file);
+430 }
+431
+432
+433
+434
+435
+436
+437 private static File getJarPath() {
+438 final String jarPath = Settings.class .getProtectionDomain().getCodeSource().getLocation().getPath();
+439 String decodedPath = "." ;
+440 try {
+441 decodedPath = URLDecoder.decode(jarPath, "UTF-8" );
+442 } catch (UnsupportedEncodingException ex) {
+443 LOGGER.log(Level.FINEST, null , ex);
+444 }
+445
+446 final File path = new File(decodedPath);
+447 if (path.getName().toLowerCase().endsWith(".jar" )) {
+448 return path.getParentFile();
+449 } else {
+450 return new File("." );
+451 }
+452 }
+453
+454
+455
+456
+457
+458
+459
+460
+461
+462
+463 public static String getString(String key, String defaultValue) {
+464 final String str = System.getProperty(key, localSettings.get().props.getProperty(key, defaultValue));
+465 return str;
+466 }
+467
+468
+469
+470
+471 private static File tempDirectory = null ;
+472
+473
+474
+475
+476
+477
+478
+479 public static File getTempDirectory() throws IOException {
+480 final File tmpDir = new File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir" )));
+481 if (!tmpDir.exists()) {
+482 if (!tmpDir.mkdirs()) {
+483 final String msg = String.format("Unable to make a temporary folder '%s'" , tmpDir.getPath());
+484 throw new IOException(msg);
+485 } else {
+486 tempDirectory = tmpDir;
+487 }
+488 }
+489 return tmpDir;
+490 }
+491
+492
+493
+494
+495
+496
+497
+498
+499
+500 public static String getString(String key) {
+501 return System.getProperty(key, localSettings.get().props.getProperty(key));
+502 }
+503
+504
+505
+506
+507
+508
+509 public static void removeProperty(String key) {
+510 localSettings.get().props.remove(key);
+511 }
+512
+513
+514
+515
+516
+517
+518
+519
+520
+521
+522 public static int getInt(String key) throws InvalidSettingException {
+523 int value;
+524 try {
+525 value = Integer.parseInt(Settings.getString(key));
+526 } catch (NumberFormatException ex) {
+527 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
+528 }
+529 return value;
+530 }
+531
+532
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542 public static int getInt(String key, int defaultValue) {
+543 int value;
+544 try {
+545 value = Integer.parseInt(Settings.getString(key));
+546 } catch (NumberFormatException ex) {
+547 final String msg = String.format("Could not convert property '%s' to an int." , key);
+548 LOGGER.log(Level.FINEST, msg, ex);
+549 value = defaultValue;
+550 }
+551 return value;
+552 }
+553
+554
+555
+556
+557
+558
+559
+560
+561
+562
+563 public static long getLong(String key) throws InvalidSettingException {
+564 long value;
+565 try {
+566 value = Long.parseLong(Settings.getString(key));
+567 } catch (NumberFormatException ex) {
+568 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
+569 }
+570 return value;
+571 }
+572
+573
+574
+575
+576
+577
+578
+579
+580
+581
+582 public static boolean getBoolean(String key) throws InvalidSettingException {
+583 boolean value;
+584 try {
+585 value = Boolean.parseBoolean(Settings.getString(key));
+586 } catch (NumberFormatException ex) {
+587 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
+588 }
+589 return value;
+590 }
+591
+592
+593
+594
+595
+596
+597
+598
+599
+600
+601
+602 public static boolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException {
+603 boolean value;
+604 try {
+605 final String strValue = Settings.getString(key);
+606 if (strValue == null ) {
+607 return defaultValue;
+608 }
+609 value = Boolean.parseBoolean(strValue);
+610 } catch (NumberFormatException ex) {
+611 throw new InvalidSettingException ("Could not convert property '" + key + "' to an int." , ex);
+612 }
+613 return value;
+614 }
+615 }
55 try {
56 if (proxyUrl != null ) {
57 final int proxyPort = Settings.getInt(Settings.KEYS.PROXY_PORT);
-58 final SocketAddress addr = new InetSocketAddress(proxyUrl, proxyPort);
+58 final SocketAddress address = new InetSocketAddress(proxyUrl, proxyPort);
59
60 final String username = Settings.getString(Settings.KEYS.PROXY_USERNAME);
61 final String password = Settings.getString(Settings.KEYS.PROXY_PASSWORD);
@@ -80,7 +80,7 @@
72 Authenticator.setDefault(auth);
73 }
74
-75 proxy = new Proxy(Proxy.Type.HTTP, addr);
+75 proxy = new Proxy(Proxy.Type.HTTP, address);
76 conn = (HttpURLConnection) url.openConnection(proxy);
77 } else {
78 conn = (HttpURLConnection) url.openConnection();
diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html
index 4e4ecc8e6..2131f92aa 100644
--- a/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html
+++ b/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.utils
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.utils
Dependency-Check Core 1.1.4 Reference Package org.owasp.dependencycheck.utils
+ Dependency-Check Core 1.2.0 Reference Package org.owasp.dependencycheck.utils
Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
Dependency-Check Core 1.1.4 Reference
+ Dependency-Check Core 1.2.0 Reference
diff --git a/dependency-check-jenkins/index.html b/dependency-check-jenkins/index.html
index 33cf42f71..81ac63c9e 100644
--- a/dependency-check-jenkins/index.html
+++ b/dependency-check-jenkins/index.html
@@ -1,13 +1,13 @@
dependency-check-jenkins -
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
diff --git a/dependency-check-jenkins/license.html b/dependency-check-jenkins/license.html
index f2fdada0a..5dd52d947 100644
--- a/dependency-check-jenkins/license.html
+++ b/dependency-check-jenkins/license.html
@@ -1,13 +1,13 @@
dependency-check-jenkins - Project License
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
diff --git a/dependency-check-jenkins/project-info.html b/dependency-check-jenkins/project-info.html
index 1013eddd7..34cb33e1a 100644
--- a/dependency-check-jenkins/project-info.html
+++ b/dependency-check-jenkins/project-info.html
@@ -1,13 +1,13 @@
dependency-check-jenkins - Project Information
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
diff --git a/dependency-check-jenkins/project-summary.html b/dependency-check-jenkins/project-summary.html
index 6564d9b9c..841c48ae9 100644
--- a/dependency-check-jenkins/project-summary.html
+++ b/dependency-check-jenkins/project-summary.html
@@ -1,13 +1,13 @@
dependency-check-jenkins - Project Summary
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -196,7 +196,7 @@
dependency-check-jenkins
Version
-1.1.4
+1.2.0
Type
pom
diff --git a/dependency-check-maven/apidocs/allclasses-frame.html b/dependency-check-maven/apidocs/allclasses-frame.html
index 4d263d3cb..abf53b83f 100644
--- a/dependency-check-maven/apidocs/allclasses-frame.html
+++ b/dependency-check-maven/apidocs/allclasses-frame.html
@@ -2,10 +2,10 @@
-
+
All Classes (Dependency-Check Maven Plugin 1.1.4 API)
-All Classes (Dependency-Check Maven Plugin 1.2.0 API)
+All Classes (Dependency-Check Maven Plugin 1.1.4 API)
-All Classes (Dependency-Check Maven Plugin 1.2.0 API)
+Constant Field Values (Dependency-Check Maven Plugin 1.1.4 API)
-Constant Field Values (Dependency-Check Maven Plugin 1.2.0 API)
+Deprecated List (Dependency-Check Maven Plugin 1.1.4 API)
-Deprecated List (Dependency-Check Maven Plugin 1.2.0 API)
+API Help (Dependency-Check Maven Plugin 1.1.4 API)
-API Help (Dependency-Check Maven Plugin 1.2.0 API)
+Index (Dependency-Check Maven Plugin 1.1.4 API)
-Index (Dependency-Check Maven Plugin 1.2.0 API)
+Dependency-Check Maven Plugin 1.1.4 API
+Dependency-Check Maven Plugin 1.2.0 API
diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/HelpMojo.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/HelpMojo.html
index 7f320a222..153fb4649 100644
--- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/HelpMojo.html
+++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/HelpMojo.html
@@ -2,16 +2,16 @@
-
+
HelpMojo (Dependency-Check Maven Plugin 1.1.4 API)
-HelpMojo (Dependency-Check Maven Plugin 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.maven.DependencyCheckMojo (Dependency-Check Maven Plugin 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.maven.DependencyCheckMojo (Dependency-Check Maven Plugin 1.2.0 API)
+Uses of Class org.owasp.dependencycheck.maven.HelpMojo (Dependency-Check Maven Plugin 1.1.4 API)
-Uses of Class org.owasp.dependencycheck.maven.HelpMojo (Dependency-Check Maven Plugin 1.2.0 API)
+org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.1.4 API)
-org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.2.0 API)
+org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.1.4 API)
-org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.2.0 API)
+org.owasp.dependencycheck.maven Class Hierarchy (Dependency-Check Maven Plugin 1.1.4 API)
-org.owasp.dependencycheck.maven Class Hierarchy (Dependency-Check Maven Plugin 1.2.0 API)
+Uses of Package org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.1.4 API)
-Uses of Package org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.2.0 API)
+Class Hierarchy (Dependency-Check Maven Plugin 1.1.4 API)
-Class Hierarchy (Dependency-Check Maven Plugin 1.2.0 API)
+dependency-check-maven -
dependency-check:check
@@ -55,7 +55,7 @@
-
+
/
@@ -69,9 +69,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -107,7 +107,7 @@
@@ -165,7 +165,7 @@
Full name :
-org.owasp:dependency-check-maven:1.1.4:check
+org.owasp:dependency-check-maven:1.2.0:check
Description :
@@ -622,7 +622,7 @@ Reports page.Default value is : Dependency-Check .U
- Skip Analisys for Provided Scope Dependencies.Default value is : false .User property is : skipProvidedScope .
+Skip Analysis for Provided Scope Dependencies.Default value is : false .User property is : skipProvidedScope .
@@ -633,7 +633,7 @@ Reports page.Default value is : Dependency-Check .U
- Skip Analisys for Runtime Scope Dependencies.Default value is : false .User property is : skipRuntimeScope .
+Skip Analysis for Runtime Scope Dependencies.Default value is : false .User property is : skipRuntimeScope .
@@ -644,7 +644,7 @@ Reports page.Default value is : Dependency-Check .U
- Skip Analisys for Test Scope Dependencies.Default value is : true .User property is : skipTestScope .
+Skip Analysis for Test Scope Dependencies.Default value is : true .User property is : skipTestScope .
@@ -655,7 +655,7 @@ Reports page.Default value is : Dependency-Check .U
- The Connection Timeout.User property is : suppressionFile .
+The path to the suppression file.User property is : suppressionFile .
@@ -1143,7 +1143,7 @@ Dependency-Check report. This generally maps to "target/site".
skipProvidedScope :
-Skip Analisys for Provided Scope Dependencies.
+Skip Analysis for Provided Scope Dependencies.
@@ -1157,7 +1157,7 @@ Dependency-Check report. This generally maps to "target/site".
skipRuntimeScope :
-Skip Analisys for Runtime Scope Dependencies.
+Skip Analysis for Runtime Scope Dependencies.
@@ -1171,7 +1171,7 @@ Dependency-Check report. This generally maps to "target/site".
skipTestScope :
-Skip Analisys for Test Scope Dependencies.
+Skip Analysis for Test Scope Dependencies.
@@ -1185,7 +1185,7 @@ Dependency-Check report. This generally maps to "target/site".
suppressionFile :
-The Connection Timeout.
+The path to the suppression file.
diff --git a/dependency-check-maven/checkstyle.html b/dependency-check-maven/checkstyle.html
index 8458642eb..9235638f8 100644
--- a/dependency-check-maven/checkstyle.html
+++ b/dependency-check-maven/checkstyle.html
@@ -1,13 +1,13 @@
dependency-check-maven - Checkstyle Results
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -181,20 +181,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -286,95 +272,95 @@
'}' is not preceded with whitespace.
-136
+ 141
'}' is not preceded with whitespace.
-142
+147
'}' is not preceded with whitespace.
-150
+155
'}' is not preceded with whitespace.
-158
+163
'}' is not preceded with whitespace.
-165
+170
'}' is not preceded with whitespace.
-174
+179
'}' is not preceded with whitespace.
-183
+188
'}' is not preceded with whitespace.
-192
+197
'}' is not preceded with whitespace.
-199
+204
'}' is not preceded with whitespace.
-205
+210
'}' is not preceded with whitespace.
-211
+216
'}' is not preceded with whitespace.
-218
+223
'}' is not preceded with whitespace.
-225
+230
'}' is not preceded with whitespace.
-232
+237
'}' is not preceded with whitespace.
-239
+244
'}' is not preceded with whitespace.
-246
+251
'}' is not preceded with whitespace.
-252
+257
'}' is not preceded with whitespace.
-258
+263
'}' is not preceded with whitespace.
-264
+269
'}' is not preceded with whitespace.
-270
+275
'}' is not preceded with whitespace.
-276
+281
'}' is not preceded with whitespace.
-282
+287
'}' is not preceded with whitespace.
-288
+293
@@ -161,588 +161,590 @@
72
73
-
+ 74
- 75
- private static final String PROPERTIES_FILE = "mojo.properties" ;
+ 75 0 private final Logger logger = Logger.getLogger(DependencyCheckMojo.class .getName());
76
-
+ 77
-
- 78
-
- 79
- private static final String LOG_PROPERTIES_FILE = "log.properties" ;
- 80
- 81
-
- 82
+ 78
+
+ 79
+
+ 80
+ private static final String PROPERTIES_FILE = "mojo.properties" ;
+ 81
+
+ 82
+
+ 83
- 83 0 private static final String NEW_LINE = System.getProperty("line.separator" , "\n" ).intern();
84
-
+ private static final String LOG_PROPERTIES_FILE = "log.properties" ; 85
86
-
+ 87
- 88
- @Component
+ 88 0 private static final String NEW_LINE = System.getProperty("line.separator" , "\n" ).intern();
89
- private MavenProject project;
+ 90
91
-
+ 92
93
- @Parameter(property = "logfile" , defaultValue = "" )
+ @Component 94
- private String logFile;
+ private MavenProject project; 95
96
-
+ 97
98
- @Parameter(property = "name" , defaultValue = "Dependency-Check" )
+ @Parameter(property = "logfile" , defaultValue = "" ) 99
- private String name;
+ private String logFile; 100
101
-
+ 102
103
- @Parameter(property = "description" , defaultValue = "A report providing details on any published "
+ @Parameter(property = "name" , defaultValue = "Dependency-Check" ) 104
- + "vulnerabilities within project dependencies. This report is a best effort but may contain "
+ private String name; 105
- + "false positives and false negatives." )
+ 106
- private String description;
+ 107
-
- 108
-
- 109
-
- 110
+ 108
+ @Parameter(property = "description" , defaultValue = "A report providing details on any published "
+ 109
+ + "vulnerabilities within project dependencies. This report is a best effort but may contain "
+ 110
+ + "false positives and false negatives." )
111
- @Parameter(property = "reportOutputDirectory" , defaultValue = "${project.reporting.outputDirectory}" , required = true )
+ private String description; 112
- private File reportOutputDirectory;
- 113
+ 113
+
114
-
+ 115
116
- @Parameter(defaultValue = "${project.build.directory}" , required = true )
+ @Parameter(property = "reportOutputDirectory" , defaultValue = "${project.reporting.outputDirectory}" , required = true ) 117
- private File outputDirectory;
+ private File reportOutputDirectory; 118
119
-
+ 120
-
+ 121
-
- 122 0 @SuppressWarnings("CanBeFinal" )
+ @Parameter(defaultValue = "${project.build.directory}" , required = true ) 122
+ private File outputDirectory;
123
- @Parameter(property = "failBuildOnCVSS" , defaultValue = "11" , required = true )
+ 124
- private float failBuildOnCVSS = 11;
+ 125
-
+ 126
-
- 127
-
+ 127 0 @SuppressWarnings("CanBeFinal" )
128
-
- 129 0 @SuppressWarnings("CanBeFinal" )
+ @Parameter(property = "failBuildOnCVSS" , defaultValue = "11" , required = true ) 129
+ private float failBuildOnCVSS = 11;
130
- @Parameter(property = "autoupdate" , defaultValue = "true" , required = true )
+ 131
- private boolean autoUpdate = true ;
+ 132
-
+ 133
-
- 134
-
+ 134 0 @SuppressWarnings("CanBeFinal" )
135
-
- 136 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "autoupdate" , defaultValue = "true" , required = true ) 136
+ private boolean autoUpdate = true ;
137
- @Parameter(property = "format" , defaultValue = "HTML" , required = true )
+ 138
- private String format = "HTML" ;
+ 139
-
+ 140
-
- 141
- 142 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 141 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 142
+ @Parameter(property = "format" , defaultValue = "HTML" , required = true )
143
- @Parameter(property = "externalReport" , defaultValue = "false" , required = true )
+ private String format = "HTML" ; 144
- private boolean externalReport = false ;
+ 145
-
+ 146
-
- 147
-
+ 147 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
148
-
+ @Parameter(property = "externalReport" , defaultValue = "false" , required = true ) 149
-
- 150 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ private boolean externalReport = false ; 150
+
151
- @Parameter(property = "proxyUrl" , defaultValue = "" , required = false )
+ 152
- @Deprecated
+ 153
- private String proxyUrl = null ;
+ 154
-
- 155
-
+ 155 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
156
-
+ @Parameter(property = "proxyUrl" , defaultValue = "" , required = false ) 157
-
+ @Deprecated 158
- @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ private String proxyUrl = null ; 159
- @Parameter(property = "mavenSettings" , defaultValue = "${settings}" , required = false )
+ 160
- private org.apache.maven.settings.Settings mavenSettings;
+ 161
-
+ 162
-
+ 163
-
+ @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" }) 164
-
+ @Parameter(property = "mavenSettings" , defaultValue = "${settings}" , required = false ) 165
- @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ private org.apache.maven.settings.Settings mavenSettings; 166
- @Parameter(property = "mavenSettingsProxyId" , required = false )
+ 167
- private String mavenSettingsProxyId;
+ 168
-
+ 169
-
+ 170
-
+ @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" }) 171
-
+ @Parameter(property = "mavenSettingsProxyId" , required = false ) 172
-
+ private String mavenSettingsProxyId; 173
-
- 174 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 174
+
175
- @Parameter(property = "proxyPort" , defaultValue = "" , required = false )
+ 176
- @Deprecated
+ 177
- private String proxyPort = null ;
+ 178
-
- 179
-
+ 179 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
180
-
+ @Parameter(property = "proxyPort" , defaultValue = "" , required = false ) 181
-
+ @Deprecated 182
-
- 183 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ private String proxyPort = null ; 183
+
184
- @Parameter(property = "proxyUsername" , defaultValue = "" , required = false )
+ 185
- @Deprecated
- 186
- private String proxyUsername = null ;
- 187
-
- 188
-
- 189
- 190
+ 186
- 191
+ 187
- 192 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
- 193
- @Parameter(property = "proxyPassword" , defaultValue = "" , required = false )
- 194
+ 188 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 189
+ @Parameter(property = "proxyUsername" , defaultValue = "" , required = false )
+ 190
@Deprecated
+ 191
+ private String proxyUsername = null ;
+ 192
+
+ 193
+
+ 194
+
195
- private String proxyPassword = null ;
+ 196
-
- 197
-
+ 197 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
198
-
- 199 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "proxyPassword" , defaultValue = "" , required = false ) 199
+ @Deprecated
200
- @Parameter(property = "connectionTimeout" , defaultValue = "" , required = false )
+ private String proxyPassword = null ; 201
- private String connectionTimeout = null ;
+ 202
-
- 203
- 204
+ 203
- 205 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 204 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 205
+ @Parameter(property = "connectionTimeout" , defaultValue = "" , required = false )
206
- @Parameter(property = "suppressionFile" , defaultValue = "" , required = false )
+ private String connectionTimeout = null ; 207
- private String suppressionFile = null ;
+ 208
-
+ 209
-
- 210
- 211 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 210 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 211
+ @Parameter(property = "suppressionFile" , defaultValue = "" , required = false )
212
- @Parameter(property = "showSummary" , defaultValue = "true" , required = false )
+ private String suppressionFile = null ; 213
- private boolean showSummary = true ;
+ 214
-
+ 215
-
- 216
-
+ 216 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
217
-
- 218 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "showSummary" , defaultValue = "true" , required = false ) 218
+ private boolean showSummary = true ;
219
- @Parameter(property = "jarAnalyzerEnabled" , defaultValue = "true" , required = false )
+ 220
- private boolean jarAnalyzerEnabled = true ;
+ 221
-
+ 222
-
- 223
-
+ 223 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
224
-
- 225 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "jarAnalyzerEnabled" , defaultValue = "true" , required = false ) 225
+ private boolean jarAnalyzerEnabled = true ;
226
- @Parameter(property = "archiveAnalyzerEnabled" , defaultValue = "true" , required = false )
+ 227
- private boolean archiveAnalyzerEnabled = true ;
+ 228
-
+ 229
-
- 230
-
+ 230 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
231
-
- 232 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "archiveAnalyzerEnabled" , defaultValue = "true" , required = false ) 232
+ private boolean archiveAnalyzerEnabled = true ;
233
- @Parameter(property = "assemblyAnalyzerEnabled" , defaultValue = "true" , required = false )
+ 234
- private boolean assemblyAnalyzerEnabled = true ;
+ 235
-
+ 236
-
- 237
-
+ 237 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
238
-
- 239 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "assemblyAnalyzerEnabled" , defaultValue = "true" , required = false ) 239
+ private boolean assemblyAnalyzerEnabled = true ;
240
- @Parameter(property = "nuspecAnalyzerEnabled" , defaultValue = "true" , required = false )
- 241
- private boolean nuspecAnalyzerEnabled = true ;
- 242
+ 241
+
+ 242
+
243
-
- 244
-
+ 244 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
245
-
- 246 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "nuspecAnalyzerEnabled" , defaultValue = "true" , required = false ) 246
+ private boolean nuspecAnalyzerEnabled = true ;
247
- @Parameter(property = "nexusAnalyzerEnabled" , defaultValue = "true" , required = false )
+ 248
- private boolean nexusAnalyzerEnabled = true ;
+ 249
-
- 250
- 251
+ 250
+ 251 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
252
- @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "nexusAnalyzerEnabled" , defaultValue = "true" , required = false ) 253
- @Parameter(property = "nexusUrl" , defaultValue = "" , required = false )
+ private boolean nexusAnalyzerEnabled = true ; 254
- private String nexusUrl;
+ 255
-
+ 256
-
+ 257
-
- 258 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" }) 258
+ @Parameter(property = "nexusUrl" , defaultValue = "" , required = false )
259
- @Parameter(property = "nexusUsesProxy" , defaultValue = "true" , required = false )
+ private String nexusUrl; 260
- private boolean nexusUsesProxy = true ;
+ 261
-
+ 262
-
- 263
+ 263 0 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
264
- @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "nexusUsesProxy" , defaultValue = "true" , required = false ) 265
- @Parameter(property = "connectionString" , defaultValue = "" , required = false )
+ private boolean nexusUsesProxy = true ; 266
- private String connectionString;
+ 267
-
+ 268
-
+ 269
-
+ @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" }) 270
- @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "connectionString" , defaultValue = "" , required = false ) 271
- @Parameter(property = "databaseDriverName" , defaultValue = "" , required = false )
+ private String connectionString; 272
- private String databaseDriverName;
+ 273
-
+ 274
-
+ 275
-
+ @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" }) 276
- @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "databaseDriverName" , defaultValue = "" , required = false ) 277
- @Parameter(property = "databaseDriverPath" , defaultValue = "" , required = false )
+ private String databaseDriverName; 278
- private String databaseDriverPath;
+ 279
-
+ 280
-
+ 281
-
+ @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" }) 282
- @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ @Parameter(property = "databaseDriverPath" , defaultValue = "" , required = false ) 283
- @Parameter(property = "databaseUser" , defaultValue = "" , required = false )
+ private String databaseDriverPath; 284
- private String databaseUser;
+ 285
-
+ 286
-
+ 287
-
- 288
@SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+ 288
+ @Parameter(property = "databaseUser" , defaultValue = "" , required = false )
289
- @Parameter(property = "databasePassword" , defaultValue = "" , required = false )
+ private String databaseUser; 290
- private String databasePassword;
- 291
+ 291
+
292
-
- 293
+ 293
+ @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
294
- @Parameter(property = "zipExtensions" , required = false )
+ @Parameter(property = "databasePassword" , defaultValue = "" , required = false ) 295
- private String zipExtensions;
+ private String databasePassword; 296
297
-
+ 298
- 299 0 @SuppressWarnings("CanBeFinal" )
+ 299
+ @Parameter(property = "zipExtensions" , required = false )
300
- @Parameter(property = "skipTestScope" , defaultValue = "true" , required = false )
+ private String zipExtensions; 301
- private boolean skipTestScope = true ;
+ 302
-
+ 303
-
- 304
- 305 0 @SuppressWarnings("CanBeFinal" )
+ 304 0 @SuppressWarnings("CanBeFinal" )
+ 305
+ @Parameter(property = "skipTestScope" , defaultValue = "true" , required = false )
306
- @Parameter(property = "skipRuntimeScope" , defaultValue = "false" , required = false )
+ private boolean skipTestScope = true ; 307
- private boolean skipRuntimeScope = false ;
+ 308
-
+ 309
-
- 310
- 311 0 @SuppressWarnings("CanBeFinal" )
+ 310 0 @SuppressWarnings("CanBeFinal" )
+ 311
+ @Parameter(property = "skipRuntimeScope" , defaultValue = "false" , required = false )
312
- @Parameter(property = "skipProvidedScope" , defaultValue = "false" , required = false )
+ private boolean skipRuntimeScope = false ; 313
- private boolean skipProvidedScope = false ;
- 314
+ 314
+
315
-
- 316
+ 316 0 @SuppressWarnings("CanBeFinal" )
317
- @Parameter(property = "dataDirectory" , defaultValue = "" , required = false )
+ @Parameter(property = "skipProvidedScope" , defaultValue = "false" , required = false ) 318
- private String dataDirectory;
+ private boolean skipProvidedScope = false ; 319
320
-
+ 321
322
- @Parameter(property = "cveUrl12Modified" , defaultValue = "" , required = false )
+ @Parameter(property = "dataDirectory" , defaultValue = "" , required = false ) 323
- private String cveUrl12Modified;
+ private String dataDirectory; 324
325
-
+ 326
327
- @Parameter(property = "cveUrl20Modified" , defaultValue = "" , required = false )
+ @Parameter(property = "cveUrl12Modified" , defaultValue = "" , required = false ) 328
- private String cveUrl20Modified;
+ private String cveUrl12Modified; 329
330
-
+ 331
332
- @Parameter(property = "cveUrl12Base" , defaultValue = "" , required = false )
+ @Parameter(property = "cveUrl20Modified" , defaultValue = "" , required = false ) 333
- private String cveUrl12Base;
+ private String cveUrl20Modified; 334
335
-
+ 336
337
- @Parameter(property = "cveUrl20Base" , defaultValue = "" , required = false )
+ @Parameter(property = "cveUrl12Base" , defaultValue = "" , required = false ) 338
- private String cveUrl20Base;
+ private String cveUrl12Base; 339
-
+ 340
-
+ 341
-
+ 342
-
+ @Parameter(property = "cveUrl20Base" , defaultValue = "" , required = false ) 343
- @Parameter(property = "pathToMono" , defaultValue = "" , required = false )
+ private String cveUrl20Base; 344
- private String pathToMono;
+ 345
-
- 346
-
- 347
- 348
-
- 349
-
- 350
-
- 351
-
- 352
+ 346
+
+ 347
+ 348
+ @Parameter(property = "pathToMono" , defaultValue = "" , required = false )
+ 349
+ private String pathToMono;
+ 350
+
+ 351
+
+ 352
+
353
- private Engine executeDependencyCheck() throws DatabaseException {
+ 354
-
- 355 0 final InputStream in = DependencyCheckMojo.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
- 356 0 LogUtils.prepareLogger(in, logFile);
+ 355
+
+ 356
+
357
+
+ 358
+ private Engine executeDependencyCheck() throws DatabaseException {
+ 359
- 358 0 populateSettings();
- 359 0 Engine engine = null ;
- 360
- try {
- 361 0 engine = new Engine();
- 362 0 final Set<Artifact> artifacts = project.getArtifacts();
- 363 0 for (Artifact a : artifacts) {
- 364 0 if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
- 365 0 continue ;
- 366
- }
- 367
+ 360 0 final InputStream in = DependencyCheckMojo.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
+ 361 0 LogUtils.prepareLogger(in, logFile);
+ 362
- 368 0 if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
- 369 0 continue ;
+ 363 0 populateSettings();
+ 364 0 final Engine engine = new Engine();
+ 365
+
+ 366 0 final Set<Artifact> artifacts = project.getArtifacts();
+ 367 0 for (Artifact a : artifacts) {
+ 368 0 if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
+ 369 0 continue ;
370
- }
+ } 371
- 372 0 if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
- 373 0 continue ;
+ 372 0 if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
+ 373 0 continue ;
374
- }
+ } 375
- 376 0 engine.scan(a.getFile().getAbsolutePath());
- 377 0 }
- 378 0 engine.analyzeDependencies();
- 379
- } finally {
- 380 0 if (engine != null ) {
- 381 0 engine.cleanup();
- 382
+ 376 0 if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
+ 377 0 continue ;
+ 378
}
+ 379
+
+ 380 0 engine.scan(a.getFile().getAbsolutePath());
+ 381 0 }
+ 382 0 engine.analyzeDependencies();
383
- }
+ 384 0 return engine;
385
}
@@ -770,7 +772,7 @@
398 0 cve.open();
399 0 prop = cve.getDatabaseProperties();
400 0 } catch (DatabaseException ex) {
- 401 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, "Unable to retrieve DB Properties" , ex);
+ 401 0 logger.log(Level.FINE, "Unable to retrieve DB Properties" , ex);
402
} finally {
403 0 if (cve != null ) {
@@ -784,15 +786,15 @@
try { 409 0 r.generateReports(outDirectory.getCanonicalPath(), format);
410 0 } catch (IOException ex) {
- 411 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
+ 411 0 logger.log(Level.SEVERE,
412
"Unexpected exception occurred during analysis; please see the verbose error log for more details." );
- 413 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, null , ex);
+ 413 0 logger.log(Level.FINE, null , ex);
414 0 } catch (Throwable ex) {
- 415 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
+ 415 0 logger.log(Level.SEVERE,
416
"Unexpected exception occurred during analysis; please see the verbose error log for more details." );
- 417 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, null , ex);
+ 417 0 logger.log(Level.FINE, null , ex);
418 0 }
419 0 }
420
@@ -1326,7 +1328,7 @@
804 0 return proxies.get(0);
805
} else {
- 806 0 throw new IllegalStateException("Ambigous proxy definition" );
+ 806 0 throw new IllegalStateException("Ambiguous proxy definition" );
807
}
808
@@ -1348,533 +1350,530 @@
817
private void populateSettings() {
- 818 0 InputStream mojoProperties = null ;
- 819
+ 818 0 Settings.initialize();
+ 819 0 InputStream mojoProperties = null ;
+ 820
try {
- 820 0 mojoProperties = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
- 821 0 Settings.mergeProperties(mojoProperties);
- 822 0 } catch (IOException ex) {
- 823 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.WARNING, "Unable to load the dependency-check ant task.properties file." );
- 824 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, null , ex);
- 825
+ 821 0 mojoProperties = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
+ 822 0 Settings.mergeProperties(mojoProperties);
+ 823 0 } catch (IOException ex) {
+ 824 0 logger.log(Level.WARNING, "Unable to load the dependency-check ant task.properties file." );
+ 825 0 logger.log(Level.FINE, null , ex);
+ 826
} finally {
- 826 0 if (mojoProperties != null ) {
- 827
+ 827 0 if (mojoProperties != null ) {
+ 828
try {
- 828 0 mojoProperties.close();
- 829 0 } catch (IOException ex) {
- 830 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINEST, null , ex);
- 831 0 }
- 832
- }
+ 829 0 mojoProperties.close();
+ 830 0 } catch (IOException ex) {
+ 831 0 logger.log(Level.FINEST, null , ex);
+ 832 0 }
833
- }
+ } 834
+ }
+ 835
- 835 0 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
- 836
+ 836 0 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+ 837
- 837 0 final Proxy proxy = getMavenProxy();
- 838 0 if (proxy != null ) {
- 839 0 Settings.setString(Settings.KEYS.PROXY_URL, getMavenSettingsProxyUrl(proxy));
- 840 0 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort()));
- 841 0 final String userName = proxy.getUsername();
- 842 0 final String password = proxy.getPassword();
- 843 0 if (userName != null && password != null ) {
- 844 0 Settings.setString(Settings.KEYS.PROXY_USERNAME, userName);
- 845 0 Settings.setString(Settings.KEYS.PROXY_PASSWORD, password);
- 846
- }
+ 838 0 final Proxy proxy = getMavenProxy();
+ 839 0 if (proxy != null ) {
+ 840 0 Settings.setString(Settings.KEYS.PROXY_URL, getMavenSettingsProxyUrl(proxy));
+ 841 0 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort()));
+ 842 0 final String userName = proxy.getUsername();
+ 843 0 final String password = proxy.getPassword();
+ 844 0 if (userName != null && password != null ) {
+ 845 0 Settings.setString(Settings.KEYS.PROXY_USERNAME, userName);
+ 846 0 Settings.setString(Settings.KEYS.PROXY_PASSWORD, password);
847
- }
+ } 848
+ }
+ 849
- 849 0 if (proxyUrl != null && !proxyUrl.isEmpty()) {
- 850 0 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
- 851
+ 850 0 if (proxyUrl != null && !proxyUrl.isEmpty()) {
+ 851 0 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
+ 852
}
- 852 0 if (proxyPort != null && !proxyPort.isEmpty()) {
- 853 0 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
- 854
+ 853 0 if (proxyPort != null && !proxyPort.isEmpty()) {
+ 854 0 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+ 855
}
- 855 0 if (proxyUsername != null && !proxyUsername.isEmpty()) {
- 856 0 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
- 857
+ 856 0 if (proxyUsername != null && !proxyUsername.isEmpty()) {
+ 857 0 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
+ 858
}
- 858 0 if (proxyPassword != null && !proxyPassword.isEmpty()) {
- 859 0 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
- 860
+ 859 0 if (proxyPassword != null && !proxyPassword.isEmpty()) {
+ 860 0 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
+ 861
}
- 861 0 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
- 862 0 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
- 863
- }
- 864 0 if (suppressionFile != null && !suppressionFile.isEmpty()) {
- 865 0 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
- 866
+ 862 0 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+ 863 0 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+ 864
}
+ 865 0 if (suppressionFile != null && !suppressionFile.isEmpty()) {
+ 866 0 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
867
-
+ } 868
-
+ 869
+
+ 870
- 870 0 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
- 871
+ 871 0 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
+ 872
- 872 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
- 873
+ 873 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
+ 874
- 874 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
- 875 0 if (nexusUrl != null && !nexusUrl.isEmpty()) {
- 876 0 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
- 877
+ 875 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
+ 876 0 if (nexusUrl != null && !nexusUrl.isEmpty()) {
+ 877 0 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+ 878
}
- 878 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
- 879
+ 879 0 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+ 880
- 880 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
- 881 0 if (zipExtensions != null && !zipExtensions.isEmpty()) {
- 882 0 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
- 883
- }
+ 881 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
+ 882 0 if (zipExtensions != null && !zipExtensions.isEmpty()) {
+ 883 0 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
884
+ }
+ 885
- 885 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
- 886 0 if (pathToMono != null && !pathToMono.isEmpty()) {
- 887 0 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
- 888
- }
+ 886 0 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
+ 887 0 if (pathToMono != null && !pathToMono.isEmpty()) {
+ 888 0 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
889
-
+ } 890
+
+ 891
- 891 0 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
- 892 0 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
- 893
+ 892 0 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+ 893 0 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+ 894
}
- 894 0 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
- 895 0 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
- 896
+ 895 0 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+ 896 0 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+ 897
}
- 897 0 if (connectionString != null && !connectionString.isEmpty()) {
- 898 0 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
- 899
+ 898 0 if (connectionString != null && !connectionString.isEmpty()) {
+ 899 0 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+ 900
}
- 900 0 if (databaseUser != null && !databaseUser.isEmpty()) {
- 901 0 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
- 902
- }
- 903 0 if (databasePassword != null && !databasePassword.isEmpty()) {
- 904 0 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
- 905
+ 901 0 if (databaseUser != null && !databaseUser.isEmpty()) {
+ 902 0 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+ 903
}
+ 904 0 if (databasePassword != null && !databasePassword.isEmpty()) {
+ 905 0 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
906
+ }
+ 907
- 907 0 if (dataDirectory != null && !dataDirectory.isEmpty()) {
- 908 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
- 909
- }
+ 908 0 if (dataDirectory != null && !dataDirectory.isEmpty()) {
+ 909 0 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
910
-
+ } 911
+
+ 912
- 912 0 Settings.setBoolean(Settings.KEYS.SKIP_TEST_SCOPE, skipTestScope);
- 913 0 Settings.setBoolean(Settings.KEYS.SKIP_RUNTIME_SCOPE, skipRuntimeScope);
- 914 0 Settings.setBoolean(Settings.KEYS.SKIP_PROVIDED_SCOPE, skipProvidedScope);
- 915
-
+ 913 0 Settings.setBoolean(Settings.KEYS.SKIP_TEST_SCOPE, skipTestScope);
+ 914 0 Settings.setBoolean(Settings.KEYS.SKIP_RUNTIME_SCOPE, skipRuntimeScope);
+ 915 0 Settings.setBoolean(Settings.KEYS.SKIP_PROVIDED_SCOPE, skipProvidedScope);
916
+
+ 917
- 917 0 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
- 918 0 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
- 919
+ 918 0 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
+ 919 0 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
+ 920
}
- 920 0 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
- 921 0 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
- 922
+ 921 0 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
+ 922 0 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
+ 923
}
- 923 0 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
- 924 0 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
- 925
- }
- 926 0 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
- 927 0 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
- 928
+ 924 0 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
+ 925 0 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
+ 926
}
+ 927 0 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
+ 928 0 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
929
+ }
+ 930
- 930 0 }
- 931
-
+ 931 0 }
932
-
+ 933
-
+ 934
-
+ 935
-
+ 936
-
+ 937
-
+ 938
+
+ 939
public void execute() throws MojoExecutionException, MojoFailureException {
- 939 0 Engine engine = null ;
- 940
+ 940 0 Engine engine = null ;
+ 941
try {
- 941 0 engine = executeDependencyCheck();
- 942 0 generateExternalReports(engine, outputDirectory);
- 943 0 if (this .showSummary) {
- 944 0 showSummary(engine.getDependencies());
- 945
+ 942 0 engine = executeDependencyCheck();
+ 943 0 generateExternalReports(engine, outputDirectory);
+ 944 0 if (this .showSummary) {
+ 945 0 showSummary(engine.getDependencies());
+ 946
}
- 946 0 if (this .failBuildOnCVSS <= 10) {
- 947 0 checkForFailure(engine.getDependencies());
- 948
+ 947 0 if (this .failBuildOnCVSS <= 10) {
+ 948 0 checkForFailure(engine.getDependencies());
+ 949
}
- 949 0 } catch (DatabaseException ex) {
- 950 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
- 951
+ 950 0 } catch (DatabaseException ex) {
+ 951 0 logger.log(Level.SEVERE,
+ 952
"Unable to connect to the dependency-check database; analysis has stopped" );
- 952 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, "" , ex);
- 953
+ 953 0 logger.log(Level.FINE, "" , ex);
+ 954
} finally {
- 954 0 if (engine != null ) {
- 955 0 engine.cleanup();
- 956
+ 955 0 Settings.cleanup();
+ 956 0 if (engine != null ) {
+ 957 0 engine.cleanup();
+ 958
}
- 957
- }
- 958 0 }
959
-
- 960
-
+ } 960 0 }
961
-
+ 962
-
+ 963
-
- 964
-
- 965
-
- 966
-
- 967
- public void generate(@SuppressWarnings("deprecation" ) org.codehaus.doxia.sink.Sink sink,
- 968
- Locale locale) throws MavenReportException {
- 969 0 generate((Sink) sink, null , locale);
- 970 0 }
- 971
-
- 972
-
- 973
- 974
+ 964
- 975
+ 965
- 976
-
- 977
+ 966
+ 967
+
+ 968
+
+ 969
+ public void generate(@SuppressWarnings("deprecation" ) org.codehaus.doxia.sink.Sink sink,
+ 970
+ Locale locale) throws MavenReportException {
+ 971 0 generate((Sink) sink, null , locale);
+ 972 0 }
+ 973
+
+ 974
+
+ 975
+
+ 976
+
+ 977
+
978
-
+ 979
-
+ 980
- public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException {
- 981 0 Engine engine = null ;
+ 981
+
982
+ public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException {
+ 983 0 Engine engine = null ;
+ 984
try {
- 983 0 engine = executeDependencyCheck();
- 984 0 if (this .externalReport) {
- 985 0 generateExternalReports(engine, reportOutputDirectory);
- 986
- } else {
- 987 0 generateMavenSiteReport(engine, sink);
+ 985 0 engine = executeDependencyCheck();
+ 986 0 if (this .externalReport) {
+ 987 0 generateExternalReports(engine, reportOutputDirectory);
988
+ } else {
+ 989 0 generateMavenSiteReport(engine, sink);
+ 990
}
- 989 0 } catch (DatabaseException ex) {
- 990 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
- 991
- "Unable to connect to the dependency-check database; analysis has stopped" );
- 992 0 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, "" , ex);
+ 991 0 } catch (DatabaseException ex) {
+ 992 0 logger.log(Level.SEVERE,
993
+ "Unable to connect to the dependency-check database; analysis has stopped" );
+ 994 0 logger.log(Level.FINE, "" , ex);
+ 995
} finally {
- 994 0 if (engine != null ) {
- 995 0 engine.cleanup();
- 996
- }
- 997
- }
- 998 0 }
+ 996 0 Settings.cleanup();
+ 997 0 if (engine != null ) {
+ 998 0 engine.cleanup();
999
-
- 1000
-
- 1001
-
- 1002
-
- 1003
-
- 1004
-
- 1005
-
- 1006
- public String getOutputName() {
- 1007 0 if ("HTML" .equalsIgnoreCase(this .format)
- 1008
- || "ALL" .equalsIgnoreCase(this .format)) {
- 1009 0 return "dependency-check-report" ;
- 1010 0 } else if ("XML" .equalsIgnoreCase(this .format)) {
- 1011 0 return "dependency-check-report.xml#" ;
- 1012 0 } else if ("VULN" .equalsIgnoreCase(this .format)) {
- 1013 0 return "dependency-check-vulnerability" ;
- 1014
- } else {
- 1015 0 Logger.getLogger(DependencyCheckMojo.class
- 1016
- .getName()).log(Level.WARNING, "Unknown report format used during site generatation." );
- 1017 0 return "dependency-check-report" ;
- 1018
- }
- 1019
- }
- 1020
-
- 1021
-
- 1022
-
- 1023
-
- 1024
-
- 1025
-
- 1026
- public String getCategoryName() {
- 1027 0 return MavenReport.CATEGORY_PROJECT_REPORTS;
- 1028
- }
- 1029
-
- 1030
-
- 1031
-
- 1032
-
- 1033
-
- 1034
-
- 1035
-
- 1036
- public String getName(Locale locale) {
- 1037 0 return name;
- 1038
- }
- 1039
-
- 1040
-
- 1041
-
- 1042
-
- 1043
-
- 1044
-
- 1045
- public void setReportOutputDirectory(File directory) {
- 1046 0 reportOutputDirectory = directory;
- 1047 0 }
- 1048
-
- 1049
-
- 1050
-
- 1051
-
- 1052
-
- 1053
-
- 1054
- public File getReportOutputDirectory() {
- 1055 0 return reportOutputDirectory;
- 1056
- }
- 1057
-
- 1058
-
- 1059
-
- 1060
-
- 1061
-
- 1062
-
- 1063
-
- 1064
- public String getDescription(Locale locale) {
- 1065 0 return description;
- 1066
- }
- 1067
-
- 1068
-
- 1069
-
- 1070
-
- 1071
-
- 1072
-
- 1073
- public boolean isExternalReport() {
- 1074 0 return externalReport;
- 1075
- }
- 1076
-
- 1077
-
- 1078
-
- 1079
-
- 1080
-
- 1081
-
- 1082
- public boolean canGenerateReport() {
- 1083 0 return true ;
- 1084
- }
- 1085
-
- 1086
-
- 1087
-
- 1088
-
- 1089
-
- 1090
-
- 1091
-
- 1092
-
- 1093
-
- 1094
- private void checkForFailure(List<Dependency> dependencies) throws MojoFailureException {
- 1095 0 final StringBuilder ids = new StringBuilder();
- 1096 0 for (Dependency d : dependencies) {
- 1097 0 boolean addName = true ;
- 1098 0 for (Vulnerability v : d.getVulnerabilities()) {
- 1099 0 if (v.getCvssScore() >= failBuildOnCVSS) {
- 1100 0 if (addName) {
- 1101 0 addName = false ;
- 1102 0 ids.append(NEW_LINE).append(d.getFileName()).append(": " );
- 1103 0 ids.append(v.getName());
- 1104
- } else {
- 1105 0 ids.append(", " ).append(v.getName());
- 1106
- }
- 1107
- }
- 1108 0 }
- 1109 0 }
- 1110 0 if (ids.length() > 0) {
- 1111 0 final String msg = String.format("%n%nDependency-Check Failure:%n"
- 1112
- + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
- 1113
- + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
- 1114 0 throw new MojoFailureException(msg);
- 1115
- }
- 1116 0 }
- 1117
-
- 1118
-
- 1119
-
- 1120
-
- 1121
-
- 1122
-
- 1123
- private void showSummary(List<Dependency> dependencies) {
- 1124 0 final StringBuilder summary = new StringBuilder();
- 1125 0 for (Dependency d : dependencies) {
- 1126 0 boolean firstEntry = true ;
- 1127 0 final StringBuilder ids = new StringBuilder();
- 1128 0 for (Vulnerability v : d.getVulnerabilities()) {
- 1129 0 if (firstEntry) {
- 1130 0 firstEntry = false ;
- 1131
- } else {
- 1132 0 ids.append(", " );
- 1133
- }
- 1134 0 ids.append(v.getName());
- 1135 0 }
- 1136 0 if (ids.length() > 0) {
- 1137 0 summary.append(d.getFileName()).append(" (" );
- 1138 0 firstEntry = true ;
- 1139 0 for (Identifier id : d.getIdentifiers()) {
- 1140 0 if (firstEntry) {
- 1141 0 firstEntry = false ;
- 1142
- } else {
- 1143 0 summary.append(", " );
- 1144
- }
- 1145 0 summary.append(id.getValue());
- 1146 0 }
- 1147 0 summary.append(") : " ).append(ids).append(NEW_LINE);
- 1148
}
- 1149 0 }
- 1150 0 if (summary.length() > 0) {
- 1151 0 final String msg = String.format("%n%n"
- 1152
+ 1000
+ }
+ 1001 0 }
+ 1002
+
+ 1003
+
+ 1004
+
+ 1005
+
+ 1006
+
+ 1007
+
+ 1008
+
+ 1009
+ public String getOutputName() {
+ 1010 0 if ("HTML" .equalsIgnoreCase(this .format)
+ 1011
+ || "ALL" .equalsIgnoreCase(this .format)) {
+ 1012 0 return "dependency-check-report" ;
+ 1013 0 } else if ("XML" .equalsIgnoreCase(this .format)) {
+ 1014 0 return "dependency-check-report.xml#" ;
+ 1015 0 } else if ("VULN" .equalsIgnoreCase(this .format)) {
+ 1016 0 return "dependency-check-vulnerability" ;
+ 1017
+ } else {
+ 1018 0 logger.log(Level.WARNING, "Unknown report format used during site generation." );
+ 1019 0 return "dependency-check-report" ;
+ 1020
+ }
+ 1021
+ }
+ 1022
+
+ 1023
+
+ 1024
+
+ 1025
+
+ 1026
+
+ 1027
+
+ 1028
+ public String getCategoryName() {
+ 1029 0 return MavenReport.CATEGORY_PROJECT_REPORTS;
+ 1030
+ }
+ 1031
+
+ 1032
+
+ 1033
+
+ 1034
+
+ 1035
+
+ 1036
+
+ 1037
+
+ 1038
+ public String getName(Locale locale) {
+ 1039 0 return name;
+ 1040
+ }
+ 1041
+
+ 1042
+
+ 1043
+
+ 1044
+
+ 1045
+
+ 1046
+
+ 1047
+ public void setReportOutputDirectory(File directory) {
+ 1048 0 reportOutputDirectory = directory;
+ 1049 0 }
+ 1050
+
+ 1051
+
+ 1052
+
+ 1053
+
+ 1054
+
+ 1055
+
+ 1056
+ public File getReportOutputDirectory() {
+ 1057 0 return reportOutputDirectory;
+ 1058
+ }
+ 1059
+
+ 1060
+
+ 1061
+
+ 1062
+
+ 1063
+
+ 1064
+
+ 1065
+
+ 1066
+ public String getDescription(Locale locale) {
+ 1067 0 return description;
+ 1068
+ }
+ 1069
+
+ 1070
+
+ 1071
+
+ 1072
+
+ 1073
+
+ 1074
+
+ 1075
+ public boolean isExternalReport() {
+ 1076 0 return externalReport;
+ 1077
+ }
+ 1078
+
+ 1079
+
+ 1080
+
+ 1081
+
+ 1082
+
+ 1083
+
+ 1084
+ public boolean canGenerateReport() {
+ 1085 0 return true ;
+ 1086
+ }
+ 1087
+
+ 1088
+
+ 1089
+
+ 1090
+
+ 1091
+
+ 1092
+
+ 1093
+
+ 1094
+
+ 1095
+
+ 1096
+ private void checkForFailure(List<Dependency> dependencies) throws MojoFailureException {
+ 1097 0 final StringBuilder ids = new StringBuilder();
+ 1098 0 for (Dependency d : dependencies) {
+ 1099 0 boolean addName = true ;
+ 1100 0 for (Vulnerability v : d.getVulnerabilities()) {
+ 1101 0 if (v.getCvssScore() >= failBuildOnCVSS) {
+ 1102 0 if (addName) {
+ 1103 0 addName = false ;
+ 1104 0 ids.append(NEW_LINE).append(d.getFileName()).append(": " );
+ 1105 0 ids.append(v.getName());
+ 1106
+ } else {
+ 1107 0 ids.append(", " ).append(v.getName());
+ 1108
+ }
+ 1109
+ }
+ 1110 0 }
+ 1111 0 }
+ 1112 0 if (ids.length() > 0) {
+ 1113 0 final String msg = String.format("%n%nDependency-Check Failure:%n"
+ 1114
+ + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
+ 1115
+ + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
+ 1116 0 throw new MojoFailureException(msg);
+ 1117
+ }
+ 1118 0 }
+ 1119
+
+ 1120
+
+ 1121
+
+ 1122
+
+ 1123
+
+ 1124
+
+ 1125
+ private void showSummary(List<Dependency> dependencies) {
+ 1126 0 final StringBuilder summary = new StringBuilder();
+ 1127 0 for (Dependency d : dependencies) {
+ 1128 0 boolean firstEntry = true ;
+ 1129 0 final StringBuilder ids = new StringBuilder();
+ 1130 0 for (Vulnerability v : d.getVulnerabilities()) {
+ 1131 0 if (firstEntry) {
+ 1132 0 firstEntry = false ;
+ 1133
+ } else {
+ 1134 0 ids.append(", " );
+ 1135
+ }
+ 1136 0 ids.append(v.getName());
+ 1137 0 }
+ 1138 0 if (ids.length() > 0) {
+ 1139 0 summary.append(d.getFileName()).append(" (" );
+ 1140 0 firstEntry = true ;
+ 1141 0 for (Identifier id : d.getIdentifiers()) {
+ 1142 0 if (firstEntry) {
+ 1143 0 firstEntry = false ;
+ 1144
+ } else {
+ 1145 0 summary.append(", " );
+ 1146
+ }
+ 1147 0 summary.append(id.getValue());
+ 1148 0 }
+ 1149 0 summary.append(") : " ).append(ids).append(NEW_LINE);
+ 1150
+ }
+ 1151 0 }
+ 1152 0 if (summary.length() > 0) {
+ 1153 0 final String msg = String.format("%n%n"
+ 1154
+ "One or more dependencies were identified with known vulnerabilities:%n%n%s"
- 1153
- + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString());
- 1154 0 Logger
1155
- .getLogger(DependencyCheckMojo.class
- 1156
- .getName()).log(Level.WARNING, msg);
+ + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString()); 1156 0 logger.log(Level.WARNING, msg);
1157
}
1158 0 }
@@ -1882,6 +1881,6 @@
} } dependency-check-maven - Configuration
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -103,7 +103,7 @@
@@ -477,7 +477,7 @@
Deprecated Configuration
-The following properties have been deprecated. These can stell be set in the dependency-check-maven plugin’s configuration. However, future versions will remove these properties. Instead using these properties you should use Maven’s settings to configure a proxy.
+The following properties have been deprecated. These can still be set in the dependency-check-maven plugin’s configuration. However, future versions will remove these properties. Instead using these properties you should use Maven’s settings to configure a proxy.
diff --git a/dependency-check-maven/dependency-updates-report.html b/dependency-check-maven/dependency-updates-report.html
index 96726a3b1..d9c8a50d8 100644
--- a/dependency-check-maven/dependency-updates-report.html
+++ b/dependency-check-maven/dependency-updates-report.html
@@ -1,13 +1,13 @@
dependency-check-maven - Dependency Updates Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -181,20 +181,6 @@
Checkstyle
-
-
-
-
-
-
-
-
-
-
-
-
@@ -387,7 +373,7 @@
org.owasp
dependency-check-core
-1.1.4
+1.2.0
compile
jar
@@ -634,7 +620,7 @@
dependency-check-core
Current Version
-1.1.4
+1.2.0
Scope
compile
diff --git a/dependency-check-maven/findbugs.html b/dependency-check-maven/findbugs.html
index 6472ba885..fc4e80f77 100644
--- a/dependency-check-maven/findbugs.html
+++ b/dependency-check-maven/findbugs.html
@@ -1,13 +1,13 @@
dependency-check-maven - FindBugs Bug Detector Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -183,20 +183,6 @@
Checkstyle
-
-
-
-
-
-
-
-
-
-
-
-
dependency-check-maven -
dependency-check:help
@@ -55,7 +55,7 @@
-
+
/
@@ -69,9 +69,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -107,7 +107,7 @@
@@ -163,7 +163,7 @@
Full name :
-org.owasp:dependency-check-maven:1.1.4:help
+org.owasp:dependency-check-maven:1.2.0:help
Description :
diff --git a/dependency-check-maven/index.html b/dependency-check-maven/index.html
index 33cf42f71..81ac63c9e 100644
--- a/dependency-check-maven/index.html
+++ b/dependency-check-maven/index.html
@@ -1,13 +1,13 @@
dependency-check-jenkins -
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
diff --git a/dependency-check-maven/license.html b/dependency-check-maven/license.html
index f2fdada0a..5dd52d947 100644
--- a/dependency-check-maven/license.html
+++ b/dependency-check-maven/license.html
@@ -1,13 +1,13 @@
dependency-check-jenkins - Project License
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
diff --git a/dependency-check-maven/plugin-info.html b/dependency-check-maven/plugin-info.html
index 30c10fb33..45a348f52 100644
--- a/dependency-check-maven/plugin-info.html
+++ b/dependency-check-maven/plugin-info.html
@@ -1,13 +1,13 @@
dependency-check-maven - Plugin Documentation
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
-
+
@@ -181,20 +181,6 @@
Checkstyle
-
-
-
-
-
-
-
-
-
-
-
-
@@ -293,7 +279,7 @@ Call mvn dependency-check:help -Ddetail=true
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
</plugin>
...
</plugins>
@@ -303,7 +289,7 @@ Call mvn dependency-check:help -Ddetail=true
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
</plugin>
...
</plugins>
@@ -315,7 +301,7 @@ Call mvn dependency-check:help -Ddetail=true
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
</plugin>
...
</plugins>
diff --git a/dependency-check-maven/plugin-updates-report.html b/dependency-check-maven/plugin-updates-report.html
index f6ba44fb9..747e88d74 100644
--- a/dependency-check-maven/plugin-updates-report.html
+++ b/dependency-check-maven/plugin-updates-report.html
@@ -1,13 +1,13 @@
dependency-check-maven - Plugin Updates Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
-
+
@@ -181,20 +181,6 @@
Checkstyle
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dependency-check-maven/project-info.html b/dependency-check-maven/project-info.html
index 1013eddd7..34cb33e1a 100644
--- a/dependency-check-maven/project-info.html
+++ b/dependency-check-maven/project-info.html
@@ -1,13 +1,13 @@
dependency-check-jenkins - Project Information
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
diff --git a/dependency-check-maven/project-reports.html b/dependency-check-maven/project-reports.html
index 0ddcef943..6c6976693 100644
--- a/dependency-check-maven/project-reports.html
+++ b/dependency-check-maven/project-reports.html
@@ -1,13 +1,13 @@
dependency-check-maven - Generated Reports
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -285,12 +271,6 @@
Checkstyle Report on coding style conventions.
-CPD Report Duplicate code detection.
-
-PMD Report Verification of coding rules.
-
FindBugs Report Generates a source code report with the FindBugs Library.
diff --git a/dependency-check-maven/project-summary.html b/dependency-check-maven/project-summary.html
index 6564d9b9c..841c48ae9 100644
--- a/dependency-check-maven/project-summary.html
+++ b/dependency-check-maven/project-summary.html
@@ -1,13 +1,13 @@
dependency-check-jenkins - Project Summary
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -196,7 +196,7 @@
dependency-check-jenkins
Version
-1.1.4
+1.2.0
Type
pom
diff --git a/dependency-check-maven/surefire-report.html b/dependency-check-maven/surefire-report.html
index 4f20b966e..f6b5d8552 100644
--- a/dependency-check-maven/surefire-report.html
+++ b/dependency-check-maven/surefire-report.html
@@ -1,13 +1,13 @@
dependency-check-maven - Surefire Report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
@@ -181,20 +181,6 @@
Checkstyle
-
-
-
-
-
-
-
-
-
-
-
-
@@ -265,7 +251,8 @@ function toggleDisplay(elementId) {
-
Summary
+
Summary
+
[Summary ] [Package List ] [Test Cases ]
Tests
@@ -275,13 +262,65 @@ function toggleDisplay(elementId) {
Success Rate
Time
+1
0
0
0
-0
-0%
-0
+
100%
+
0.078
Note: failures are anticipated and checked for with assertions while errors are unanticipated.
+
Package List
+
[Summary ] [Package List ] [Test Cases ]
+
+
Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
+
+
org.owasp.dependencycheck.maven
+
+
+Class
+Tests
+Errors
+Failures
+Skipped
+Success Rate
+Time
+
+DependencyCheckMojoTest 1
+0
+0
+0
+100%
+0.078
dependency-check-maven - Tag List report
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -105,7 +105,7 @@
-
+
@@ -181,20 +181,6 @@
Checkstyle
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dependency-check-maven/usage.html b/dependency-check-maven/usage.html
index 8e1e1e6ff..e606fec96 100644
--- a/dependency-check-maven/usage.html
+++ b/dependency-check-maven/usage.html
@@ -1,13 +1,13 @@
dependency-check-maven - Usage
-
+
/
@@ -67,9 +67,9 @@
- | Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -103,7 +103,7 @@
-
+
@@ -169,7 +169,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
<executions>
<execution>
<goals>
@@ -197,7 +197,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
<configuration>
<failBuildOnCVSS>8</failBuildOnCVSS>
</configuration>
@@ -233,7 +233,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
<configuration>
<externalReport>false</externalReport>
</configuration>
@@ -260,7 +260,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
<configuration>
<skipProvidedScope>true</skipProvidedScope>
<skipRuntimeScope>true</skipRuntimeScope>
@@ -292,7 +292,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.2.0</version>
<configuration>
<cveUrl12Modified>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-modified.xml</cveUrl12Modified>
<cveUrl20Modified>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-2.0-modified.xml</cveUrl20Modified>
diff --git a/dependency-check-maven/xref-test/index.html b/dependency-check-maven/xref-test/index.html
index 5492a5cd6..de3fb3241 100644
--- a/dependency-check-maven/xref-test/index.html
+++ b/dependency-check-maven/xref-test/index.html
@@ -4,7 +4,7 @@
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
diff --git a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-frame.html b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-frame.html
index 5175523d1..864a78901 100644
--- a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-frame.html
+++ b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Maven Plugin 1.1.4 Reference Package org.owasp.dependencycheck.maven
+ Dependency-Check Maven Plugin 1.2.0 Reference Package org.owasp.dependencycheck.maven
Dependency-Check Maven Plugin 1.1.4 Reference Package org.owasp.dependencycheck.maven
+ Dependency-Check Maven Plugin 1.2.0 Reference Package org.owasp.dependencycheck.maven
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
diff --git a/dependency-check-maven/xref/index.html b/dependency-check-maven/xref/index.html
index 5492a5cd6..de3fb3241 100644
--- a/dependency-check-maven/xref/index.html
+++ b/dependency-check-maven/xref/index.html
@@ -4,7 +4,7 @@
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/DependencyCheckMojo.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/DependencyCheckMojo.html
index eb1060507..db9043ebb 100644
--- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/DependencyCheckMojo.html
+++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/DependencyCheckMojo.html
@@ -78,317 +78,317 @@
70 public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageReport {
71
72
-73
+73
74
-75 private static final String PROPERTIES_FILE = "mojo.properties" ;
-76
-77
-78
-79 private static final String LOG_PROPERTIES_FILE = "log.properties" ;
-80
-81
-82
-83 private static final String NEW_LINE = System.getProperty("line.separator" , "\n" ).intern();
-84
+75 private final Logger logger = Logger.getLogger(DependencyCheckMojo.class .getName());
+76
+77
+78
+79
+80 private static final String PROPERTIES_FILE = "mojo.properties" ;
+81
+82
+83
+84 private static final String LOG_PROPERTIES_FILE = "log.properties" ;
85
-86
+86
87
-88 @Component
-89 private MavenProject project;
+88 private static final String NEW_LINE = System.getProperty("line.separator" , "\n" ).intern();
+89
90
-91
+91
92
-93 @Parameter(property = "logfile" , defaultValue = "" )
-94 private String logFile;
+93 @Component
+94 private MavenProject project;
95
-96
+96
97
-98 @Parameter(property = "name" , defaultValue = "Dependency-Check" )
-99 private String name;
+98 @Parameter(property = "logfile" , defaultValue = "" )
+99 private String logFile;
100
-101
+101
102
-103 @Parameter(property = "description" , defaultValue = "A report providing details on any published "
-104 + "vulnerabilities within project dependencies. This report is a best effort but may contain "
-105 + "false positives and false negatives." )
-106 private String description;
-107
-108
-109
-110
-111 @Parameter(property = "reportOutputDirectory" , defaultValue = "${project.reporting.outputDirectory}" , required = true )
-112 private File reportOutputDirectory;
-113
-114
+103 @Parameter(property = "name" , defaultValue = "Dependency-Check" )
+104 private String name;
+105
+106
+107
+108 @Parameter(property = "description" , defaultValue = "A report providing details on any published "
+109 + "vulnerabilities within project dependencies. This report is a best effort but may contain "
+110 + "false positives and false negatives." )
+111 private String description;
+112
+113
+114
115
-116 @Parameter(defaultValue = "${project.build.directory}" , required = true )
-117 private File outputDirectory;
+116 @Parameter(property = "reportOutputDirectory" , defaultValue = "${project.reporting.outputDirectory}" , required = true )
+117 private File reportOutputDirectory;
118
-119
-120
-121
-122 @SuppressWarnings("CanBeFinal" )
-123 @Parameter(property = "failBuildOnCVSS" , defaultValue = "11" , required = true )
-124 private float failBuildOnCVSS = 11;
-125
-126
-127
-128
-129 @SuppressWarnings("CanBeFinal" )
-130 @Parameter(property = "autoupdate" , defaultValue = "true" , required = true )
-131 private boolean autoUpdate = true ;
-132
-133
-134
-135
-136 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-137 @Parameter(property = "format" , defaultValue = "HTML" , required = true )
-138 private String format = "HTML" ;
-139
-140
-141
-142 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-143 @Parameter(property = "externalReport" , defaultValue = "false" , required = true )
-144 private boolean externalReport = false;
-145
-146
-147
-148
-149
-150 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-151 @Parameter(property = "proxyUrl" , defaultValue = "" , required = false)
-152 @Deprecated
-153 private String proxyUrl = null ;
-154
-155
-156
-157
-158 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-159 @Parameter(property = "mavenSettings" , defaultValue = "${settings}" , required = false)
-160 private org.apache.maven.settings.Settings mavenSettings;
-161
-162
-163
-164
-165 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-166 @Parameter(property = "mavenSettingsProxyId" , required = false)
-167 private String mavenSettingsProxyId;
-168
-169
-170
-171
-172
-173
-174 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-175 @Parameter(property = "proxyPort" , defaultValue = "" , required = false)
-176 @Deprecated
-177 private String proxyPort = null ;
-178
-179
-180
-181
-182
-183 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-184 @Parameter(property = "proxyUsername" , defaultValue = "" , required = false)
-185 @Deprecated
-186 private String proxyUsername = null ;
-187
-188
-189
-190
-191
-192 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-193 @Parameter(property = "proxyPassword" , defaultValue = "" , required = false)
-194 @Deprecated
-195 private String proxyPassword = null ;
-196
-197
-198
-199 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-200 @Parameter(property = "connectionTimeout" , defaultValue = "" , required = false)
-201 private String connectionTimeout = null ;
-202
-203
-204
-205 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-206 @Parameter(property = "suppressionFile" , defaultValue = "" , required = false)
-207 private String suppressionFile = null ;
-208
-209
-210
-211 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-212 @Parameter(property = "showSummary" , defaultValue = "true" , required = false)
-213 private boolean showSummary = true ;
-214
-215
-216
-217
-218 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-219 @Parameter(property = "jarAnalyzerEnabled" , defaultValue = "true" , required = false)
-220 private boolean jarAnalyzerEnabled = true ;
-221
-222
-223
-224
-225 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-226 @Parameter(property = "archiveAnalyzerEnabled" , defaultValue = "true" , required = false)
-227 private boolean archiveAnalyzerEnabled = true ;
-228
-229
-230
-231
-232 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-233 @Parameter(property = "assemblyAnalyzerEnabled" , defaultValue = "true" , required = false)
-234 private boolean assemblyAnalyzerEnabled = true ;
-235
-236
-237
-238
-239 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-240 @Parameter(property = "nuspecAnalyzerEnabled" , defaultValue = "true" , required = false)
-241 private boolean nuspecAnalyzerEnabled = true ;
-242
-243
-244
-245
-246 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-247 @Parameter(property = "nexusAnalyzerEnabled" , defaultValue = "true" , required = false)
-248 private boolean nexusAnalyzerEnabled = true ;
-249
-250
-251
-252 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-253 @Parameter(property = "nexusUrl" , defaultValue = "" , required = false)
-254 private String nexusUrl;
-255
-256
-257
-258 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-259 @Parameter(property = "nexusUsesProxy" , defaultValue = "true" , required = false)
-260 private boolean nexusUsesProxy = true ;
-261
-262
-263
-264 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-265 @Parameter(property = "connectionString" , defaultValue = "" , required = false)
-266 private String connectionString;
-267
-268
-269
-270 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-271 @Parameter(property = "databaseDriverName" , defaultValue = "" , required = false)
-272 private String databaseDriverName;
-273
-274
-275
-276 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-277 @Parameter(property = "databaseDriverPath" , defaultValue = "" , required = false)
-278 private String databaseDriverPath;
-279
-280
-281
-282 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-283 @Parameter(property = "databaseUser" , defaultValue = "" , required = false)
-284 private String databaseUser;
-285
-286
-287
-288 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
-289 @Parameter(property = "databasePassword" , defaultValue = "" , required = false)
-290 private String databasePassword;
-291
-292
-293
-294 @Parameter(property = "zipExtensions" , required = false)
-295 private String zipExtensions;
+119
+120
+121 @Parameter(defaultValue = "${project.build.directory}" , required = true )
+122 private File outputDirectory;
+123
+124
+125
+126
+127 @SuppressWarnings("CanBeFinal" )
+128 @Parameter(property = "failBuildOnCVSS" , defaultValue = "11" , required = true )
+129 private float failBuildOnCVSS = 11;
+130
+131
+132
+133
+134 @SuppressWarnings("CanBeFinal" )
+135 @Parameter(property = "autoupdate" , defaultValue = "true" , required = true )
+136 private boolean autoUpdate = true ;
+137
+138
+139
+140
+141 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+142 @Parameter(property = "format" , defaultValue = "HTML" , required = true )
+143 private String format = "HTML" ;
+144
+145
+146
+147 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+148 @Parameter(property = "externalReport" , defaultValue = "false" , required = true )
+149 private boolean externalReport = false;
+150
+151
+152
+153
+154
+155 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+156 @Parameter(property = "proxyUrl" , defaultValue = "" , required = false)
+157 @Deprecated
+158 private String proxyUrl = null ;
+159
+160
+161
+162
+163 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+164 @Parameter(property = "mavenSettings" , defaultValue = "${settings}" , required = false)
+165 private org.apache.maven.settings.Settings mavenSettings;
+166
+167
+168
+169
+170 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+171 @Parameter(property = "mavenSettingsProxyId" , required = false)
+172 private String mavenSettingsProxyId;
+173
+174
+175
+176
+177
+178
+179 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+180 @Parameter(property = "proxyPort" , defaultValue = "" , required = false)
+181 @Deprecated
+182 private String proxyPort = null ;
+183
+184
+185
+186
+187
+188 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+189 @Parameter(property = "proxyUsername" , defaultValue = "" , required = false)
+190 @Deprecated
+191 private String proxyUsername = null ;
+192
+193
+194
+195
+196
+197 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+198 @Parameter(property = "proxyPassword" , defaultValue = "" , required = false)
+199 @Deprecated
+200 private String proxyPassword = null ;
+201
+202
+203
+204 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+205 @Parameter(property = "connectionTimeout" , defaultValue = "" , required = false)
+206 private String connectionTimeout = null ;
+207
+208
+209
+210 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+211 @Parameter(property = "suppressionFile" , defaultValue = "" , required = false)
+212 private String suppressionFile = null ;
+213
+214
+215
+216 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+217 @Parameter(property = "showSummary" , defaultValue = "true" , required = false)
+218 private boolean showSummary = true ;
+219
+220
+221
+222
+223 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+224 @Parameter(property = "jarAnalyzerEnabled" , defaultValue = "true" , required = false)
+225 private boolean jarAnalyzerEnabled = true ;
+226
+227
+228
+229
+230 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+231 @Parameter(property = "archiveAnalyzerEnabled" , defaultValue = "true" , required = false)
+232 private boolean archiveAnalyzerEnabled = true ;
+233
+234
+235
+236
+237 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+238 @Parameter(property = "assemblyAnalyzerEnabled" , defaultValue = "true" , required = false)
+239 private boolean assemblyAnalyzerEnabled = true ;
+240
+241
+242
+243
+244 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+245 @Parameter(property = "nuspecAnalyzerEnabled" , defaultValue = "true" , required = false)
+246 private boolean nuspecAnalyzerEnabled = true ;
+247
+248
+249
+250
+251 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+252 @Parameter(property = "nexusAnalyzerEnabled" , defaultValue = "true" , required = false)
+253 private boolean nexusAnalyzerEnabled = true ;
+254
+255
+256
+257 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+258 @Parameter(property = "nexusUrl" , defaultValue = "" , required = false)
+259 private String nexusUrl;
+260
+261
+262
+263 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+264 @Parameter(property = "nexusUsesProxy" , defaultValue = "true" , required = false)
+265 private boolean nexusUsesProxy = true ;
+266
+267
+268
+269 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+270 @Parameter(property = "connectionString" , defaultValue = "" , required = false)
+271 private String connectionString;
+272
+273
+274
+275 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+276 @Parameter(property = "databaseDriverName" , defaultValue = "" , required = false)
+277 private String databaseDriverName;
+278
+279
+280
+281 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+282 @Parameter(property = "databaseDriverPath" , defaultValue = "" , required = false)
+283 private String databaseDriverPath;
+284
+285
+286
+287 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+288 @Parameter(property = "databaseUser" , defaultValue = "" , required = false)
+289 private String databaseUser;
+290
+291
+292
+293 @SuppressWarnings({"CanBeFinal" , "FieldCanBeLocal" })
+294 @Parameter(property = "databasePassword" , defaultValue = "" , required = false)
+295 private String databasePassword;
296
-297
+297
298
-299 @SuppressWarnings("CanBeFinal" )
-300 @Parameter(property = "skipTestScope" , defaultValue = "true" , required = false)
-301 private boolean skipTestScope = true ;
-302
-303
-304
-305 @SuppressWarnings("CanBeFinal" )
-306 @Parameter(property = "skipRuntimeScope" , defaultValue = "false" , required = false)
-307 private boolean skipRuntimeScope = false;
-308
-309
-310
-311 @SuppressWarnings("CanBeFinal" )
-312 @Parameter(property = "skipProvidedScope" , defaultValue = "false" , required = false)
-313 private boolean skipProvidedScope = false;
-314
-315
-316
-317 @Parameter(property = "dataDirectory" , defaultValue = "" , required = false)
-318 private String dataDirectory;
+299 @Parameter(property = "zipExtensions" , required = false)
+300 private String zipExtensions;
+301
+302
+303
+304 @SuppressWarnings("CanBeFinal" )
+305 @Parameter(property = "skipTestScope" , defaultValue = "true" , required = false)
+306 private boolean skipTestScope = true ;
+307
+308
+309
+310 @SuppressWarnings("CanBeFinal" )
+311 @Parameter(property = "skipRuntimeScope" , defaultValue = "false" , required = false)
+312 private boolean skipRuntimeScope = false;
+313
+314
+315
+316 @SuppressWarnings("CanBeFinal" )
+317 @Parameter(property = "skipProvidedScope" , defaultValue = "false" , required = false)
+318 private boolean skipProvidedScope = false;
319
-320
+320
321
-322 @Parameter(property = "cveUrl12Modified" , defaultValue = "" , required = false)
-323 private String cveUrl12Modified;
+322 @Parameter(property = "dataDirectory" , defaultValue = "" , required = false)
+323 private String dataDirectory;
324
-325
+325
326
-327 @Parameter(property = "cveUrl20Modified" , defaultValue = "" , required = false)
-328 private String cveUrl20Modified;
+327 @Parameter(property = "cveUrl12Modified" , defaultValue = "" , required = false)
+328 private String cveUrl12Modified;
329
-330
+330
331
-332 @Parameter(property = "cveUrl12Base" , defaultValue = "" , required = false)
-333 private String cveUrl12Base;
+332 @Parameter(property = "cveUrl20Modified" , defaultValue = "" , required = false)
+333 private String cveUrl20Modified;
334
-335
+335
336
-337 @Parameter(property = "cveUrl20Base" , defaultValue = "" , required = false)
-338 private String cveUrl20Base;
-339
-340
-341
-342
-343 @Parameter(property = "pathToMono" , defaultValue = "" , required = false)
-344 private String pathToMono;
-345
-346
-347
-348
-349
-350
-351
-352
-353 private Engine executeDependencyCheck() throws DatabaseException {
-354
-355 final InputStream in = DependencyCheckMojo.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
-356 LogUtils.prepareLogger(in, logFile);
-357
-358 populateSettings();
-359 Engine engine = null ;
-360 try {
-361 engine = new Engine();
-362 final Set<Artifact> artifacts = project.getArtifacts();
-363 for (Artifact a : artifacts) {
-364 if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
-365 continue ;
-366 }
-367
-368 if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
-369 continue ;
-370 }
+337 @Parameter(property = "cveUrl12Base" , defaultValue = "" , required = false)
+338 private String cveUrl12Base;
+339
+340
+341
+342 @Parameter(property = "cveUrl20Base" , defaultValue = "" , required = false)
+343 private String cveUrl20Base;
+344
+345
+346
+347
+348 @Parameter(property = "pathToMono" , defaultValue = "" , required = false)
+349 private String pathToMono;
+350
+351
+352
+353
+354
+355
+356
+357
+358 private Engine executeDependencyCheck() throws DatabaseException {
+359
+360 final InputStream in = DependencyCheckMojo.class .getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
+361 LogUtils.prepareLogger(in, logFile);
+362
+363 populateSettings();
+364 final Engine engine = new Engine();
+365
+366 final Set<Artifact> artifacts = project.getArtifacts();
+367 for (Artifact a : artifacts) {
+368 if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
+369 continue ;
+370 }
371
-372 if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
-373 continue ;
-374 }
+372 if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
+373 continue ;
+374 }
375
-376 engine.scan(a.getFile().getAbsolutePath());
-377 }
-378 engine.analyzeDependencies();
-379 } finally {
-380 if (engine != null ) {
-381 engine.cleanup();
-382 }
-383 }
+376 if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
+377 continue ;
+378 }
+379
+380 engine.scan(a.getFile().getAbsolutePath());
+381 }
+382 engine.analyzeDependencies();
+383
384 return engine;
385 }
386
@@ -406,7 +406,7 @@
398 cve.open();
399 prop = cve.getDatabaseProperties();
400 } catch (DatabaseException ex) {
-401 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, "Unable to retrieve DB Properties" , ex);
+401 logger.log(Level.FINE, "Unable to retrieve DB Properties" , ex);
402 } finally {
403 if (cve != null ) {
404 cve.close();
@@ -416,13 +416,13 @@
408 try {
409 r.generateReports(outDirectory.getCanonicalPath(), format);
410 } catch (IOException ex) {
-411 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
+411 logger.log(Level.SEVERE,
412 "Unexpected exception occurred during analysis; please see the verbose error log for more details." );
-413 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, null , ex);
+413 logger.log(Level.FINE, null , ex);
414 } catch (Throwable ex) {
-415 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
+415 logger.log(Level.SEVERE,
416 "Unexpected exception occurred during analysis; please see the verbose error log for more details." );
-417 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, null , ex);
+417 logger.log(Level.FINE, null , ex);
418 }
419 }
420
@@ -811,7 +811,7 @@
803 } else if (proxies.size() == 1) {
804 return proxies.get(0);
805 } else {
-806 throw new IllegalStateException("Ambigous proxy definition" );
+806 throw new IllegalStateException("Ambiguous proxy definition" );
807 }
808 }
809 }
@@ -823,345 +823,345 @@
815
816
817 private void populateSettings() {
-818 InputStream mojoProperties = null ;
-819 try {
-820 mojoProperties = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
-821 Settings.mergeProperties(mojoProperties);
-822 } catch (IOException ex) {
-823 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.WARNING, "Unable to load the dependency-check ant task.properties file." );
-824 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, null , ex);
-825 } finally {
-826 if (mojoProperties != null ) {
-827 try {
-828 mojoProperties.close();
-829 } catch (IOException ex) {
-830 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINEST, null , ex);
-831 }
-832 }
-833 }
-834
-835 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-836
-837 final Proxy proxy = getMavenProxy();
-838 if (proxy != null ) {
-839 Settings.setString(Settings.KEYS.PROXY_URL, getMavenSettingsProxyUrl(proxy));
-840 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort()));
-841 final String userName = proxy.getUsername();
-842 final String password = proxy.getPassword();
-843 if (userName != null && password != null ) {
-844 Settings.setString(Settings.KEYS.PROXY_USERNAME, userName);
-845 Settings.setString(Settings.KEYS.PROXY_PASSWORD, password);
-846 }
-847 }
-848
-849 if (proxyUrl != null && !proxyUrl.isEmpty()) {
-850 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
-851 }
-852 if (proxyPort != null && !proxyPort.isEmpty()) {
-853 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
-854 }
-855 if (proxyUsername != null && !proxyUsername.isEmpty()) {
-856 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
-857 }
-858 if (proxyPassword != null && !proxyPassword.isEmpty()) {
-859 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
-860 }
-861 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
-862 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
-863 }
-864 if (suppressionFile != null && !suppressionFile.isEmpty()) {
-865 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
-866 }
-867
-868
-869
-870 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
-871
-872 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
-873
-874 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
-875 if (nexusUrl != null && !nexusUrl.isEmpty()) {
-876 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
-877 }
-878 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
-879
-880 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
-881 if (zipExtensions != null && !zipExtensions.isEmpty()) {
-882 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
-883 }
-884
-885 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
-886 if (pathToMono != null && !pathToMono.isEmpty()) {
-887 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
-888 }
-889
-890
-891 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
-892 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
-893 }
-894 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
-895 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
-896 }
-897 if (connectionString != null && !connectionString.isEmpty()) {
-898 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
-899 }
-900 if (databaseUser != null && !databaseUser.isEmpty()) {
-901 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
-902 }
-903 if (databasePassword != null && !databasePassword.isEmpty()) {
-904 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
-905 }
-906
-907 if (dataDirectory != null && !dataDirectory.isEmpty()) {
-908 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
-909 }
-910
-911
-912 Settings.setBoolean(Settings.KEYS.SKIP_TEST_SCOPE, skipTestScope);
-913 Settings.setBoolean(Settings.KEYS.SKIP_RUNTIME_SCOPE, skipRuntimeScope);
-914 Settings.setBoolean(Settings.KEYS.SKIP_PROVIDED_SCOPE, skipProvidedScope);
-915
-916
-917 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
-918 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
-919 }
-920 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
-921 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
-922 }
-923 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
-924 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
-925 }
-926 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
-927 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
-928 }
-929
-930 }
-931
-932
-933
-934
-935
-936
-937
-938 public void execute() throws MojoExecutionException, MojoFailureException {
-939 Engine engine = null ;
-940 try {
-941 engine = executeDependencyCheck();
-942 generateExternalReports(engine, outputDirectory);
-943 if (this .showSummary) {
-944 showSummary(engine.getDependencies());
-945 }
-946 if (this .failBuildOnCVSS <= 10) {
-947 checkForFailure(engine.getDependencies());
-948 }
-949 } catch (DatabaseException ex) {
-950 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
-951 "Unable to connect to the dependency-check database; analysis has stopped" );
-952 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, "" , ex);
-953 } finally {
-954 if (engine != null ) {
-955 engine.cleanup();
-956 }
-957 }
-958 }
-959
-960
-961
-962
-963
-964
-965
-966
-967 public void generate(@SuppressWarnings("deprecation" ) org.codehaus.doxia.sink.Sink sink,
-968 Locale locale) throws MavenReportException {
-969 generate((Sink) sink, null , locale);
-970 }
-971
-972
-973
-974
-975
-976
-977
-978
-979
-980 public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException {
-981 Engine engine = null ;
-982 try {
-983 engine = executeDependencyCheck();
-984 if (this .externalReport) {
-985 generateExternalReports(engine, reportOutputDirectory);
-986 } else {
-987 generateMavenSiteReport(engine, sink);
-988 }
-989 } catch (DatabaseException ex) {
-990 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.SEVERE,
-991 "Unable to connect to the dependency-check database; analysis has stopped" );
-992 Logger.getLogger(DependencyCheckMojo.class .getName()).log(Level.FINE, "" , ex);
-993 } finally {
-994 if (engine != null ) {
-995 engine.cleanup();
-996 }
-997 }
-998 }
-999
-1000
-1001
-1002
-1003
-1004
-1005
-1006 public String getOutputName() {
-1007 if ("HTML" .equalsIgnoreCase(this .format)
-1008 || "ALL" .equalsIgnoreCase(this .format)) {
-1009 return "dependency-check-report" ;
-1010 } else if ("XML" .equalsIgnoreCase(this .format)) {
-1011 return "dependency-check-report.xml#" ;
-1012 } else if ("VULN" .equalsIgnoreCase(this .format)) {
-1013 return "dependency-check-vulnerability" ;
-1014 } else {
-1015 Logger.getLogger(DependencyCheckMojo.class
-1016 .getName()).log(Level.WARNING, "Unknown report format used during site generatation." );
-1017 return "dependency-check-report" ;
-1018 }
-1019 }
-1020
-1021
-1022
-1023
-1024
-1025
-1026 public String getCategoryName() {
-1027 return MavenReport.CATEGORY_PROJECT_REPORTS;
-1028 }
-1029
-1030
-1031
-1032
-1033
-1034
-1035
-1036 public String getName(Locale locale) {
-1037 return name;
-1038 }
-1039
-1040
-1041
-1042
-1043
-1044
-1045 public void setReportOutputDirectory(File directory) {
-1046 reportOutputDirectory = directory;
-1047 }
-1048
-1049
-1050
-1051
-1052
-1053
-1054 public File getReportOutputDirectory() {
-1055 return reportOutputDirectory;
-1056 }
-1057
-1058
-1059
-1060
-1061
-1062
-1063
-1064 public String getDescription(Locale locale) {
-1065 return description;
-1066 }
-1067
-1068
-1069
-1070
-1071
-1072
-1073 public boolean isExternalReport() {
-1074 return externalReport;
-1075 }
-1076
-1077
-1078
-1079
-1080
-1081
-1082 public boolean canGenerateReport() {
-1083 return true ;
-1084 }
-1085
-1086
-1087
-1088
-1089
-1090
-1091
-1092
-1093
-1094 private void checkForFailure(List<Dependency> dependencies) throws MojoFailureException {
-1095 final StringBuilder ids = new StringBuilder();
-1096 for (Dependency d : dependencies) {
-1097 boolean addName = true ;
-1098 for (Vulnerability v : d.getVulnerabilities()) {
-1099 if (v.getCvssScore() >= failBuildOnCVSS) {
-1100 if (addName) {
-1101 addName = false;
-1102 ids.append(NEW_LINE).append(d.getFileName()).append(": " );
-1103 ids.append(v.getName());
-1104 } else {
-1105 ids.append(", " ).append(v.getName());
-1106 }
-1107 }
-1108 }
-1109 }
-1110 if (ids.length() > 0) {
-1111 final String msg = String.format("%n%nDependency-Check Failure:%n"
-1112 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
-1113 + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
-1114 throw new MojoFailureException(msg);
-1115 }
-1116 }
-1117
-1118
-1119
-1120
-1121
-1122
-1123 private void showSummary(List<Dependency> dependencies) {
-1124 final StringBuilder summary = new StringBuilder();
-1125 for (Dependency d : dependencies) {
-1126 boolean firstEntry = true ;
-1127 final StringBuilder ids = new StringBuilder();
-1128 for (Vulnerability v : d.getVulnerabilities()) {
-1129 if (firstEntry) {
-1130 firstEntry = false;
-1131 } else {
-1132 ids.append(", " );
-1133 }
-1134 ids.append(v.getName());
-1135 }
-1136 if (ids.length() > 0) {
-1137 summary.append(d.getFileName()).append(" (" );
-1138 firstEntry = true ;
-1139 for (Identifier id : d.getIdentifiers()) {
-1140 if (firstEntry) {
-1141 firstEntry = false;
-1142 } else {
-1143 summary.append(", " );
-1144 }
-1145 summary.append(id.getValue());
-1146 }
-1147 summary.append(") : " ).append(ids).append(NEW_LINE);
-1148 }
-1149 }
-1150 if (summary.length() > 0) {
-1151 final String msg = String.format("%n%n"
-1152 + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
-1153 + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString());
-1154 Logger
-1155 .getLogger(DependencyCheckMojo.class
-1156 .getName()).log(Level.WARNING, msg);
+818 Settings.initialize();
+819 InputStream mojoProperties = null ;
+820 try {
+821 mojoProperties = this .getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
+822 Settings.mergeProperties(mojoProperties);
+823 } catch (IOException ex) {
+824 logger.log(Level.WARNING, "Unable to load the dependency-check ant task.properties file." );
+825 logger.log(Level.FINE, null , ex);
+826 } finally {
+827 if (mojoProperties != null ) {
+828 try {
+829 mojoProperties.close();
+830 } catch (IOException ex) {
+831 logger.log(Level.FINEST, null , ex);
+832 }
+833 }
+834 }
+835
+836 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+837
+838 final Proxy proxy = getMavenProxy();
+839 if (proxy != null ) {
+840 Settings.setString(Settings.KEYS.PROXY_URL, getMavenSettingsProxyUrl(proxy));
+841 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort()));
+842 final String userName = proxy.getUsername();
+843 final String password = proxy.getPassword();
+844 if (userName != null && password != null ) {
+845 Settings.setString(Settings.KEYS.PROXY_USERNAME, userName);
+846 Settings.setString(Settings.KEYS.PROXY_PASSWORD, password);
+847 }
+848 }
+849
+850 if (proxyUrl != null && !proxyUrl.isEmpty()) {
+851 Settings.setString(Settings.KEYS.PROXY_URL, proxyUrl);
+852 }
+853 if (proxyPort != null && !proxyPort.isEmpty()) {
+854 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+855 }
+856 if (proxyUsername != null && !proxyUsername.isEmpty()) {
+857 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
+858 }
+859 if (proxyPassword != null && !proxyPassword.isEmpty()) {
+860 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
+861 }
+862 if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+863 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+864 }
+865 if (suppressionFile != null && !suppressionFile.isEmpty()) {
+866 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
+867 }
+868
+869
+870
+871 Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
+872
+873 Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
+874
+875 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
+876 if (nexusUrl != null && !nexusUrl.isEmpty()) {
+877 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+878 }
+879 Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+880
+881 Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
+882 if (zipExtensions != null && !zipExtensions.isEmpty()) {
+883 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
+884 }
+885
+886 Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
+887 if (pathToMono != null && !pathToMono.isEmpty()) {
+888 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
+889 }
+890
+891
+892 if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+893 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+894 }
+895 if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+896 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+897 }
+898 if (connectionString != null && !connectionString.isEmpty()) {
+899 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+900 }
+901 if (databaseUser != null && !databaseUser.isEmpty()) {
+902 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+903 }
+904 if (databasePassword != null && !databasePassword.isEmpty()) {
+905 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
+906 }
+907
+908 if (dataDirectory != null && !dataDirectory.isEmpty()) {
+909 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
+910 }
+911
+912
+913 Settings.setBoolean(Settings.KEYS.SKIP_TEST_SCOPE, skipTestScope);
+914 Settings.setBoolean(Settings.KEYS.SKIP_RUNTIME_SCOPE, skipRuntimeScope);
+915 Settings.setBoolean(Settings.KEYS.SKIP_PROVIDED_SCOPE, skipProvidedScope);
+916
+917
+918 if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
+919 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
+920 }
+921 if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
+922 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
+923 }
+924 if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
+925 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
+926 }
+927 if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
+928 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
+929 }
+930
+931 }
+932
+933
+934
+935
+936
+937
+938
+939 public void execute() throws MojoExecutionException, MojoFailureException {
+940 Engine engine = null ;
+941 try {
+942 engine = executeDependencyCheck();
+943 generateExternalReports(engine, outputDirectory);
+944 if (this .showSummary) {
+945 showSummary(engine.getDependencies());
+946 }
+947 if (this .failBuildOnCVSS <= 10) {
+948 checkForFailure(engine.getDependencies());
+949 }
+950 } catch (DatabaseException ex) {
+951 logger.log(Level.SEVERE,
+952 "Unable to connect to the dependency-check database; analysis has stopped" );
+953 logger.log(Level.FINE, "" , ex);
+954 } finally {
+955 Settings.cleanup();
+956 if (engine != null ) {
+957 engine.cleanup();
+958 }
+959 }
+960 }
+961
+962
+963
+964
+965
+966
+967
+968
+969 public void generate(@SuppressWarnings("deprecation" ) org.codehaus.doxia.sink.Sink sink,
+970 Locale locale) throws MavenReportException {
+971 generate((Sink) sink, null , locale);
+972 }
+973
+974
+975
+976
+977
+978
+979
+980
+981
+982 public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException {
+983 Engine engine = null ;
+984 try {
+985 engine = executeDependencyCheck();
+986 if (this .externalReport) {
+987 generateExternalReports(engine, reportOutputDirectory);
+988 } else {
+989 generateMavenSiteReport(engine, sink);
+990 }
+991 } catch (DatabaseException ex) {
+992 logger.log(Level.SEVERE,
+993 "Unable to connect to the dependency-check database; analysis has stopped" );
+994 logger.log(Level.FINE, "" , ex);
+995 } finally {
+996 Settings.cleanup();
+997 if (engine != null ) {
+998 engine.cleanup();
+999 }
+1000 }
+1001 }
+1002
+1003
+1004
+1005
+1006
+1007
+1008
+1009 public String getOutputName() {
+1010 if ("HTML" .equalsIgnoreCase(this .format)
+1011 || "ALL" .equalsIgnoreCase(this .format)) {
+1012 return "dependency-check-report" ;
+1013 } else if ("XML" .equalsIgnoreCase(this .format)) {
+1014 return "dependency-check-report.xml#" ;
+1015 } else if ("VULN" .equalsIgnoreCase(this .format)) {
+1016 return "dependency-check-vulnerability" ;
+1017 } else {
+1018 logger.log(Level.WARNING, "Unknown report format used during site generation." );
+1019 return "dependency-check-report" ;
+1020 }
+1021 }
+1022
+1023
+1024
+1025
+1026
+1027
+1028 public String getCategoryName() {
+1029 return MavenReport.CATEGORY_PROJECT_REPORTS;
+1030 }
+1031
+1032
+1033
+1034
+1035
+1036
+1037
+1038 public String getName(Locale locale) {
+1039 return name;
+1040 }
+1041
+1042
+1043
+1044
+1045
+1046
+1047 public void setReportOutputDirectory(File directory) {
+1048 reportOutputDirectory = directory;
+1049 }
+1050
+1051
+1052
+1053
+1054
+1055
+1056 public File getReportOutputDirectory() {
+1057 return reportOutputDirectory;
+1058 }
+1059
+1060
+1061
+1062
+1063
+1064
+1065
+1066 public String getDescription(Locale locale) {
+1067 return description;
+1068 }
+1069
+1070
+1071
+1072
+1073
+1074
+1075 public boolean isExternalReport() {
+1076 return externalReport;
+1077 }
+1078
+1079
+1080
+1081
+1082
+1083
+1084 public boolean canGenerateReport() {
+1085 return true ;
+1086 }
+1087
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096 private void checkForFailure(List<Dependency> dependencies) throws MojoFailureException {
+1097 final StringBuilder ids = new StringBuilder();
+1098 for (Dependency d : dependencies) {
+1099 boolean addName = true ;
+1100 for (Vulnerability v : d.getVulnerabilities()) {
+1101 if (v.getCvssScore() >= failBuildOnCVSS) {
+1102 if (addName) {
+1103 addName = false;
+1104 ids.append(NEW_LINE).append(d.getFileName()).append(": " );
+1105 ids.append(v.getName());
+1106 } else {
+1107 ids.append(", " ).append(v.getName());
+1108 }
+1109 }
+1110 }
+1111 }
+1112 if (ids.length() > 0) {
+1113 final String msg = String.format("%n%nDependency-Check Failure:%n"
+1114 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
+1115 + "See the dependency-check report for more details.%n%n" , failBuildOnCVSS, ids.toString());
+1116 throw new MojoFailureException(msg);
+1117 }
+1118 }
+1119
+1120
+1121
+1122
+1123
+1124
+1125 private void showSummary(List<Dependency> dependencies) {
+1126 final StringBuilder summary = new StringBuilder();
+1127 for (Dependency d : dependencies) {
+1128 boolean firstEntry = true ;
+1129 final StringBuilder ids = new StringBuilder();
+1130 for (Vulnerability v : d.getVulnerabilities()) {
+1131 if (firstEntry) {
+1132 firstEntry = false;
+1133 } else {
+1134 ids.append(", " );
+1135 }
+1136 ids.append(v.getName());
+1137 }
+1138 if (ids.length() > 0) {
+1139 summary.append(d.getFileName()).append(" (" );
+1140 firstEntry = true ;
+1141 for (Identifier id : d.getIdentifiers()) {
+1142 if (firstEntry) {
+1143 firstEntry = false;
+1144 } else {
+1145 summary.append(", " );
+1146 }
+1147 summary.append(id.getValue());
+1148 }
+1149 summary.append(") : " ).append(ids).append(NEW_LINE);
+1150 }
+1151 }
+1152 if (summary.length() > 0) {
+1153 final String msg = String.format("%n%n"
+1154 + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
+1155 + "%n%nSee the dependency-check report for more details.%n%n" , summary.toString());
+1156 logger.log(Level.WARNING, msg);
1157 }
1158 }
1159 }
diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-frame.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-frame.html
index 4e0df994c..d55141514 100644
--- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-frame.html
+++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Maven Plugin 1.1.4 Reference Package org.owasp.dependencycheck.maven
+ Dependency-Check Maven Plugin 1.2.0 Reference Package org.owasp.dependencycheck.maven
Dependency-Check Maven Plugin 1.1.4 Reference Package org.owasp.dependencycheck.maven
+ Dependency-Check Maven Plugin 1.2.0 Reference Package org.owasp.dependencycheck.maven
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
Dependency-Check Maven Plugin 1.1.4 Reference
+ Dependency-Check Maven Plugin 1.2.0 Reference
diff --git a/index.html b/index.html
index 47d563a7b..124f7ab86 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,13 @@
dependency-check - About
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
diff --git a/issue-tracking.html b/issue-tracking.html
index 74b2f9a99..4d1bf3ced 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -1,13 +1,13 @@
dependency-check - Issue Tracking
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
diff --git a/license.html b/license.html
index 9c491232c..e79a8292d 100644
--- a/license.html
+++ b/license.html
@@ -1,13 +1,13 @@
dependency-check - Project License
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
diff --git a/mail-lists.html b/mail-lists.html
index 5d71b2d88..04cb418b8 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -1,13 +1,13 @@
dependency-check - Project Mailing Lists
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
diff --git a/modules.html b/modules.html
index 93e2db120..a4865b1ec 100644
--- a/modules.html
+++ b/modules.html
@@ -1,13 +1,13 @@
dependency-check - Project Modules
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
diff --git a/project-info.html b/project-info.html
index fd45b0e3a..7ea7e0c13 100644
--- a/project-info.html
+++ b/project-info.html
@@ -1,13 +1,13 @@
dependency-check - Project Information
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
diff --git a/project-summary.html b/project-summary.html
index 2f21c789f..efb8b9aa7 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -1,13 +1,13 @@
dependency-check - Project Summary
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
@@ -291,7 +298,7 @@
dependency-check-parent
Version
-1.1.4
+1.2.0
Type
pom
diff --git a/source-repository.html b/source-repository.html
index e1202f37d..b7ed47224 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -1,13 +1,13 @@
dependency-check - Source Repository
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
diff --git a/suppression.html b/suppression.html
index ea39143d0..2eec36ed1 100644
--- a/suppression.html
+++ b/suppression.html
@@ -1,13 +1,13 @@
dependency-check - Suppressing False Positives
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -111,6 +111,13 @@
+
+
+
+
+
+
diff --git a/team-list.html b/team-list.html
index cd20c2a73..cc34088e3 100644
--- a/team-list.html
+++ b/team-list.html
@@ -1,13 +1,13 @@
dependency-check - Team list
| Last Published: 2014-03-29| Last Published: 2014-04-28
- Version: 1.1.4
+ Version: 1.2.0
@@ -169,6 +169,13 @@
+
+
+
+
+
+
