diff --git a/SampleReport.html b/SampleReport.html index ff507e3da..145a53b01 100644 --- a/SampleReport.html +++ b/SampleReport.html @@ -7,7 +7,7 @@ Dependency-Check Report - + diff --git a/dependency-check-ant/apidocs/deprecated-list.html b/dependency-check-ant/apidocs/deprecated-list.html index b74ee27fb..c367438d5 100644 --- a/dependency-check-ant/apidocs/deprecated-list.html +++ b/dependency-check-ant/apidocs/deprecated-list.html @@ -2,16 +2,16 @@ - + -Deprecated List (Dependency-Check Ant Task 1.2.9 API) - +Deprecated List (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/apidocs/help-doc.html b/dependency-check-ant/apidocs/help-doc.html index 8d8ddf56b..b54d98250 100644 --- a/dependency-check-ant/apidocs/help-doc.html +++ b/dependency-check-ant/apidocs/help-doc.html @@ -2,16 +2,16 @@ - + -API Help (Dependency-Check Ant Task 1.2.9 API) - +API Help (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/apidocs/index-all.html b/dependency-check-ant/apidocs/index-all.html index a09382362..c725ce5bb 100644 --- a/dependency-check-ant/apidocs/index-all.html +++ b/dependency-check-ant/apidocs/index-all.html @@ -2,16 +2,16 @@ - + -Index (Dependency-Check Ant Task 1.2.9 API) - +Index (Dependency-Check Ant Task 1.2.10 API) + @@ -257,6 +257,10 @@
Get the value of showSummary.
+
isUpdateOnly() - Method in class org.owasp.dependencycheck.taskdefs.DependencyCheckTask
+
+
Get the value of updateOnly
+
@@ -265,12 +269,7 @@
org.owasp.dependencycheck.taskdefs - package org.owasp.dependencycheck.taskdefs
-
- - org.owasp.dependencycheck.taskdefs - - - This package includes the Ant task definitions.
+
This package includes the Ant task definitions.
@@ -416,6 +415,10 @@
Set the value of suppressionFile.
+
setUpdateOnly(boolean) - Method in class org.owasp.dependencycheck.taskdefs.DependencyCheckTask
+
+
Set the value of updateOnly
+
setZipExtensions(String) - Method in class org.owasp.dependencycheck.taskdefs.DependencyCheckTask
Set the value of zipExtensions.
diff --git a/dependency-check-ant/apidocs/index.html b/dependency-check-ant/apidocs/index.html index 4eb8a1cc1..37bd98fb3 100644 --- a/dependency-check-ant/apidocs/index.html +++ b/dependency-check-ant/apidocs/index.html @@ -2,9 +2,9 @@ - + -Dependency-Check Ant Task 1.2.9 API +Dependency-Check Ant Task 1.2.10 API diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html index 5c0aa72ee..cdaa7d525 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.html @@ -2,16 +2,16 @@ - + -DependencyCheckTask (Dependency-Check Ant Task 1.2.9 API) - +DependencyCheckTask (Dependency-Check Ant Task 1.2.10 API) + @@ -114,7 +114,7 @@ extends org.apache.tools.ant.Task
An Ant task definition to execute dependency-check during an Ant build.
Author:
-
Jeremy Long
+
Jeremy Long
@@ -418,168 +418,174 @@ extends org.apache.tools.ant.Task +boolean +isUpdateOnly() +
Get the value of updateOnly
+ + + void setApplicationName(String applicationName)
Set the value of applicationName.
- + void setArchiveAnalyzerEnabled(boolean archiveAnalyzerEnabled)
Sets whether or not the analyzer is enabled.
- + void setAssemblyAnalyzerEnabled(boolean assemblyAnalyzerEnabled)
Sets whether or not the analyzer is enabled.
- + void setAutoUpdate(boolean autoUpdate)
Set the value of autoUpdate.
- + void setCentralAnalyzerEnabled(boolean centralAnalyzerEnabled)
Set the value of centralAnalyzerEnabled.
- + void setConnectionString(String connectionString)
Set the value of connectionString.
- + void setConnectionTimeout(String connectionTimeout)
Set the value of connectionTimeout.
- + void setCveUrl12Base(String cveUrl12Base)
Set the value of cveUrl12Base.
- + void setCveUrl12Modified(String cveUrl12Modified)
Set the value of cveUrl12Modified.
- + void setCveUrl20Base(String cveUrl20Base)
Set the value of cveUrl20Base.
- + void setCveUrl20Modified(String cveUrl20Modified)
Set the value of cveUrl20Modified.
- + void setDatabaseDriverName(String databaseDriverName)
Set the value of databaseDriverName.
- + void setDatabaseDriverPath(String databaseDriverPath)
Set the value of databaseDriverPath.
- + void setDatabasePassword(String databasePassword)
Set the value of databasePassword.
- + void setDatabaseUser(String databaseUser)
Set the value of databaseUser.
- + void setDataDirectory(String dataDirectory)
Set the value of dataDirectory.
- + void setFailBuildOnCVSS(float failBuildOnCVSS)
Set the value of failBuildOnCVSS.
- + void setJarAnalyzerEnabled(boolean jarAnalyzerEnabled)
Sets whether or not the analyzer is enabled.
- + void setLogFile(String logFile)
Set the value of logFile.
- + void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled)
Set the value of nexusAnalyzerEnabled.
- + void setNexusUrl(String nexusUrl)
Set the value of nexusUrl.
- + void setNexusUsesProxy(boolean nexusUsesProxy)
Set the value of nexusUsesProxy.
- + void setNuspecAnalyzerEnabled(boolean nuspecAnalyzerEnabled)
Sets whether or not the analyzer is enabled.
- + void setPathToMono(String pathToMono)
Set the value of pathToMono.
- + void setProxyPassword(String proxyPassword)
Set the value of proxyPassword.
- + void setProxyPort(String proxyPort)
Set the value of proxyPort.
- + void setProxyServer(String server)
Set the value of proxyServer.
- + void setProxyUrl(String proxyUrl)
Deprecated.  @@ -587,42 +593,48 @@ extends org.apache.tools.ant.Task
- + void setProxyUsername(String proxyUsername)
Set the value of proxyUsername.
- + void setRefid(org.apache.tools.ant.types.Reference r)
Add a reference to a Path, FileSet, DirSet, or FileList defined elsewhere.
- + void setReportFormat(DependencyCheckTask.ReportFormats reportFormat)
Set the value of reportFormat.
- + void setReportOutputDirectory(String reportOutputDirectory)
Set the value of reportOutputDirectory.
- + void setShowSummary(boolean showSummary)
Set the value of showSummary.
- + void setSuppressionFile(String suppressionFile)
Set the value of suppressionFile.
+ +void +setUpdateOnly(boolean updateOnly) +
Set the value of updateOnly
+ + void setZipExtensions(String zipExtensions) @@ -827,6 +839,28 @@ extends org.apache.tools.ant.Task
Parameters:
autoUpdate - new value of autoUpdate
+ + + + + + + + diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.ReportFormats.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.ReportFormats.html index c36e5c23b..811c73762 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.ReportFormats.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.ReportFormats.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.taskdefs.DependencyCheckTask.ReportFormats (Dependency-Check Ant Task 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.taskdefs.DependencyCheckTask.ReportFormats (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.html index 893d90232..64f216b69 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/class-use/DependencyCheckTask.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.taskdefs.DependencyCheckTask (Dependency-Check Ant Task 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.taskdefs.DependencyCheckTask (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-frame.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-frame.html index ca0f8545f..7f867cdd5 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-frame.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.2.9 API) - +org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-summary.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-summary.html index 25dd9ac7a..0d495191b 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-summary.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.2.9 API) - +org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.2.10 API) + @@ -65,12 +65,7 @@

Package org.owasp.dependencycheck.taskdefs

-
- - org.owasp.dependencycheck.taskdefs - - - This package includes the Ant task definitions.
+
This package includes the Ant task definitions.

See: Description

@@ -104,14 +99,7 @@

Package org.owasp.dependencycheck.taskdefs Description

-
- - org.owasp.dependencycheck.taskdefs - - - This package includes the Ant task definitions. - -
+
This package includes the Ant task definitions.
diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-tree.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-tree.html index 24edb16b6..acfb4b815 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-tree.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.taskdefs Class Hierarchy (Dependency-Check Ant Task 1.2.9 API) - +org.owasp.dependencycheck.taskdefs Class Hierarchy (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-use.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-use.html index 94e7eae3e..9092d260a 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-use.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/taskdefs/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/apidocs/overview-tree.html b/dependency-check-ant/apidocs/overview-tree.html index b5dde0c84..8f60254fa 100644 --- a/dependency-check-ant/apidocs/overview-tree.html +++ b/dependency-check-ant/apidocs/overview-tree.html @@ -2,16 +2,16 @@ - + -Class Hierarchy (Dependency-Check Ant Task 1.2.9 API) - +Class Hierarchy (Dependency-Check Ant Task 1.2.10 API) + diff --git a/dependency-check-ant/checkstyle.html b/dependency-check-ant/checkstyle.html index eb52c097c..dae57feb8 100644 --- a/dependency-check-ant/checkstyle.html +++ b/dependency-check-ant/checkstyle.html @@ -1,13 +1,13 @@ - + dependency-check-ant - Checkstyle Results @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +4

Details

@@ -272,8 +272,20 @@ Line Errors -Total number of methods is 78 (max allowed is 40). -51
+Total number of methods is 80 (max allowed is 40). +51 + +Errors +Missing a Javadoc comment. +265 + +Errors +First sentence should end with a period. +267 + +Errors +First sentence should end with a period. +276 diff --git a/dependency-check-ant/checkstyle.rss b/dependency-check-ant/checkstyle.rss index bc882077d..0688929c8 100644 --- a/dependency-check-ant/checkstyle.rss +++ b/dependency-check-ant/checkstyle.rss @@ -26,7 +26,7 @@ under the License. ©2012 - 2015 OWASP File: 18, - Errors: 1, + Errors: 4, Warnings: 0, Infos: 0 @@ -181,7 +181,7 @@ under the License. 0 - 1 + 4 diff --git a/dependency-check-ant/cobertura/frame-summary-org.owasp.dependencycheck.taskdefs.html b/dependency-check-ant/cobertura/frame-summary-org.owasp.dependencycheck.taskdefs.html index 605f51fa8..3d3f5c3ce 100644 --- a/dependency-check-ant/cobertura/frame-summary-org.owasp.dependencycheck.taskdefs.html +++ b/dependency-check-ant/cobertura/frame-summary-org.owasp.dependencycheck.taskdefs.html @@ -16,7 +16,7 @@ - +
Package # Classes Line Coverage Branch Coverage Complexity
org.owasp.dependencycheck.taskdefs2
49%
149/301
39%
54/136
2.012
org.owasp.dependencycheck.taskdefs2
49%
151/307
39%
55/138
2
- + diff --git a/dependency-check-ant/cobertura/frame-summary.html b/dependency-check-ant/cobertura/frame-summary.html index 227d1d2f4..27d81d9fb 100644 --- a/dependency-check-ant/cobertura/frame-summary.html +++ b/dependency-check-ant/cobertura/frame-summary.html @@ -16,8 +16,8 @@ - - + +
Package # Classes Line Coverage Branch Coverage Complexity
All Packages2
49%
149/301
39%
54/136
2.012
org.owasp.dependencycheck.taskdefs2
49%
149/301
39%
54/136
2.012
All Packages2
49%
151/307
39%
55/138
2
org.owasp.dependencycheck.taskdefs2
49%
151/307
39%
55/138
2
- + diff --git a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.DependencyCheckTask.html b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.DependencyCheckTask.html index c93455378..476655a9e 100644 --- a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.DependencyCheckTask.html +++ b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.DependencyCheckTask.html @@ -12,8 +12,8 @@
 
- - + +
Classes in this File Line Coverage Branch Coverage Complexity
DependencyCheckTask
48%
142/294
38%
52/134
2.012
DependencyCheckTask$ReportFormats
100%
7/7
100%
2/2
2.012
DependencyCheckTask
48%
144/300
38%
53/136
2
DependencyCheckTask$ReportFormats
100%
7/7
100%
2/2
2
 
@@ -115,7 +115,7 @@  48  
  *
 49   -
  * @author Jeremy Long <jeremy.long@owasp.org>
+
  * @author Jeremy Long
 50  
  */
 51   @@ -500,1605 +500,1651 @@  262  4
         this.autoUpdate = autoUpdate;
 263  4
     }
 264   -
     /**
-  265   -
      * The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this within the
+
 
+  265  4
     private boolean updateOnly = false;
 266   -
      * Site plugin unless the externalReport is set to true. Default is HTML.
+
 
 267   -
      */
-  268  4
     private String reportFormat = "HTML";
+
     /**
+  268   +
      * Get the value of updateOnly
 269   -
 
+
      *
 270   -
     /**
+
      * @return the value of updateOnly
 271   -
      * Get the value of reportFormat.
+
      */
 272   -
      *
-  273   -
      * @return the value of reportFormat
+
     public boolean isUpdateOnly() {
+  273  0
         return updateOnly;
 274   -
      */
+
     }
 275   -
     public String getReportFormat() {
-  276  0
         return reportFormat;
+
 
+  276   +
     /**
 277   -
     }
+
      * Set the value of updateOnly
 278   -
 
+
      *
 279   -
     /**
+
      * @param updateOnly new value of updateOnly
 280   -
      * Set the value of reportFormat.
+
      */
 281   -
      *
-  282   -
      * @param reportFormat new value of reportFormat
-  283   -
      */
+
     public void setUpdateOnly(boolean updateOnly) {
+  282  0
         this.updateOnly = updateOnly;
+  283  0
     }
 284   -
     public void setReportFormat(ReportFormats reportFormat) {
-  285  4
         this.reportFormat = reportFormat.getValue();
-  286  4
     }
+
 
+  285   +
     /**
+  286   +
      * The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this within the
 287   -
     /**
+
      * Site plugin unless the externalReport is set to true. Default is HTML.
 288   -
      * The Proxy Server.
-  289  
      */
+  289  4
     private String reportFormat = "HTML";
 290   -
     private String proxyServer;
+
 
 291   -
 
+
     /**
 292   -
     /**
+
      * Get the value of reportFormat.
 293   -
      * Get the value of proxyServer.
+
      *
 294   -
      *
+
      * @return the value of reportFormat
 295   -
      * @return the value of proxyServer
+
      */
 296   -
      */
-  297   -
     public String getProxyServer() {
-  298  0
         return proxyServer;
+
     public String getReportFormat() {
+  297  0
         return reportFormat;
+  298   +
     }
 299   -
     }
+
 
 300   -
 
+
     /**
 301   -
     /**
+
      * Set the value of reportFormat.
 302   -
      * Set the value of proxyServer.
+
      *
 303   -
      *
+
      * @param reportFormat new value of reportFormat
 304   -
      * @param server new value of proxyServer
+
      */
 305   -
      */
-  306   -
     public void setProxyServer(String server) {
-  307  0
         this.proxyServer = server;
-  308  0
     }
+
     public void setReportFormat(ReportFormats reportFormat) {
+  306  4
         this.reportFormat = reportFormat.getValue();
+  307  4
     }
+  308   +
     /**
 309   -
 
+
      * The Proxy Server.
 310   -
     /**
-  311   -
      * Get the value of proxyServer.
-  312   -
      *
-  313   -
      * @return the value of proxyServer
-  314   -
      * @deprecated use {@link org.owasp.dependencycheck.taskdefs.DependencyCheckTask#getProxyServer()} instead
-  315  
      */
-  316   -
     @Deprecated
-  317   -
     public String getProxyUrl() {
-  318  0
         return proxyServer;
-  319   -
     }
-  320   +  311   +
     private String proxyServer;
+  312  
 
-  321   +  313  
     /**
-  322   -
      * Set the value of proxyServer.
-  323   +  314   +
      * Get the value of proxyServer.
+  315  
      *
+  316   +
      * @return the value of proxyServer
+  317   +
      */
+  318   +
     public String getProxyServer() {
+  319  0
         return proxyServer;
+  320   +
     }
+  321   +
 
+  322   +
     /**
+  323   +
      * Set the value of proxyServer.
 324   -
      * @param proxyUrl new value of proxyServer
+
      *
 325   -
      * @deprecated use {@link org.owasp.dependencycheck.taskdefs.DependencyCheckTask#setProxyServer(java.lang.String)} instead
+
      * @param server new value of proxyServer
 326  
      */
 327   -
     @Deprecated
-  328   -
     public void setProxyUrl(String proxyUrl) {
-  329  0
         LOGGER.warning("A deprecated configuration option 'proxyUrl' was detected; use 'proxyServer' instead.");
-  330  0
         this.proxyServer = proxyUrl;
-  331  0
     }
+
     public void setProxyServer(String server) {
+  328  0
         this.proxyServer = server;
+  329  0
     }
+  330   +
 
+  331   +
     /**
 332   -
     /**
+
      * Get the value of proxyServer.
 333   -
      * The Proxy Port.
+
      *
 334   -
      */
+
      * @return the value of proxyServer
 335   -
     private String proxyPort;
+
      * @deprecated use {@link org.owasp.dependencycheck.taskdefs.DependencyCheckTask#getProxyServer()} instead
 336   -
 
+
      */
 337   -
     /**
+
     @Deprecated
 338   -
      * Get the value of proxyPort.
-  339   -
      *
+
     public String getProxyUrl() {
+  339  0
         return proxyServer;
 340   -
      * @return the value of proxyPort
+
     }
 341   -
      */
+
 
 342   -
     public String getProxyPort() {
-  343  0
         return proxyPort;
+
     /**
+  343   +
      * Set the value of proxyServer.
 344   -
     }
+
      *
 345   -
 
+
      * @param proxyUrl new value of proxyServer
 346   -
     /**
+
      * @deprecated use {@link org.owasp.dependencycheck.taskdefs.DependencyCheckTask#setProxyServer(java.lang.String)} instead
 347   -
      * Set the value of proxyPort.
+
      */
 348   -
      *
+
     @Deprecated
 349   -
      * @param proxyPort new value of proxyPort
-  350   -
      */
-  351   -
     public void setProxyPort(String proxyPort) {
-  352  0
         this.proxyPort = proxyPort;
-  353  0
     }
+
     public void setProxyUrl(String proxyUrl) {
+  350  0
         LOGGER.warning("A deprecated configuration option 'proxyUrl' was detected; use 'proxyServer' instead.");
+  351  0
         this.proxyServer = proxyUrl;
+  352  0
     }
+  353   +
     /**
 354   -
     /**
+
      * The Proxy Port.
 355   -
      * The Proxy username.
+
      */
 356   -
      */
+
     private String proxyPort;
 357   -
     private String proxyUsername;
+
 
 358   -
 
+
     /**
 359   -
     /**
+
      * Get the value of proxyPort.
 360   -
      * Get the value of proxyUsername.
+
      *
 361   -
      *
+
      * @return the value of proxyPort
 362   -
      * @return the value of proxyUsername
+
      */
 363   -
      */
-  364   -
     public String getProxyUsername() {
-  365  0
         return proxyUsername;
+
     public String getProxyPort() {
+  364  0
         return proxyPort;
+  365   +
     }
 366   -
     }
+
 
 367   -
 
+
     /**
 368   -
     /**
+
      * Set the value of proxyPort.
 369   -
      * Set the value of proxyUsername.
+
      *
 370   -
      *
+
      * @param proxyPort new value of proxyPort
 371   -
      * @param proxyUsername new value of proxyUsername
+
      */
 372   -
      */
-  373   -
     public void setProxyUsername(String proxyUsername) {
-  374  0
         this.proxyUsername = proxyUsername;
-  375  0
     }
+
     public void setProxyPort(String proxyPort) {
+  373  0
         this.proxyPort = proxyPort;
+  374  0
     }
+  375   +
     /**
 376   -
     /**
+
      * The Proxy username.
 377   -
      * The Proxy password.
+
      */
 378   -
      */
+
     private String proxyUsername;
 379   -
     private String proxyPassword;
+
 
 380   -
 
+
     /**
 381   -
     /**
+
      * Get the value of proxyUsername.
 382   -
      * Get the value of proxyPassword.
+
      *
 383   -
      *
+
      * @return the value of proxyUsername
 384   -
      * @return the value of proxyPassword
+
      */
 385   -
      */
-  386   -
     public String getProxyPassword() {
-  387  0
         return proxyPassword;
+
     public String getProxyUsername() {
+  386  0
         return proxyUsername;
+  387   +
     }
 388   -
     }
+
 
 389   -
 
+
     /**
 390   -
     /**
+
      * Set the value of proxyUsername.
 391   -
      * Set the value of proxyPassword.
+
      *
 392   -
      *
+
      * @param proxyUsername new value of proxyUsername
 393   -
      * @param proxyPassword new value of proxyPassword
+
      */
 394   -
      */
-  395   -
     public void setProxyPassword(String proxyPassword) {
-  396  0
         this.proxyPassword = proxyPassword;
-  397  0
     }
+
     public void setProxyUsername(String proxyUsername) {
+  395  0
         this.proxyUsername = proxyUsername;
+  396  0
     }
+  397   +
     /**
 398   -
     /**
+
      * The Proxy password.
 399   -
      * The Connection Timeout.
+
      */
 400   -
      */
+
     private String proxyPassword;
 401   -
     private String connectionTimeout;
+
 
 402   -
 
+
     /**
 403   -
     /**
+
      * Get the value of proxyPassword.
 404   -
      * Get the value of connectionTimeout.
+
      *
 405   -
      *
+
      * @return the value of proxyPassword
 406   -
      * @return the value of connectionTimeout
+
      */
 407   -
      */
-  408   -
     public String getConnectionTimeout() {
-  409  0
         return connectionTimeout;
+
     public String getProxyPassword() {
+  408  0
         return proxyPassword;
+  409   +
     }
 410   -
     }
+
 
 411   -
 
+
     /**
 412   -
     /**
+
      * Set the value of proxyPassword.
 413   -
      * Set the value of connectionTimeout.
+
      *
 414   -
      *
+
      * @param proxyPassword new value of proxyPassword
 415   -
      * @param connectionTimeout new value of connectionTimeout
+
      */
 416   -
      */
-  417   -
     public void setConnectionTimeout(String connectionTimeout) {
-  418  0
         this.connectionTimeout = connectionTimeout;
-  419  0
     }
+
     public void setProxyPassword(String proxyPassword) {
+  417  0
         this.proxyPassword = proxyPassword;
+  418  0
     }
+  419   +
     /**
 420   -
     /**
+
      * The Connection Timeout.
 421   -
      * The file path used for verbose logging.
+
      */
 422   -
      */
-  423  4
     private String logFile = null;
+
     private String connectionTimeout;
+  423   +
 
 424   -
 
+
     /**
 425   -
     /**
+
      * Get the value of connectionTimeout.
 426   -
      * Get the value of logFile.
+
      *
 427   -
      *
+
      * @return the value of connectionTimeout
 428   -
      * @return the value of logFile
+
      */
 429   -
      */
-  430   -
     public String getLogFile() {
-  431  0
         return logFile;
+
     public String getConnectionTimeout() {
+  430  0
         return connectionTimeout;
+  431   +
     }
 432   -
     }
+
 
 433   -
 
+
     /**
 434   -
     /**
+
      * Set the value of connectionTimeout.
 435   -
      * Set the value of logFile.
+
      *
 436   -
      *
+
      * @param connectionTimeout new value of connectionTimeout
 437   -
      * @param logFile new value of logFile
+
      */
 438   -
      */
-  439   -
     public void setLogFile(String logFile) {
-  440  0
         this.logFile = logFile;
-  441  0
     }
+
     public void setConnectionTimeout(String connectionTimeout) {
+  439  0
         this.connectionTimeout = connectionTimeout;
+  440  0
     }
+  441   +
     /**
 442   -
     /**
+
      * The file path used for verbose logging.
 443   -
      * The path to the suppression file.
-  444  
      */
+  444  4
     private String logFile = null;
 445   -
     private String suppressionFile;
+
 
 446   -
 
+
     /**
 447   -
     /**
+
      * Get the value of logFile.
 448   -
      * Get the value of suppressionFile.
+
      *
 449   -
      *
+
      * @return the value of logFile
 450   -
      * @return the value of suppressionFile
+
      */
 451   -
      */
-  452   -
     public String getSuppressionFile() {
-  453  0
         return suppressionFile;
+
     public String getLogFile() {
+  452  0
         return logFile;
+  453   +
     }
 454   -
     }
+
 
 455   -
 
+
     /**
 456   -
     /**
+
      * Set the value of logFile.
 457   -
      * Set the value of suppressionFile.
+
      *
 458   -
      *
+
      * @param logFile new value of logFile
 459   -
      * @param suppressionFile new value of suppressionFile
+
      */
 460   -
      */
-  461   -
     public void setSuppressionFile(String suppressionFile) {
-  462  0
         this.suppressionFile = suppressionFile;
-  463  0
     }
+
     public void setLogFile(String logFile) {
+  461  0
         this.logFile = logFile;
+  462  0
     }
+  463   +
     /**
 464   -
     /**
+
      * The path to the suppression file.
 465   -
      * flag indicating whether or not to show a summary of findings.
+
      */
 466   -
      */
-  467  4
     private boolean showSummary = true;
+
     private String suppressionFile;
+  467   +
 
 468   -
 
+
     /**
 469   -
     /**
+
      * Get the value of suppressionFile.
 470   -
      * Get the value of showSummary.
+
      *
 471   -
      *
+
      * @return the value of suppressionFile
 472   -
      * @return the value of showSummary
+
      */
 473   -
      */
-  474   -
     public boolean isShowSummary() {
-  475  0
         return showSummary;
+
     public String getSuppressionFile() {
+  474  0
         return suppressionFile;
+  475   +
     }
 476   -
     }
+
 
 477   -
 
+
     /**
 478   -
     /**
+
      * Set the value of suppressionFile.
 479   -
      * Set the value of showSummary.
+
      *
 480   -
      *
+
      * @param suppressionFile new value of suppressionFile
 481   -
      * @param showSummary new value of showSummary
+
      */
 482   -
      */
-  483   -
     public void setShowSummary(boolean showSummary) {
-  484  0
         this.showSummary = showSummary;
-  485  0
     }
+
     public void setSuppressionFile(String suppressionFile) {
+  483  0
         this.suppressionFile = suppressionFile;
+  484  0
     }
+  485   +
     /**
 486   -
 
+
      * flag indicating whether or not to show a summary of findings.
 487   -
     /**
-  488   -
      * Sets whether or not the analyzer is enabled.
+
      */
+  488  4
     private boolean showSummary = true;
 489   -
      *
-  490   -
      * @param jarAnalyzerEnabled the value of the new setting
-  491   -
      */
-  492   -
     public void setJarAnalyzerEnabled(boolean jarAnalyzerEnabled) {
-  493  0
         this.jarAnalyzerEnabled = jarAnalyzerEnabled;
-  494  0
     }
-  495   -
     /**
-  496   -
      * Whether or not the Archive Analyzer is enabled.
-  497   -
      */
-  498  4
     private boolean archiveAnalyzerEnabled = true;
-  499  
 
-  500   +  490  
     /**
-  501   -
      * Returns whether or not the analyzer is enabled.
-  502   +  491   +
      * Get the value of showSummary.
+  492  
      *
-  503   -
      * @return true if the analyzer is enabled
-  504   +  493   +
      * @return the value of showSummary
+  494  
      */
-  505   -
     public boolean isArchiveAnalyzerEnabled() {
-  506  0
         return archiveAnalyzerEnabled;
-  507   +  495   +
     public boolean isShowSummary() {
+  496  0
         return showSummary;
+  497  
     }
+  498   +
 
+  499   +
     /**
+  500   +
      * Set the value of showSummary.
+  501   +
      *
+  502   +
      * @param showSummary new value of showSummary
+  503   +
      */
+  504   +
     public void setShowSummary(boolean showSummary) {
+  505  0
         this.showSummary = showSummary;
+  506  0
     }
+  507   +
 
 508  
     /**
 509   -
      * Whether or not the .NET Assembly Analyzer is enabled.
+
      * Sets whether or not the analyzer is enabled.
 510   -
      */
-  511  4
     private boolean assemblyAnalyzerEnabled = true;
+
      *
+  511   +
      * @param jarAnalyzerEnabled the value of the new setting
 512   -
 
+
      */
 513   -
     /**
-  514   -
      * Sets whether or not the analyzer is enabled.
-  515   -
      *
+
     public void setJarAnalyzerEnabled(boolean jarAnalyzerEnabled) {
+  514  0
         this.jarAnalyzerEnabled = jarAnalyzerEnabled;
+  515  0
     }
 516   -
      * @param archiveAnalyzerEnabled the value of the new setting
+
     /**
 517   -
      */
+
      * Whether or not the Archive Analyzer is enabled.
 518   -
     public void setArchiveAnalyzerEnabled(boolean archiveAnalyzerEnabled) {
-  519  0
         this.archiveAnalyzerEnabled = archiveAnalyzerEnabled;
-  520  0
     }
+
      */
+  519  4
     private boolean archiveAnalyzerEnabled = true;
+  520   +
 
 521   -
 
+
     /**
 522   -
     /**
+
      * Returns whether or not the analyzer is enabled.
 523   -
      * Returns whether or not the analyzer is enabled.
+
      *
 524   -
      *
+
      * @return true if the analyzer is enabled
 525   -
      * @return true if the analyzer is enabled
+
      */
 526   -
      */
-  527   -
     public boolean isAssemblyAnalyzerEnabled() {
-  528  0
         return assemblyAnalyzerEnabled;
+
     public boolean isArchiveAnalyzerEnabled() {
+  527  0
         return archiveAnalyzerEnabled;
+  528   +
     }
 529   -
     }
+
     /**
 530   -
 
+
      * Whether or not the .NET Assembly Analyzer is enabled.
 531   -
     /**
-  532   -
      * Sets whether or not the analyzer is enabled.
+
      */
+  532  4
     private boolean assemblyAnalyzerEnabled = true;
 533   -
      *
+
 
 534   -
      * @param assemblyAnalyzerEnabled the value of the new setting
+
     /**
 535   -
      */
-  536   -
     public void setAssemblyAnalyzerEnabled(boolean assemblyAnalyzerEnabled) {
-  537  0
         this.assemblyAnalyzerEnabled = assemblyAnalyzerEnabled;
-  538  0
     }
-  539   -
     /**
-  540   -
      * Whether or not the .NET Nuspec Analyzer is enabled.
-  541   -
      */
-  542  4
     private boolean nuspecAnalyzerEnabled = true;
-  543   -
 
-  544   -
     /**
-  545   -
      * Returns whether or not the analyzer is enabled.
-  546   -
      *
-  547   -
      * @return true if the analyzer is enabled
-  548   -
      */
-  549   -
     public boolean isNuspecAnalyzerEnabled() {
-  550  0
         return nuspecAnalyzerEnabled;
-  551   -
     }
-  552   -
 
-  553   -
     /**
-  554  
      * Sets whether or not the analyzer is enabled.
+  536   +
      *
+  537   +
      * @param archiveAnalyzerEnabled the value of the new setting
+  538   +
      */
+  539   +
     public void setArchiveAnalyzerEnabled(boolean archiveAnalyzerEnabled) {
+  540  0
         this.archiveAnalyzerEnabled = archiveAnalyzerEnabled;
+  541  0
     }
+  542   +
 
+  543   +
     /**
+  544   +
      * Returns whether or not the analyzer is enabled.
+  545   +
      *
+  546   +
      * @return true if the analyzer is enabled
+  547   +
      */
+  548   +
     public boolean isAssemblyAnalyzerEnabled() {
+  549  0
         return assemblyAnalyzerEnabled;
+  550   +
     }
+  551   +
 
+  552   +
     /**
+  553   +
      * Sets whether or not the analyzer is enabled.
+  554   +
      *
 555   -
      *
+
      * @param assemblyAnalyzerEnabled the value of the new setting
 556   -
      * @param nuspecAnalyzerEnabled the value of the new setting
+
      */
 557   -
      */
-  558   -
     public void setNuspecAnalyzerEnabled(boolean nuspecAnalyzerEnabled) {
-  559  0
         this.nuspecAnalyzerEnabled = nuspecAnalyzerEnabled;
-  560  0
     }
+
     public void setAssemblyAnalyzerEnabled(boolean assemblyAnalyzerEnabled) {
+  558  0
         this.assemblyAnalyzerEnabled = assemblyAnalyzerEnabled;
+  559  0
     }
+  560   +
     /**
 561   -
     /**
+
      * Whether or not the .NET Nuspec Analyzer is enabled.
 562   -
      * Whether or not the central analyzer is enabled.
-  563  
      */
-  564  4
     private boolean centralAnalyzerEnabled = false;
+  563  4
     private boolean nuspecAnalyzerEnabled = true;
+  564   +
 
 565   -
 
+
     /**
 566   -
     /**
+
      * Returns whether or not the analyzer is enabled.
 567   -
      * Get the value of centralAnalyzerEnabled.
+
      *
 568   -
      *
+
      * @return true if the analyzer is enabled
 569   -
      * @return the value of centralAnalyzerEnabled
+
      */
 570   -
      */
-  571   -
     public boolean isCentralAnalyzerEnabled() {
-  572  0
         return centralAnalyzerEnabled;
+
     public boolean isNuspecAnalyzerEnabled() {
+  571  0
         return nuspecAnalyzerEnabled;
+  572   +
     }
 573   -
     }
+
 
 574   -
 
+
     /**
 575   -
     /**
+
      * Sets whether or not the analyzer is enabled.
 576   -
      * Set the value of centralAnalyzerEnabled.
+
      *
 577   -
      *
+
      * @param nuspecAnalyzerEnabled the value of the new setting
 578   -
      * @param centralAnalyzerEnabled new value of centralAnalyzerEnabled
+
      */
 579   -
      */
-  580   -
     public void setCentralAnalyzerEnabled(boolean centralAnalyzerEnabled) {
-  581  0
         this.centralAnalyzerEnabled = centralAnalyzerEnabled;
-  582  0
     }
+
     public void setNuspecAnalyzerEnabled(boolean nuspecAnalyzerEnabled) {
+  580  0
         this.nuspecAnalyzerEnabled = nuspecAnalyzerEnabled;
+  581  0
     }
+  582   +
     /**
 583   -
 
+
      * Whether or not the central analyzer is enabled.
 584   -
     /**
-  585   -
      * Whether or not the nexus analyzer is enabled.
+
      */
+  585  4
     private boolean centralAnalyzerEnabled = false;
 586   -
      */
-  587  4
     private boolean nexusAnalyzerEnabled = true;
+
 
+  587   +
     /**
 588   -
 
+
      * Get the value of centralAnalyzerEnabled.
 589   -
     /**
+
      *
 590   -
      * Get the value of nexusAnalyzerEnabled.
+
      * @return the value of centralAnalyzerEnabled
 591   -
      *
+
      */
 592   -
      * @return the value of nexusAnalyzerEnabled
-  593   -
      */
+
     public boolean isCentralAnalyzerEnabled() {
+  593  0
         return centralAnalyzerEnabled;
 594   -
     public boolean isNexusAnalyzerEnabled() {
-  595  0
         return nexusAnalyzerEnabled;
+
     }
+  595   +
 
 596   -
     }
+
     /**
 597   -
 
+
      * Set the value of centralAnalyzerEnabled.
 598   -
     /**
+
      *
 599   -
      * Set the value of nexusAnalyzerEnabled.
+
      * @param centralAnalyzerEnabled new value of centralAnalyzerEnabled
 600   -
      *
+
      */
 601   -
      * @param nexusAnalyzerEnabled new value of nexusAnalyzerEnabled
-  602   -
      */
-  603   -
     public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
-  604  0
         this.nexusAnalyzerEnabled = nexusAnalyzerEnabled;
-  605  0
     }
+
     public void setCentralAnalyzerEnabled(boolean centralAnalyzerEnabled) {
+  602  0
         this.centralAnalyzerEnabled = centralAnalyzerEnabled;
+  603  0
     }
+  604   +
 
+  605   +
     /**
 606   -
 
+
      * Whether or not the nexus analyzer is enabled.
 607   -
     /**
-  608   -
      * The URL of the Nexus server.
+
      */
+  608  4
     private boolean nexusAnalyzerEnabled = true;
 609   -
      */
+
 
 610   -
     private String nexusUrl;
+
     /**
 611   -
 
+
      * Get the value of nexusAnalyzerEnabled.
 612   -
     /**
+
      *
 613   -
      * Get the value of nexusUrl.
+
      * @return the value of nexusAnalyzerEnabled
 614   -
      *
+
      */
 615   -
      * @return the value of nexusUrl
-  616   -
      */
+
     public boolean isNexusAnalyzerEnabled() {
+  616  0
         return nexusAnalyzerEnabled;
 617   -
     public String getNexusUrl() {
-  618  0
         return nexusUrl;
+
     }
+  618   +
 
 619   -
     }
+
     /**
 620   -
 
+
      * Set the value of nexusAnalyzerEnabled.
 621   -
     /**
+
      *
 622   -
      * Set the value of nexusUrl.
+
      * @param nexusAnalyzerEnabled new value of nexusAnalyzerEnabled
 623   -
      *
+
      */
 624   -
      * @param nexusUrl new value of nexusUrl
-  625   -
      */
-  626   -
     public void setNexusUrl(String nexusUrl) {
-  627  0
         this.nexusUrl = nexusUrl;
-  628  0
     }
+
     public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
+  625  0
         this.nexusAnalyzerEnabled = nexusAnalyzerEnabled;
+  626  0
     }
+  627   +
 
+  628   +
     /**
 629   -
     /**
+
      * The URL of the Nexus server.
 630   -
      * Whether or not the defined proxy should be used when connecting to Nexus.
+
      */
 631   -
      */
-  632  4
     private boolean nexusUsesProxy = true;
+
     private String nexusUrl;
+  632   +
 
 633   -
 
+
     /**
 634   -
     /**
+
      * Get the value of nexusUrl.
 635   -
      * Get the value of nexusUsesProxy.
+
      *
 636   -
      *
+
      * @return the value of nexusUrl
 637   -
      * @return the value of nexusUsesProxy
+
      */
 638   -
      */
-  639   -
     public boolean isNexusUsesProxy() {
-  640  0
         return nexusUsesProxy;
+
     public String getNexusUrl() {
+  639  0
         return nexusUrl;
+  640   +
     }
 641   -
     }
+
 
 642   -
 
+
     /**
 643   -
     /**
+
      * Set the value of nexusUrl.
 644   -
      * Set the value of nexusUsesProxy.
+
      *
 645   -
      *
+
      * @param nexusUrl new value of nexusUrl
 646   -
      * @param nexusUsesProxy new value of nexusUsesProxy
+
      */
 647   -
      */
-  648   -
     public void setNexusUsesProxy(boolean nexusUsesProxy) {
-  649  0
         this.nexusUsesProxy = nexusUsesProxy;
-  650  0
     }
+
     public void setNexusUrl(String nexusUrl) {
+  648  0
         this.nexusUrl = nexusUrl;
+  649  0
     }
+  650   +
     /**
 651   -
 
+
      * Whether or not the defined proxy should be used when connecting to Nexus.
 652   -
     /**
-  653   -
      * The database driver name; such as org.h2.Driver.
+
      */
+  653  4
     private boolean nexusUsesProxy = true;
 654   -
      */
+
 
 655   -
     private String databaseDriverName;
+
     /**
 656   -
 
+
      * Get the value of nexusUsesProxy.
 657   -
     /**
+
      *
 658   -
      * Get the value of databaseDriverName.
+
      * @return the value of nexusUsesProxy
 659   -
      *
+
      */
 660   -
      * @return the value of databaseDriverName
-  661   -
      */
+
     public boolean isNexusUsesProxy() {
+  661  0
         return nexusUsesProxy;
 662   -
     public String getDatabaseDriverName() {
-  663  0
         return databaseDriverName;
+
     }
+  663   +
 
 664   -
     }
+
     /**
 665   -
 
+
      * Set the value of nexusUsesProxy.
 666   -
     /**
+
      *
 667   -
      * Set the value of databaseDriverName.
+
      * @param nexusUsesProxy new value of nexusUsesProxy
 668   -
      *
+
      */
 669   -
      * @param databaseDriverName new value of databaseDriverName
-  670   -
      */
-  671   -
     public void setDatabaseDriverName(String databaseDriverName) {
-  672  0
         this.databaseDriverName = databaseDriverName;
-  673  0
     }
+
     public void setNexusUsesProxy(boolean nexusUsesProxy) {
+  670  0
         this.nexusUsesProxy = nexusUsesProxy;
+  671  0
     }
+  672   +
 
+  673   +
     /**
 674   -
 
+
      * The database driver name; such as org.h2.Driver.
 675   -
     /**
+
      */
 676   -
      * The path to the database driver JAR file if it is not on the class path.
+
     private String databaseDriverName;
 677   -
      */
+
 
 678   -
     private String databaseDriverPath;
+
     /**
 679   -
 
+
      * Get the value of databaseDriverName.
 680   -
     /**
+
      *
 681   -
      * Get the value of databaseDriverPath.
+
      * @return the value of databaseDriverName
 682   -
      *
+
      */
 683   -
      * @return the value of databaseDriverPath
-  684   -
      */
+
     public String getDatabaseDriverName() {
+  684  0
         return databaseDriverName;
 685   -
     public String getDatabaseDriverPath() {
-  686  0
         return databaseDriverPath;
+
     }
+  686   +
 
 687   -
     }
+
     /**
 688   -
 
+
      * Set the value of databaseDriverName.
 689   -
     /**
+
      *
 690   -
      * Set the value of databaseDriverPath.
+
      * @param databaseDriverName new value of databaseDriverName
 691   -
      *
+
      */
 692   -
      * @param databaseDriverPath new value of databaseDriverPath
-  693   -
      */
-  694   -
     public void setDatabaseDriverPath(String databaseDriverPath) {
-  695  0
         this.databaseDriverPath = databaseDriverPath;
-  696  0
     }
+
     public void setDatabaseDriverName(String databaseDriverName) {
+  693  0
         this.databaseDriverName = databaseDriverName;
+  694  0
     }
+  695   +
 
+  696   +
     /**
 697   -
     /**
+
      * The path to the database driver JAR file if it is not on the class path.
 698   -
      * The database connection string.
+
      */
 699   -
      */
+
     private String databaseDriverPath;
 700   -
     private String connectionString;
+
 
 701   -
 
+
     /**
 702   -
     /**
+
      * Get the value of databaseDriverPath.
 703   -
      * Get the value of connectionString.
+
      *
 704   -
      *
+
      * @return the value of databaseDriverPath
 705   -
      * @return the value of connectionString
+
      */
 706   -
      */
-  707   -
     public String getConnectionString() {
-  708  0
         return connectionString;
+
     public String getDatabaseDriverPath() {
+  707  0
         return databaseDriverPath;
+  708   +
     }
 709   -
     }
+
 
 710   -
 
+
     /**
 711   -
     /**
+
      * Set the value of databaseDriverPath.
 712   -
      * Set the value of connectionString.
+
      *
 713   -
      *
+
      * @param databaseDriverPath new value of databaseDriverPath
 714   -
      * @param connectionString new value of connectionString
+
      */
 715   -
      */
-  716   -
     public void setConnectionString(String connectionString) {
-  717  0
         this.connectionString = connectionString;
-  718  0
     }
+
     public void setDatabaseDriverPath(String databaseDriverPath) {
+  716  0
         this.databaseDriverPath = databaseDriverPath;
+  717  0
     }
+  718   +
     /**
 719   -
     /**
+
      * The database connection string.
 720   -
      * The user name for connecting to the database.
+
      */
 721   -
      */
+
     private String connectionString;
 722   -
     private String databaseUser;
+
 
 723   -
 
+
     /**
 724   -
     /**
+
      * Get the value of connectionString.
 725   -
      * Get the value of databaseUser.
+
      *
 726   -
      *
+
      * @return the value of connectionString
 727   -
      * @return the value of databaseUser
+
      */
 728   -
      */
-  729   -
     public String getDatabaseUser() {
-  730  0
         return databaseUser;
+
     public String getConnectionString() {
+  729  0
         return connectionString;
+  730   +
     }
 731   -
     }
+
 
 732   -
 
+
     /**
 733   -
     /**
+
      * Set the value of connectionString.
 734   -
      * Set the value of databaseUser.
+
      *
 735   -
      *
+
      * @param connectionString new value of connectionString
 736   -
      * @param databaseUser new value of databaseUser
+
      */
 737   -
      */
-  738   -
     public void setDatabaseUser(String databaseUser) {
-  739  0
         this.databaseUser = databaseUser;
-  740  0
     }
+
     public void setConnectionString(String connectionString) {
+  738  0
         this.connectionString = connectionString;
+  739  0
     }
+  740   +
     /**
 741   -
 
+
      * The user name for connecting to the database.
 742   -
     /**
+
      */
 743   -
      * The password to use when connecting to the database.
+
     private String databaseUser;
 744   -
      */
+
 
 745   -
     private String databasePassword;
+
     /**
 746   -
 
+
      * Get the value of databaseUser.
 747   -
     /**
+
      *
 748   -
      * Get the value of databasePassword.
+
      * @return the value of databaseUser
 749   -
      *
+
      */
 750   -
      * @return the value of databasePassword
-  751   -
      */
+
     public String getDatabaseUser() {
+  751  0
         return databaseUser;
 752   -
     public String getDatabasePassword() {
-  753  0
         return databasePassword;
+
     }
+  753   +
 
 754   -
     }
+
     /**
 755   -
 
+
      * Set the value of databaseUser.
 756   -
     /**
+
      *
 757   -
      * Set the value of databasePassword.
+
      * @param databaseUser new value of databaseUser
 758   -
      *
+
      */
 759   -
      * @param databasePassword new value of databasePassword
-  760   -
      */
-  761   -
     public void setDatabasePassword(String databasePassword) {
-  762  0
         this.databasePassword = databasePassword;
-  763  0
     }
+
     public void setDatabaseUser(String databaseUser) {
+  760  0
         this.databaseUser = databaseUser;
+  761  0
     }
+  762   +
 
+  763   +
     /**
 764   -
 
+
      * The password to use when connecting to the database.
 765   -
     /**
+
      */
 766   -
      * Additional ZIP File extensions to add analyze. This should be a comma-separated list of file extensions to treat like ZIP
+
     private String databasePassword;
 767   -
      * files.
+
 
 768   -
      */
+
     /**
 769   -
     private String zipExtensions;
+
      * Get the value of databasePassword.
 770   -
 
+
      *
 771   -
     /**
+
      * @return the value of databasePassword
 772   -
      * Get the value of zipExtensions.
+
      */
 773   -
      *
-  774   -
      * @return the value of zipExtensions
+
     public String getDatabasePassword() {
+  774  0
         return databasePassword;
 775   -
      */
+
     }
 776   -
     public String getZipExtensions() {
-  777  0
         return zipExtensions;
+
 
+  777   +
     /**
 778   -
     }
+
      * Set the value of databasePassword.
 779   -
 
+
      *
 780   -
     /**
+
      * @param databasePassword new value of databasePassword
 781   -
      * Set the value of zipExtensions.
+
      */
 782   -
      *
-  783   -
      * @param zipExtensions new value of zipExtensions
-  784   -
      */
+
     public void setDatabasePassword(String databasePassword) {
+  783  0
         this.databasePassword = databasePassword;
+  784  0
     }
 785   -
     public void setZipExtensions(String zipExtensions) {
-  786  0
         this.zipExtensions = zipExtensions;
-  787  0
     }
+
 
+  786   +
     /**
+  787   +
      * Additional ZIP File extensions to add analyze. This should be a comma-separated list of file extensions to treat like ZIP
 788   -
 
+
      * files.
 789   -
     /**
+
      */
 790   -
      * The url for the modified NVD CVE (1.2 schema).
+
     private String zipExtensions;
 791   -
      */
+
 
 792   -
     private String cveUrl12Modified;
+
     /**
 793   -
 
+
      * Get the value of zipExtensions.
 794   -
     /**
+
      *
 795   -
      * Get the value of cveUrl12Modified.
+
      * @return the value of zipExtensions
 796   -
      *
+
      */
 797   -
      * @return the value of cveUrl12Modified
-  798   -
      */
+
     public String getZipExtensions() {
+  798  0
         return zipExtensions;
 799   -
     public String getCveUrl12Modified() {
-  800  0
         return cveUrl12Modified;
+
     }
+  800   +
 
 801   -
     }
+
     /**
 802   -
 
+
      * Set the value of zipExtensions.
 803   -
     /**
+
      *
 804   -
      * Set the value of cveUrl12Modified.
+
      * @param zipExtensions new value of zipExtensions
 805   -
      *
+
      */
 806   -
      * @param cveUrl12Modified new value of cveUrl12Modified
-  807   -
      */
-  808   -
     public void setCveUrl12Modified(String cveUrl12Modified) {
-  809  0
         this.cveUrl12Modified = cveUrl12Modified;
-  810  0
     }
+
     public void setZipExtensions(String zipExtensions) {
+  807  0
         this.zipExtensions = zipExtensions;
+  808  0
     }
+  809   +
 
+  810   +
     /**
 811   -
 
+
      * The url for the modified NVD CVE (1.2 schema).
 812   -
     /**
+
      */
 813   -
      * The url for the modified NVD CVE (2.0 schema).
+
     private String cveUrl12Modified;
 814   -
      */
+
 
 815   -
     private String cveUrl20Modified;
+
     /**
 816   -
 
+
      * Get the value of cveUrl12Modified.
 817   -
     /**
+
      *
 818   -
      * Get the value of cveUrl20Modified.
+
      * @return the value of cveUrl12Modified
 819   -
      *
+
      */
 820   -
      * @return the value of cveUrl20Modified
-  821   -
      */
+
     public String getCveUrl12Modified() {
+  821  0
         return cveUrl12Modified;
 822   -
     public String getCveUrl20Modified() {
-  823  0
         return cveUrl20Modified;
+
     }
+  823   +
 
 824   -
     }
+
     /**
 825   -
 
+
      * Set the value of cveUrl12Modified.
 826   -
     /**
+
      *
 827   -
      * Set the value of cveUrl20Modified.
+
      * @param cveUrl12Modified new value of cveUrl12Modified
 828   -
      *
+
      */
 829   -
      * @param cveUrl20Modified new value of cveUrl20Modified
-  830   -
      */
-  831   -
     public void setCveUrl20Modified(String cveUrl20Modified) {
-  832  0
         this.cveUrl20Modified = cveUrl20Modified;
-  833  0
     }
+
     public void setCveUrl12Modified(String cveUrl12Modified) {
+  830  0
         this.cveUrl12Modified = cveUrl12Modified;
+  831  0
     }
+  832   +
 
+  833   +
     /**
 834   -
 
+
      * The url for the modified NVD CVE (2.0 schema).
 835   -
     /**
+
      */
 836   -
      * Base Data Mirror URL for CVE 1.2.
+
     private String cveUrl20Modified;
 837   -
      */
+
 
 838   -
     private String cveUrl12Base;
+
     /**
 839   -
 
+
      * Get the value of cveUrl20Modified.
 840   -
     /**
+
      *
 841   -
      * Get the value of cveUrl12Base.
+
      * @return the value of cveUrl20Modified
 842   -
      *
+
      */
 843   -
      * @return the value of cveUrl12Base
-  844   -
      */
+
     public String getCveUrl20Modified() {
+  844  0
         return cveUrl20Modified;
 845   -
     public String getCveUrl12Base() {
-  846  0
         return cveUrl12Base;
+
     }
+  846   +
 
 847   -
     }
+
     /**
 848   -
 
+
      * Set the value of cveUrl20Modified.
 849   -
     /**
+
      *
 850   -
      * Set the value of cveUrl12Base.
+
      * @param cveUrl20Modified new value of cveUrl20Modified
 851   -
      *
+
      */
 852   -
      * @param cveUrl12Base new value of cveUrl12Base
-  853   -
      */
-  854   -
     public void setCveUrl12Base(String cveUrl12Base) {
-  855  0
         this.cveUrl12Base = cveUrl12Base;
-  856  0
     }
+
     public void setCveUrl20Modified(String cveUrl20Modified) {
+  853  0
         this.cveUrl20Modified = cveUrl20Modified;
+  854  0
     }
+  855   +
 
+  856   +
     /**
 857   -
 
+
      * Base Data Mirror URL for CVE 1.2.
 858   -
     /**
+
      */
 859   -
      * Data Mirror URL for CVE 2.0.
+
     private String cveUrl12Base;
 860   -
      */
+
 
 861   -
     private String cveUrl20Base;
+
     /**
 862   -
 
+
      * Get the value of cveUrl12Base.
 863   -
     /**
+
      *
 864   -
      * Get the value of cveUrl20Base.
+
      * @return the value of cveUrl12Base
 865   -
      *
+
      */
 866   -
      * @return the value of cveUrl20Base
-  867   -
      */
+
     public String getCveUrl12Base() {
+  867  0
         return cveUrl12Base;
 868   -
     public String getCveUrl20Base() {
-  869  0
         return cveUrl20Base;
+
     }
+  869   +
 
 870   -
     }
+
     /**
 871   -
 
+
      * Set the value of cveUrl12Base.
 872   -
     /**
+
      *
 873   -
      * Set the value of cveUrl20Base.
+
      * @param cveUrl12Base new value of cveUrl12Base
 874   -
      *
+
      */
 875   -
      * @param cveUrl20Base new value of cveUrl20Base
-  876   -
      */
-  877   -
     public void setCveUrl20Base(String cveUrl20Base) {
-  878  0
         this.cveUrl20Base = cveUrl20Base;
-  879  0
     }
+
     public void setCveUrl12Base(String cveUrl12Base) {
+  876  0
         this.cveUrl12Base = cveUrl12Base;
+  877  0
     }
+  878   +
 
+  879   +
     /**
 880   -
     /**
+
      * Data Mirror URL for CVE 2.0.
 881   -
      * The path to Mono for .NET assembly analysis on non-windows systems.
+
      */
 882   -
      */
+
     private String cveUrl20Base;
 883   -
     private String pathToMono;
+
 
 884   -
 
+
     /**
 885   -
     /**
+
      * Get the value of cveUrl20Base.
 886   -
      * Get the value of pathToMono.
+
      *
 887   -
      *
+
      * @return the value of cveUrl20Base
 888   -
      * @return the value of pathToMono
+
      */
 889   -
      */
-  890   -
     public String getPathToMono() {
-  891  0
         return pathToMono;
-  892   +
     public String getCveUrl20Base() {
+  890  0
         return cveUrl20Base;
+  891  
     }
+  892   +
 
 893   -
 
+
     /**
 894   -
     /**
+
      * Set the value of cveUrl20Base.
 895   -
      * Set the value of pathToMono.
+
      *
 896   -
      *
+
      * @param cveUrl20Base new value of cveUrl20Base
 897   -
      * @param pathToMono new value of pathToMono
+
      */
 898   -
      */
-  899   -
     public void setPathToMono(String pathToMono) {
-  900  0
         this.pathToMono = pathToMono;
-  901  0
     }
+
     public void setCveUrl20Base(String cveUrl20Base) {
+  899  0
         this.cveUrl20Base = cveUrl20Base;
+  900  0
     }
+  901   +
     /**
 902   -
 
+
      * The path to Mono for .NET assembly analysis on non-windows systems.
 903   -
     @Override
+
      */
 904   -
     public void execute() throws BuildException {
-  905  4
         final InputStream in = DependencyCheckTask.class.getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
-  906  4
         LogUtils.prepareLogger(in, logFile);
+
     private String pathToMono;
+  905   +
 
+  906   +
     /**
 907   -
 
-  908  4
         dealWithReferences();
-  909  4
         validateConfiguration();
-  910  3
         populateSettings();
+
      * Get the value of pathToMono.
+  908   +
      *
+  909   +
      * @return the value of pathToMono
+  910   +
      */
 911   -
 
-  912  3
         Engine engine = null;
+
     public String getPathToMono() {
+  912  0
         return pathToMono;
 913   -
         try {
-  914  3
             engine = new Engine(DependencyCheckTask.class.getClassLoader());
+
     }
+  914   +
 
 915   -
 
-  916  3
             for (Resource resource : path) {
-  917  5
                 final FileProvider provider = resource.as(FileProvider.class);
-  918  5
                 if (provider != null) {
-  919  5
                     final File file = provider.getFile();
-  920  5
                     if (file != null && file.exists()) {
-  921  4
                         engine.scan(file);
-  922   -
                     }
+
     /**
+  916   +
      * Set the value of pathToMono.
+  917   +
      *
+  918   +
      * @param pathToMono new value of pathToMono
+  919   +
      */
+  920   +
     public void setPathToMono(String pathToMono) {
+  921  0
         this.pathToMono = pathToMono;
+  922  0
     }
 923   -
                 }
-  924  5
             }
+
 
+  924   +
     @Override
 925   -
             try {
-  926  3
                 engine.analyzeDependencies();
-  927  3
                 DatabaseProperties prop = null;
-  928  3
                 CveDB cve = null;
-  929   -
                 try {
-  930  3
                     cve = new CveDB();
-  931  3
                     cve.open();
-  932  3
                     prop = cve.getDatabaseProperties();
-  933  0
                 } catch (DatabaseException ex) {
-  934  0
                     LOGGER.log(Level.FINE, "Unable to retrieve DB Properties", ex);
-  935   -
                 } finally {
-  936  3
                     if (cve != null) {
-  937  3
                         cve.close();
-  938   -
                     }
-  939   -
                 }
-  940  3
                 final ReportGenerator reporter = new ReportGenerator(applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
-  941  3
                 reporter.generateReports(reportOutputDirectory, reportFormat);
-  942   +
     public void execute() throws BuildException {
+  926  4
         final InputStream in = DependencyCheckTask.class.getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
+  927  4
         LogUtils.prepareLogger(in, logFile);
+  928  
 
-  943  3
                 if (this.failBuildOnCVSS <= 10) {
-  944  0
                     checkForFailure(engine.getDependencies());
-  945   -
                 }
-  946  3
                 if (this.showSummary) {
-  947  3
                     showSummary(engine.getDependencies());
-  948   -
                 }
-  949  0
             } catch (IOException ex) {
-  950  0
                 LOGGER.log(Level.FINE, "Unable to generate dependency-check report", ex);
-  951  0
                 throw new BuildException("Unable to generate dependency-check report", ex);
-  952  0
             } catch (Exception ex) {
-  953  0
                 LOGGER.log(Level.FINE, "An exception occurred; unable to continue task", ex);
-  954  0
                 throw new BuildException("An exception occurred; unable to continue task", ex);
-  955  3
             }
-  956  0
         } catch (DatabaseException ex) {
-  957  0
             LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped");
-  958  0
             LOGGER.log(Level.FINE, "", ex);
-  959   -
         } finally {
-  960  3
             Settings.cleanup(true);
-  961  3
             if (engine != null) {
-  962  3
                 engine.cleanup();
-  963   -
             }
-  964   -
         }
-  965  3
     }
-  966   +  929  4
         dealWithReferences();
+  930  4
         validateConfiguration();
+  931  3
         populateSettings();
+  932  
 
-  967   -
     /**
-  968   -
      * Validate the configuration to ensure the parameters have been properly configured/initialized.
-  969   -
      *
-  970   -
      * @throws BuildException if the task was not configured correctly.
-  971   -
      */
-  972   -
     private void validateConfiguration() throws BuildException {
-  973  4
         if (path == null) {
-  974  1
             throw new BuildException("No project dependencies have been defined to analyze.");
-  975   -
         }
-  976  3
         if (failBuildOnCVSS < 0 || failBuildOnCVSS > 11) {
-  977  0
             throw new BuildException("Invalid configuration, failBuildOnCVSS must be between 0 and 11.");
-  978   -
         }
-  979  3
     }
-  980   -
 
-  981   -
     /**
-  982   -
      * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties
-  983   -
      * required to change the proxy server, port, and connection timeout.
-  984   -
      */
-  985   -
     private void populateSettings() {
-  986  3
         Settings.initialize();
-  987  3
         InputStream taskProperties = null;
-  988   +  933  3
         Engine engine = null;
+  934  
         try {
-  989  3
             taskProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
-  990  3
             Settings.mergeProperties(taskProperties);
-  991  0
         } catch (IOException ex) {
-  992  0
             LOGGER.log(Level.WARNING, "Unable to load the dependency-check ant task.properties file.");
-  993  0
             LOGGER.log(Level.FINE, null, ex);
-  994   -
         } finally {
-  995  3
             if (taskProperties != null) {
-  996   +  935  3
             engine = new Engine(DependencyCheckTask.class.getClassLoader());
+  936   +
             //todo - should this be its own task?
+  937  3
             if (updateOnly) {
+  938  0
                 engine.doUpdates();
+  939   +
             } else {
+  940  
                 try {
-  997  3
                     taskProperties.close();
-  998  0
                 } catch (IOException ex) {
-  999  0
                     LOGGER.log(Level.FINEST, null, ex);
-  1000  3
                 }
-  1001   -
             }
-  1002   -
         }
-  1003  3
         if (dataDirectory != null) {
-  1004  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
-  1005   -
         } else {
-  1006  3
             final File jarPath = new File(DependencyCheckTask.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-  1007  3
             final File base = jarPath.getParentFile();
-  1008  3
             final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
-  1009  3
             final File dataDir = new File(base, sub);
-  1010  3
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-  1011   -
         }
-  1012   +  941  3
                     for (Resource resource : path) {
+  942  5
                         final FileProvider provider = resource.as(FileProvider.class);
+  943  5
                         if (provider != null) {
+  944  5
                             final File file = provider.getFile();
+  945  5
                             if (file != null && file.exists()) {
+  946  4
                                 engine.scan(file);
+  947   +
                             }
+  948   +
                         }
+  949  5
                     }
+  950  
 
-  1013  3
         Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-  1014   -
 
-  1015  3
         if (proxyServer != null && !proxyServer.isEmpty()) {
-  1016  0
             Settings.setString(Settings.KEYS.PROXY_SERVER, proxyServer);
-  1017   -
         }
-  1018  3
         if (proxyPort != null && !proxyPort.isEmpty()) {
-  1019  0
             Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
-  1020   -
         }
-  1021  3
         if (proxyUsername != null && !proxyUsername.isEmpty()) {
-  1022  0
             Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
-  1023   -
         }
-  1024  3
         if (proxyPassword != null && !proxyPassword.isEmpty()) {
-  1025  0
             Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
-  1026   -
         }
-  1027  3
         if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
-  1028  0
             Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
-  1029   -
         }
-  1030  3
         if (suppressionFile != null && !suppressionFile.isEmpty()) {
-  1031  0
             Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
-  1032   -
         }
-  1033   -
 
-  1034   -
         //File Type Analyzer Settings
-  1035   -
         //JAR ANALYZER
-  1036  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
-  1037   -
         //NUSPEC ANALYZER
-  1038  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
-  1039   -
         //CENTRAL ANALYZER
-  1040  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled);
-  1041   -
         //NEXUS ANALYZER
-  1042  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
-  1043  3
         if (nexusUrl != null && !nexusUrl.isEmpty()) {
-  1044  0
             Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
-  1045   -
         }
-  1046  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
-  1047   -
         //ARCHIVE ANALYZER
-  1048  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
-  1049  3
         if (zipExtensions != null && !zipExtensions.isEmpty()) {
-  1050  0
             Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
-  1051   -
         }
-  1052   -
         //ASSEMBLY ANALYZER
-  1053  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
-  1054  3
         if (pathToMono != null && !pathToMono.isEmpty()) {
-  1055  0
             Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
-  1056   -
         }
-  1057   -
 
-  1058  3
         if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
-  1059  0
             Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
-  1060   -
         }
-  1061  3
         if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
-  1062  0
             Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
-  1063   -
         }
-  1064  3
         if (connectionString != null && !connectionString.isEmpty()) {
-  1065  0
             Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
-  1066   -
         }
-  1067  3
         if (databaseUser != null && !databaseUser.isEmpty()) {
-  1068  0
             Settings.setString(Settings.KEYS.DB_USER, databaseUser);
-  1069   -
         }
-  1070  3
         if (databasePassword != null && !databasePassword.isEmpty()) {
-  1071  0
             Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
-  1072   -
         }
-  1073  3
         if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
-  1074  0
             Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
-  1075   -
         }
-  1076  3
         if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
-  1077  0
             Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
-  1078   -
         }
-  1079  3
         if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
-  1080  0
             Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
-  1081   -
         }
-  1082  3
         if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
-  1083  0
             Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
-  1084   -
         }
-  1085  3
     }
-  1086   -
 
-  1087   -
     /**
-  1088   -
      * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the
-  1089   -
      * configuration.
-  1090   -
      *
-  1091   -
      * @param dependencies the list of dependency objects
-  1092   -
      * @throws BuildException thrown if a CVSS score is found that is higher then the threshold set
-  1093   -
      */
-  1094   -
     private void checkForFailure(List<Dependency> dependencies) throws BuildException {
-  1095  0
         final StringBuilder ids = new StringBuilder();
-  1096  0
         for (Dependency d : dependencies) {
-  1097  0
             for (Vulnerability v : d.getVulnerabilities()) {
-  1098  0
                 if (v.getCvssScore() >= failBuildOnCVSS) {
-  1099  0
                     if (ids.length() == 0) {
-  1100  0
                         ids.append(v.getName());
-  1101   -
                     } else {
-  1102  0
                         ids.append(", ").append(v.getName());
-  1103   +  951  3
                     engine.analyzeDependencies();
+  952  3
                     DatabaseProperties prop = null;
+  953  3
                     CveDB cve = null;
+  954   +
                     try {
+  955  3
                         cve = new CveDB();
+  956  3
                         cve.open();
+  957  3
                         prop = cve.getDatabaseProperties();
+  958  0
                     } catch (DatabaseException ex) {
+  959  0
                         LOGGER.log(Level.FINE, "Unable to retrieve DB Properties", ex);
+  960   +
                     } finally {
+  961  3
                         if (cve != null) {
+  962  3
                             cve.close();
+  963   +
                         }
+  964  
                     }
-  1104   -
                 }
-  1105  0
             }
-  1106  0
         }
-  1107  0
         if (ids.length() > 0) {
-  1108  0
             final String msg = String.format("%n%nDependency-Check Failure:%n"
-  1109   -
                     + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
-  1110   -
                     + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString());
-  1111  0
             throw new BuildException(msg);
-  1112   -
         }
-  1113  0
     }
-  1114   +  965  3
                     final ReportGenerator reporter = new ReportGenerator(applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
+  966  3
                     reporter.generateReports(reportOutputDirectory, reportFormat);
+  967  
 
-  1115   +  968  3
                     if (this.failBuildOnCVSS <= 10) {
+  969  0
                         checkForFailure(engine.getDependencies());
+  970   +
                     }
+  971  3
                     if (this.showSummary) {
+  972  3
                         showSummary(engine.getDependencies());
+  973   +
                     }
+  974  0
                 } catch (IOException ex) {
+  975  0
                     LOGGER.log(Level.FINE, "Unable to generate dependency-check report", ex);
+  976  0
                     throw new BuildException("Unable to generate dependency-check report", ex);
+  977  0
                 } catch (Exception ex) {
+  978  0
                     LOGGER.log(Level.FINE, "An exception occurred; unable to continue task", ex);
+  979  0
                     throw new BuildException("An exception occurred; unable to continue task", ex);
+  980  3
                 }
+  981   +
             }
+  982  0
         } catch (DatabaseException ex) {
+  983  0
             LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped");
+  984  0
             LOGGER.log(Level.FINE, "", ex);
+  985   +
         } finally {
+  986  3
             Settings.cleanup(true);
+  987  3
             if (engine != null) {
+  988  3
                 engine.cleanup();
+  989   +
             }
+  990   +
         }
+  991  3
     }
+  992   +
 
+  993  
     /**
-  1116   -
      * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries.
-  1117   +  994   +
      * Validate the configuration to ensure the parameters have been properly configured/initialized.
+  995  
      *
+  996   +
      * @throws BuildException if the task was not configured correctly.
+  997   +
      */
+  998   +
     private void validateConfiguration() throws BuildException {
+  999  4
         if (path == null) {
+  1000  1
             throw new BuildException("No project dependencies have been defined to analyze.");
+  1001   +
         }
+  1002  3
         if (failBuildOnCVSS < 0 || failBuildOnCVSS > 11) {
+  1003  0
             throw new BuildException("Invalid configuration, failBuildOnCVSS must be between 0 and 11.");
+  1004   +
         }
+  1005  3
     }
+  1006   +
 
+  1007   +
     /**
+  1008   +
      * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties
+  1009   +
      * required to change the proxy server, port, and connection timeout.
+  1010   +
      */
+  1011   +
     private void populateSettings() {
+  1012  3
         Settings.initialize();
+  1013  3
         InputStream taskProperties = null;
+  1014   +
         try {
+  1015  3
             taskProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
+  1016  3
             Settings.mergeProperties(taskProperties);
+  1017  0
         } catch (IOException ex) {
+  1018  0
             LOGGER.log(Level.WARNING, "Unable to load the dependency-check ant task.properties file.");
+  1019  0
             LOGGER.log(Level.FINE, null, ex);
+  1020   +
         } finally {
+  1021  3
             if (taskProperties != null) {
+  1022   +
                 try {
+  1023  3
                     taskProperties.close();
+  1024  0
                 } catch (IOException ex) {
+  1025  0
                     LOGGER.log(Level.FINEST, null, ex);
+  1026  3
                 }
+  1027   +
             }
+  1028   +
         }
+  1029  3
         if (dataDirectory != null) {
+  1030  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
+  1031   +
         } else {
+  1032  3
             final File jarPath = new File(DependencyCheckTask.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+  1033  3
             final File base = jarPath.getParentFile();
+  1034  3
             final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
+  1035  3
             final File dataDir = new File(base, sub);
+  1036  3
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+  1037   +
         }
+  1038   +
 
+  1039  3
         Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+  1040   +
 
+  1041  3
         if (proxyServer != null && !proxyServer.isEmpty()) {
+  1042  0
             Settings.setString(Settings.KEYS.PROXY_SERVER, proxyServer);
+  1043   +
         }
+  1044  3
         if (proxyPort != null && !proxyPort.isEmpty()) {
+  1045  0
             Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+  1046   +
         }
+  1047  3
         if (proxyUsername != null && !proxyUsername.isEmpty()) {
+  1048  0
             Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
+  1049   +
         }
+  1050  3
         if (proxyPassword != null && !proxyPassword.isEmpty()) {
+  1051  0
             Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
+  1052   +
         }
+  1053  3
         if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+  1054  0
             Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+  1055   +
         }
+  1056  3
         if (suppressionFile != null && !suppressionFile.isEmpty()) {
+  1057  0
             Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
+  1058   +
         }
+  1059   +
 
+  1060   +
         //File Type Analyzer Settings
+  1061   +
         //JAR ANALYZER
+  1062  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
+  1063   +
         //NUSPEC ANALYZER
+  1064  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
+  1065   +
         //CENTRAL ANALYZER
+  1066  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled);
+  1067   +
         //NEXUS ANALYZER
+  1068  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
+  1069  3
         if (nexusUrl != null && !nexusUrl.isEmpty()) {
+  1070  0
             Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+  1071   +
         }
+  1072  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+  1073   +
         //ARCHIVE ANALYZER
+  1074  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
+  1075  3
         if (zipExtensions != null && !zipExtensions.isEmpty()) {
+  1076  0
             Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
+  1077   +
         }
+  1078   +
         //ASSEMBLY ANALYZER
+  1079  3
         Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
+  1080  3
         if (pathToMono != null && !pathToMono.isEmpty()) {
+  1081  0
             Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
+  1082   +
         }
+  1083   +
 
+  1084  3
         if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+  1085  0
             Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+  1086   +
         }
+  1087  3
         if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+  1088  0
             Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+  1089   +
         }
+  1090  3
         if (connectionString != null && !connectionString.isEmpty()) {
+  1091  0
             Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+  1092   +
         }
+  1093  3
         if (databaseUser != null && !databaseUser.isEmpty()) {
+  1094  0
             Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+  1095   +
         }
+  1096  3
         if (databasePassword != null && !databasePassword.isEmpty()) {
+  1097  0
             Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
+  1098   +
         }
+  1099  3
         if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
+  1100  0
             Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
+  1101   +
         }
+  1102  3
         if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
+  1103  0
             Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
+  1104   +
         }
+  1105  3
         if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
+  1106  0
             Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
+  1107   +
         }
+  1108  3
         if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
+  1109  0
             Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
+  1110   +
         }
+  1111  3
     }
+  1112   +
 
+  1113   +
     /**
+  1114   +
      * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the
+  1115   +
      * configuration.
+  1116   +
      *
+  1117   +
      * @param dependencies the list of dependency objects
 1118   -
      * @param dependencies a list of dependency objects
+
      * @throws BuildException thrown if a CVSS score is found that is higher then the threshold set
 1119  
      */
 1120   -
     private void showSummary(List<Dependency> dependencies) {
-  1121  3
         final StringBuilder summary = new StringBuilder();
-  1122  3
         for (Dependency d : dependencies) {
-  1123  5
             boolean firstEntry = true;
-  1124  5
             final StringBuilder ids = new StringBuilder();
-  1125  5
             for (Vulnerability v : d.getVulnerabilities()) {
-  1126  22
                 if (firstEntry) {
-  1127  4
                     firstEntry = false;
-  1128   -
                 } else {
-  1129  18
                     ids.append(", ");
+
     private void checkForFailure(List<Dependency> dependencies) throws BuildException {
+  1121  0
         final StringBuilder ids = new StringBuilder();
+  1122  0
         for (Dependency d : dependencies) {
+  1123  0
             for (Vulnerability v : d.getVulnerabilities()) {
+  1124  0
                 if (v.getCvssScore() >= failBuildOnCVSS) {
+  1125  0
                     if (ids.length() == 0) {
+  1126  0
                         ids.append(v.getName());
+  1127   +
                     } else {
+  1128  0
                         ids.append(", ").append(v.getName());
+  1129   +
                     }
 1130  
                 }
-  1131  22
                 ids.append(v.getName());
-  1132  22
             }
-  1133  5
             if (ids.length() > 0) {
-  1134  4
                 summary.append(d.getFileName()).append(" (");
-  1135  4
                 firstEntry = true;
-  1136  4
                 for (Identifier id : d.getIdentifiers()) {
-  1137  8
                     if (firstEntry) {
-  1138  4
                         firstEntry = false;
-  1139   -
                     } else {
-  1140  4
                         summary.append(", ");
+  1131  0
             }
+  1132  0
         }
+  1133  0
         if (ids.length() > 0) {
+  1134  0
             final String msg = String.format("%n%nDependency-Check Failure:%n"
+  1135   +
                     + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
+  1136   +
                     + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString());
+  1137  0
             throw new BuildException(msg);
+  1138   +
         }
+  1139  0
     }
+  1140   +
 
 1141   -
                     }
-  1142  8
                     summary.append(id.getValue());
-  1143  8
                 }
-  1144  4
                 summary.append(") : ").append(ids).append(NEW_LINE);
-  1145   -
             }
-  1146  5
         }
-  1147  3
         if (summary.length() > 0) {
-  1148  3
             final String msg = String.format("%n%n"
-  1149   -
                     + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
-  1150   -
                     + "%n%nSee the dependency-check report for more details.%n%n", summary.toString());
-  1151  3
             LOGGER.log(Level.WARNING, msg);
-  1152   -
         }
-  1153  3
     }
-  1154   -
 
-  1155  
     /**
-  1156   -
      * An enumeration of supported report formats: "ALL", "HTML", "XML", "VULN", etc..
-  1157   -
      */
-  1158  4
     public static class ReportFormats extends EnumeratedAttribute {
-  1159   -
 
-  1160   -
         /**
-  1161   -
          * Returns the list of values for the report format.
-  1162   -
          *
-  1163   -
          * @return the list of values for the report format
-  1164   -
          */
-  1165   -
         @Override
-  1166   -
         public String[] getValues() {
-  1167  4
             int i = 0;
-  1168  4
             final Format[] formats = Format.values();
-  1169  4
             final String[] values = new String[formats.length];
-  1170  20
             for (Format format : formats) {
-  1171  16
                 values[i++] = format.name();
-  1172   -
             }
-  1173  4
             return values;
-  1174   -
         }
-  1175   -
     }
-  1176   -
 
-  1177   -
     /**
-  1178   -
      * Whether or not the Jar Analyzer is enabled.
-  1179   -
      */
-  1180  4
     private boolean jarAnalyzerEnabled = true;
-  1181   -
 
-  1182   -
     /**
-  1183   -
      * Returns whether or not the analyzer is enabled.
-  1184   +  1142   +
      * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries.
+  1143  
      *
-  1185   -
      * @return true if the analyzer is enabled
-  1186   +  1144   +
      * @param dependencies a list of dependency objects
+  1145  
      */
+  1146   +
     private void showSummary(List<Dependency> dependencies) {
+  1147  3
         final StringBuilder summary = new StringBuilder();
+  1148  3
         for (Dependency d : dependencies) {
+  1149  5
             boolean firstEntry = true;
+  1150  5
             final StringBuilder ids = new StringBuilder();
+  1151  5
             for (Vulnerability v : d.getVulnerabilities()) {
+  1152  22
                 if (firstEntry) {
+  1153  4
                     firstEntry = false;
+  1154   +
                 } else {
+  1155  18
                     ids.append(", ");
+  1156   +
                 }
+  1157  22
                 ids.append(v.getName());
+  1158  22
             }
+  1159  5
             if (ids.length() > 0) {
+  1160  4
                 summary.append(d.getFileName()).append(" (");
+  1161  4
                 firstEntry = true;
+  1162  4
                 for (Identifier id : d.getIdentifiers()) {
+  1163  8
                     if (firstEntry) {
+  1164  4
                         firstEntry = false;
+  1165   +
                     } else {
+  1166  4
                         summary.append(", ");
+  1167   +
                     }
+  1168  8
                     summary.append(id.getValue());
+  1169  8
                 }
+  1170  4
                 summary.append(") : ").append(ids).append(NEW_LINE);
+  1171   +
             }
+  1172  5
         }
+  1173  3
         if (summary.length() > 0) {
+  1174  3
             final String msg = String.format("%n%n"
+  1175   +
                     + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
+  1176   +
                     + "%n%nSee the dependency-check report for more details.%n%n", summary.toString());
+  1177  3
             LOGGER.log(Level.WARNING, msg);
+  1178   +
         }
+  1179  3
     }
+  1180   +
 
+  1181   +
     /**
+  1182   +
      * An enumeration of supported report formats: "ALL", "HTML", "XML", "VULN", etc..
+  1183   +
      */
+  1184  4
     public static class ReportFormats extends EnumeratedAttribute {
+  1185   +
 
+  1186   +
         /**
 1187   -
     public boolean isJarAnalyzerEnabled() {
-  1188  0
         return jarAnalyzerEnabled;
+
          * Returns the list of values for the report format.
+  1188   +
          *
 1189   -
     }
+
          * @return the list of values for the report format
 1190   +
          */
+  1191   +
         @Override
+  1192   +
         public String[] getValues() {
+  1193  4
             int i = 0;
+  1194  4
             final Format[] formats = Format.values();
+  1195  4
             final String[] values = new String[formats.length];
+  1196  20
             for (Format format : formats) {
+  1197  16
                 values[i++] = format.name();
+  1198   +
             }
+  1199  4
             return values;
+  1200   +
         }
+  1201   +
     }
+  1202   +
 
+  1203   +
     /**
+  1204   +
      * Whether or not the Jar Analyzer is enabled.
+  1205   +
      */
+  1206  4
     private boolean jarAnalyzerEnabled = true;
+  1207   +
 
+  1208   +
     /**
+  1209   +
      * Returns whether or not the analyzer is enabled.
+  1210   +
      *
+  1211   +
      * @return true if the analyzer is enabled
+  1212   +
      */
+  1213   +
     public boolean isJarAnalyzerEnabled() {
+  1214  0
         return jarAnalyzerEnabled;
+  1215   +
     }
+  1216  
 }
- + diff --git a/dependency-check-ant/configuration.html b/dependency-check-ant/configuration.html index cfa3b84c4..4a78df9b7 100644 --- a/dependency-check-ant/configuration.html +++ b/dependency-check-ant/configuration.html @@ -1,13 +1,13 @@ - + dependency-check-ant - Configuration @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@

Test Cases

[Summary] [Package List] [Test Cases]

@@ -334,19 +334,19 @@ function toggleDisplay(elementId) { testGetFailBuildOnCVSS -0.544 +0.458 testAddDirSet -8.497 +7.679 testAddFileSet -5.468 +4.648 testAddFileList -4.597

+3.999
diff --git a/dependency-check-ant/taglist.html b/dependency-check-ant/taglist.html index fa2ddb0e6..586690c48 100644 --- a/dependency-check-ant/taglist.html +++ b/dependency-check-ant/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-ant - Tag List report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@

Contributors

The following additional people have contributed to this project through the way of suggestions, patches or documentation.

- -
@@ -371,27 +371,34 @@ "suppression" + + +public static final String +UPDATE_ONLY +"updateonly" + + public static final String VERBOSE_LOG "log" - + public static final String VERBOSE_LOG_SHORT "l" - + public static final String VERSION "version" - + public static final String diff --git a/dependency-check-cli/apidocs/deprecated-list.html b/dependency-check-cli/apidocs/deprecated-list.html index bfd70a339..3fe9dc7a0 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.2.9 API) - +Deprecated List (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/help-doc.html b/dependency-check-cli/apidocs/help-doc.html index 21e350fa7..f8ce79f82 100644 --- a/dependency-check-cli/apidocs/help-doc.html +++ b/dependency-check-cli/apidocs/help-doc.html @@ -2,16 +2,16 @@ - + -API Help (Dependency-Check Command Line 1.2.9 API) - +API Help (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/index-all.html b/dependency-check-cli/apidocs/index-all.html index 0f03716c3..42df50872 100644 --- a/dependency-check-cli/apidocs/index-all.html +++ b/dependency-check-cli/apidocs/index-all.html @@ -2,16 +2,16 @@ - + -Index (Dependency-Check Command Line 1.2.9 API) - +Index (Dependency-Check Command Line 1.2.10 API) + @@ -62,7 +62,7 @@
-
A C D E G H I M N O P R S V  +
A C D E G H I M N O P R S U V 

A

@@ -349,6 +349,10 @@
Determines if the 'scan' command line argument was passed in.
+
isUpdateOnly() - Method in class org.owasp.dependencycheck.CliParser
+
+
Checks if the update only flag has been set.
+
@@ -381,12 +385,7 @@
org.owasp.dependencycheck - package org.owasp.dependencycheck
-
- - org.owasp.dependencycheck - - - Includes the main entry point for the DependencyChecker.
+
Includes the main entry point for the DependencyChecker.
OUT - Static variable in class org.owasp.dependencycheck.CliParser.ARGUMENT
@@ -486,6 +485,16 @@
The CLI argument name for setting the location of the suppression file.
+ + + +

U

+
+
UPDATE_ONLY - Static variable in class org.owasp.dependencycheck.CliParser.ARGUMENT
+
+
The long CLI argument name specifying that only the update phase should be executed; no scan should be run.
+
+
@@ -508,7 +517,7 @@
The long CLI argument name asking for the version.
-A C D E G H I M N O P R S V 
+A C D E G H I M N O P R S U V 
diff --git a/dependency-check-cli/apidocs/index.html b/dependency-check-cli/apidocs/index.html index cbd6cb660..d34d393a6 100644 --- a/dependency-check-cli/apidocs/index.html +++ b/dependency-check-cli/apidocs/index.html @@ -2,9 +2,9 @@ - + -Dependency-Check Command Line 1.2.9 API +Dependency-Check Command Line 1.2.10 API @@ -100,7 +100,7 @@ extends Object
The command line interface for the DependencyCheck application.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.ARGUMENT.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.ARGUMENT.html index bbfe54026..f6e799c68 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.ARGUMENT.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.ARGUMENT.html @@ -2,16 +2,16 @@ - + -CliParser.ARGUMENT (Dependency-Check Command Line 1.2.9 API) - +CliParser.ARGUMENT (Dependency-Check Command Line 1.2.10 API) + @@ -371,23 +371,29 @@ extends static String +UPDATE_ONLY +
The long CLI argument name specifying that only the update phase should be executed; no scan should be run.
+ + + +static String VERBOSE_LOG
The CLI argument name for setting the location of the data directory.
- + static String VERBOSE_LOG_SHORT
The short CLI argument name for setting the location of the data directory.
- + static String VERSION
The short CLI argument name asking for the version.
- + static String VERSION_SHORT
The long CLI argument name asking for the version.
@@ -484,6 +490,17 @@ extends See Also:
Constant Field Values
+ + + + diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.html index ef51efb36..349252f18 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/CliParser.html @@ -2,16 +2,16 @@ - + -CliParser (Dependency-Check Command Line 1.2.9 API) - +CliParser (Dependency-Check Command Line 1.2.10 API) + @@ -100,7 +100,7 @@ extends Object
A utility to parse command line arguments for the DependencyCheck.
Author:
-
Jeremy Long
+
Jeremy Long
@@ -356,18 +356,24 @@ extends +boolean +isUpdateOnly() +
Checks if the update only flag has been set.
+ + + void parse(String[] args)
Parses the arguments passed in and captures the results for later use.
- + void printHelp()
Displays the command line help message to the standard output.
- + void printVersionInfo()
@@ -746,7 +752,18 @@ extends Checks if the auto update feature has been disabled. If it has been disabled via the command line this will return false.
-
Returns:
if auto-update is allowed.
+
Returns:
true if auto-update is allowed; otherwise false
+ + +
+ + + 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 31ea416df..55af523a5 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.2.9 API) - +Uses of Class org.owasp.dependencycheck.App (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.ARGUMENT.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.ARGUMENT.html index 089c87731..9f6d535e3 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.ARGUMENT.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.ARGUMENT.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.CliParser.ARGUMENT (Dependency-Check Command Line 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.CliParser.ARGUMENT (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.html index 9aa2195f1..2451d510c 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/class-use/CliParser.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.CliParser (Dependency-Check Command Line 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.CliParser (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-frame.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-frame.html index 54d04d1c3..675f5ff0e 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-frame.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck (Dependency-Check Command Line 1.2.9 API) - +org.owasp.dependencycheck (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-summary.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-summary.html index 42bf57536..22f8fdbe5 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-summary.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck (Dependency-Check Command Line 1.2.9 API) - +org.owasp.dependencycheck (Dependency-Check Command Line 1.2.10 API) + @@ -65,12 +65,7 @@

Package org.owasp.dependencycheck

-
- - org.owasp.dependencycheck - - - Includes the main entry point for the DependencyChecker.
+
Includes the main entry point for the DependencyChecker.

See: Description

@@ -110,14 +105,7 @@

Package org.owasp.dependencycheck Description

-
- - org.owasp.dependencycheck - - - Includes the main entry point for the DependencyChecker. - -
+
Includes the main entry point for the DependencyChecker.
diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-tree.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-tree.html index 2e018f269..ec99e6fa6 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-tree.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck Class Hierarchy (Dependency-Check Command Line 1.2.9 API) - +org.owasp.dependencycheck Class Hierarchy (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-use.html b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-use.html index 34db8096f..2be050932 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-use.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck (Dependency-Check Command Line 1.2.9 API) - +Uses of Package org.owasp.dependencycheck (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/apidocs/overview-tree.html b/dependency-check-cli/apidocs/overview-tree.html index 43ae5b91b..f4de5bac4 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.2.9 API) - +Class Hierarchy (Dependency-Check Command Line 1.2.10 API) + diff --git a/dependency-check-cli/arguments.html b/dependency-check-cli/arguments.html index 6211b51a1..ad504360d 100644 --- a/dependency-check-cli/arguments.html +++ b/dependency-check-cli/arguments.html @@ -1,13 +1,13 @@ - + dependency-check-cli - Command Line Arguments @@ -19,7 +19,7 @@ - + @@ -42,7 +42,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 4165d6e5d..91f863eb3 100644 --- a/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.html +++ b/dependency-check-cli/cobertura/frame-summary-org.owasp.dependencycheck.html @@ -16,7 +16,7 @@ - +
Package # Classes Line Coverage Branch Coverage Complexity
org.owasp.dependencycheck4
28%
100/351
16%
35/212
3.192
org.owasp.dependencycheck4
27%
101/365
15%
35/220
3.185
- + diff --git a/dependency-check-cli/cobertura/frame-summary.html b/dependency-check-cli/cobertura/frame-summary.html index ee5eca34f..eb0053bf7 100644 --- a/dependency-check-cli/cobertura/frame-summary.html +++ b/dependency-check-cli/cobertura/frame-summary.html @@ -16,8 +16,8 @@ - - + +
Package # Classes Line Coverage Branch Coverage Complexity
All Packages4
28%
100/351
16%
35/212
3.192
org.owasp.dependencycheck4
28%
100/351
16%
35/212
3.192
All Packages4
27%
101/365
15%
35/220
3.185
org.owasp.dependencycheck4
27%
101/365
15%
35/220
3.185
- + diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html index 9b6dd8a73..54921265a 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 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
App
0%
0/181
0%
0/114
16.75
App
0%
0/193
0%
0/118
14.2
 
@@ -104,7 +104,7 @@  43  
  *
 44   -
  * @author Jeremy Long <jeremy.long@owasp.org>
+
  * @author Jeremy Long
 45  
  */
 46  0
 public class App {
@@ -188,316 +188,346 @@
 
 96  0
         if (cli.isGetVersion()) {
 97  0
             cli.printVersionInfo();
-  98  0
         } else if (cli.isRunScan()) {
+  98  0
         } else if (cli.isUpdateOnly()) {
 99  0
             populateSettings(cli);
-  100   +  100  0
             runUpdateOnly();
+  101  0
         } else if (cli.isRunScan()) {
+  102  0
             populateSettings(cli);
+  103  
             try {
-  101  0
                 runScan(cli.getReportDirectory(), cli.getReportFormat(), cli.getApplicationName(), cli.getScanFiles(), cli.getExcludeList());
-  102  0
             } catch (InvalidScanPathException ex) {
-  103  0
                 Logger.getLogger(App.class.getName()).log(Level.SEVERE, "An invalid scan path was detected; unable to scan '//*' paths");
-  104  0
             }
-  105   +  104  0
                 runScan(cli.getReportDirectory(), cli.getReportFormat(), cli.getApplicationName(), cli.getScanFiles(), cli.getExcludeList());
+  105  0
             } catch (InvalidScanPathException ex) {
+  106  0
                 Logger.getLogger(App.class.getName()).log(Level.SEVERE, "An invalid scan path was detected; unable to scan '//*' paths");
+  107  0
             }
+  108  
         } else {
-  106  0
             cli.printHelp();
-  107   -
         }
-  108  0
     }
-  109   -
 
+  109  0
             cli.printHelp();
 110   -
     /**
-  111   -
      * Scans the specified directories and writes the dependency reports to the reportDirectory.
-  112   -
      *
-  113   -
      * @param reportDirectory the path to the directory where the reports will be written
-  114   -
      * @param outputFormat the output format of the report
-  115   -
      * @param applicationName the application name for the report
-  116   -
      * @param files the files/directories to scan
-  117   -
      * @param excludes the patterns for files/directories to exclude
-  118   -
      *
-  119   -
      * @throws InvalidScanPathException thrown if the path to scan starts with "//"
-  120   -
      */
-  121   -
     private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files,
-  122   -
             String[] excludes) throws InvalidScanPathException {
-  123  0
         Engine engine = null;
-  124   -
         try {
-  125  0
             engine = new Engine();
-  126  0
             List<String> antStylePaths = new ArrayList<String>();
-  127  0
             if (excludes == null || excludes.length == 0) {
-  128  0
                 for (String file : files) {
-  129  0
                     if (file.contains("*") || file.contains("?")) {
-  130  0
                         antStylePaths.add(file);
-  131   -
                     } else {
-  132  0
                         engine.scan(file);
-  133   -
                     }
-  134   -
                 }
-  135   -
             } else {
-  136  0
                 antStylePaths = Arrays.asList(files);
-  137   -
             }
-  138   -
 
-  139  0
             final Set<File> paths = new HashSet<File>();
-  140  0
             for (String file : antStylePaths) {
-  141  0
                 final DirectoryScanner scanner = new DirectoryScanner();
-  142  0
                 String include = file.replace('\\', '/');
-  143   -
                 File baseDir;
-  144   -
 
-  145  0
                 if (include.startsWith("//")) {
-  146  0
                     throw new InvalidScanPathException("Unable to scan paths specified by //");
-  147  0
                 } else if (include.startsWith("./")) {
-  148  0
                     baseDir = new File(".");
-  149  0
                     include = include.substring(2);
-  150  0
                 } else if (include.startsWith("/")) {
-  151  0
                     baseDir = new File("/");
-  152  0
                     include = include.substring(1);
-  153  0
                 } else if (include.contains("/")) {
-  154  0
                     final int pos = include.indexOf('/');
-  155  0
                     final String tmp = include.substring(0, pos);
-  156  0
                     if (tmp.contains("*") || tmp.contains("?")) {
-  157  0
                         baseDir = new File(".");
-  158   -
                     } else {
-  159  0
                         baseDir = new File(tmp);
-  160  0
                         include = include.substring(pos + 1);
-  161   -
                     }
-  162  0
                 } else { //no path info - must just be a file in the working directory
-  163  0
                     baseDir = new File(".");
-  164   -
                 }
-  165  0
                 scanner.setBasedir(baseDir);
-  166  0
                 scanner.setIncludes(include);
-  167  0
                 if (excludes != null && excludes.length > 0) {
-  168  0
                     scanner.addExcludes(excludes);
-  169   -
                 }
-  170  0
                 scanner.scan();
-  171  0
                 if (scanner.getIncludedFilesCount() > 0) {
-  172  0
                     for (String s : scanner.getIncludedFiles()) {
-  173  0
                         final File f = new File(baseDir, s);
-  174  0
                         paths.add(f);
-  175   -
                     }
-  176   -
                 }
-  177  0
             }
-  178  0
             engine.scan(paths);
-  179   -
 
-  180  0
             engine.analyzeDependencies();
-  181  0
             final List<Dependency> dependencies = engine.getDependencies();
-  182  0
             DatabaseProperties prop = null;
-  183  0
             CveDB cve = null;
-  184   -
             try {
-  185  0
                 cve = new CveDB();
-  186  0
                 cve.open();
-  187  0
                 prop = cve.getDatabaseProperties();
-  188  0
             } catch (DatabaseException ex) {
-  189  0
                 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties", ex);
-  190   -
             } finally {
-  191  0
                 if (cve != null) {
-  192  0
                     cve.close();
-  193   -
                 }
-  194   -
             }
-  195  0
             final ReportGenerator report = new ReportGenerator(applicationName, dependencies, engine.getAnalyzers(), prop);
-  196   -
             try {
-  197  0
                 report.generateReports(reportDirectory, outputFormat);
-  198  0
             } catch (IOException ex) {
-  199  0
                 LOGGER.log(Level.SEVERE, "There was an IO error while attempting to generate the report.");
-  200  0
                 LOGGER.log(Level.FINE, null, ex);
-  201  0
             } catch (Throwable ex) {
-  202  0
                 LOGGER.log(Level.SEVERE, "There was an error while attempting to generate the report.");
-  203  0
                 LOGGER.log(Level.FINE, null, ex);
-  204  0
             }
-  205  0
         } catch (DatabaseException ex) {
-  206  0
             LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped");
-  207  0
             LOGGER.log(Level.FINE, "", ex);
-  208   -
         } finally {
-  209  0
             if (engine != null) {
-  210  0
                 engine.cleanup();
-  211   -
             }
-  212  
         }
-  213  0
     }
-  214   +  111  0
     }
+  112  
 
-  215   +  113  
     /**
-  216   -
      * Updates the global Settings.
-  217   +  114   +
      * Scans the specified directories and writes the dependency reports to the reportDirectory.
+  115  
      *
+  116   +
      * @param reportDirectory the path to the directory where the reports will be written
+  117   +
      * @param outputFormat the output format of the report
+  118   +
      * @param applicationName the application name for the report
+  119   +
      * @param files the files/directories to scan
+  120   +
      * @param excludes the patterns for files/directories to exclude
+  121   +
      *
+  122   +
      * @throws InvalidScanPathException thrown if the path to scan starts with "//"
+  123   +
      */
+  124   +
     private void runScan(String reportDirectory, String outputFormat, String applicationName, String[] files,
+  125   +
             String[] excludes) throws InvalidScanPathException {
+  126  0
         Engine engine = null;
+  127   +
         try {
+  128  0
             engine = new Engine();
+  129  0
             List<String> antStylePaths = new ArrayList<String>();
+  130  0
             if (excludes == null || excludes.length == 0) {
+  131  0
                 for (String file : files) {
+  132  0
                     if (file.contains("*") || file.contains("?")) {
+  133  0
                         antStylePaths.add(file);
+  134   +
                     } else {
+  135  0
                         engine.scan(file);
+  136   +
                     }
+  137   +
                 }
+  138   +
             } else {
+  139  0
                 antStylePaths = Arrays.asList(files);
+  140   +
             }
+  141   +
 
+  142  0
             final Set<File> paths = new HashSet<File>();
+  143  0
             for (String file : antStylePaths) {
+  144  0
                 final DirectoryScanner scanner = new DirectoryScanner();
+  145  0
                 String include = file.replace('\\', '/');
+  146   +
                 File baseDir;
+  147   +
 
+  148  0
                 if (include.startsWith("//")) {
+  149  0
                     throw new InvalidScanPathException("Unable to scan paths specified by //");
+  150  0
                 } else if (include.startsWith("./")) {
+  151  0
                     baseDir = new File(".");
+  152  0
                     include = include.substring(2);
+  153  0
                 } else if (include.startsWith("/")) {
+  154  0
                     baseDir = new File("/");
+  155  0
                     include = include.substring(1);
+  156  0
                 } else if (include.contains("/")) {
+  157  0
                     final int pos = include.indexOf('/');
+  158  0
                     final String tmp = include.substring(0, pos);
+  159  0
                     if (tmp.contains("*") || tmp.contains("?")) {
+  160  0
                         baseDir = new File(".");
+  161   +
                     } else {
+  162  0
                         baseDir = new File(tmp);
+  163  0
                         include = include.substring(pos + 1);
+  164   +
                     }
+  165  0
                 } else { //no path info - must just be a file in the working directory
+  166  0
                     baseDir = new File(".");
+  167   +
                 }
+  168  0
                 scanner.setBasedir(baseDir);
+  169  0
                 scanner.setIncludes(include);
+  170  0
                 if (excludes != null && excludes.length > 0) {
+  171  0
                     scanner.addExcludes(excludes);
+  172   +
                 }
+  173  0
                 scanner.scan();
+  174  0
                 if (scanner.getIncludedFilesCount() > 0) {
+  175  0
                     for (String s : scanner.getIncludedFiles()) {
+  176  0
                         final File f = new File(baseDir, s);
+  177  0
                         paths.add(f);
+  178   +
                     }
+  179   +
                 }
+  180  0
             }
+  181  0
             engine.scan(paths);
+  182   +
 
+  183  0
             engine.analyzeDependencies();
+  184  0
             final List<Dependency> dependencies = engine.getDependencies();
+  185  0
             DatabaseProperties prop = null;
+  186  0
             CveDB cve = null;
+  187   +
             try {
+  188  0
                 cve = new CveDB();
+  189  0
                 cve.open();
+  190  0
                 prop = cve.getDatabaseProperties();
+  191  0
             } catch (DatabaseException ex) {
+  192  0
                 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties", ex);
+  193   +
             } finally {
+  194  0
                 if (cve != null) {
+  195  0
                     cve.close();
+  196   +
                 }
+  197   +
             }
+  198  0
             final ReportGenerator report = new ReportGenerator(applicationName, dependencies, engine.getAnalyzers(), prop);
+  199   +
             try {
+  200  0
                 report.generateReports(reportDirectory, outputFormat);
+  201  0
             } catch (IOException ex) {
+  202  0
                 LOGGER.log(Level.SEVERE, "There was an IO error while attempting to generate the report.");
+  203  0
                 LOGGER.log(Level.FINE, null, ex);
+  204  0
             } catch (Throwable ex) {
+  205  0
                 LOGGER.log(Level.SEVERE, "There was an error while attempting to generate the report.");
+  206  0
                 LOGGER.log(Level.FINE, null, ex);
+  207  0
             }
+  208  0
         } catch (DatabaseException ex) {
+  209  0
             LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped");
+  210  0
             LOGGER.log(Level.FINE, "", ex);
+  211   +
         } finally {
+  212  0
             if (engine != null) {
+  213  0
                 engine.cleanup();
+  214   +
             }
+  215   +
         }
+  216  0
     }
+  217   +
 
 218   -
      * @param cli a reference to the CLI Parser that contains the command line arguments used to set the corresponding
+
     /**
 219   -
      * settings in the core engine.
+
      * Only executes the update phase of dependency-check.
 220  
      */
 221   +
     private void runUpdateOnly() {
+  222  0
         Engine engine = null;
+  223   +
         try {
+  224  0
             engine = new Engine();
+  225  0
             engine.doUpdates();
+  226  0
         } catch (DatabaseException ex) {
+  227  0
             LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped");
+  228  0
             LOGGER.log(Level.FINE, "", ex);
+  229   +
         } finally {
+  230  0
             if (engine != null) {
+  231  0
                 engine.cleanup();
+  232   +
             }
+  233   +
         }
+  234  0
     }
+  235   +
 
+  236   +
     /**
+  237   +
      * Updates the global Settings.
+  238   +
      *
+  239   +
      * @param cli a reference to the CLI Parser that contains the command line arguments used to set the corresponding settings in
+  240   +
      * the core engine.
+  241   +
      */
+  242  
     private void populateSettings(CliParser cli) {
-  222   +  243  
 
-  223  0
         final boolean autoUpdate = cli.isAutoUpdate();
-  224  0
         final String connectionTimeout = cli.getConnectionTimeout();
-  225  0
         final String proxyServer = cli.getProxyServer();
-  226  0
         final String proxyPort = cli.getProxyPort();
-  227  0
         final String proxyUser = cli.getProxyUsername();
-  228  0
         final String proxyPass = cli.getProxyPassword();
-  229  0
         final String dataDirectory = cli.getDataDirectory();
-  230  0
         final File propertiesFile = cli.getPropertiesFile();
-  231  0
         final String suppressionFile = cli.getSuppressionFile();
-  232  0
         final boolean jarDisabled = cli.isJarDisabled();
-  233  0
         final boolean archiveDisabled = cli.isArchiveDisabled();
-  234  0
         final boolean assemblyDisabled = cli.isAssemblyDisabled();
-  235  0
         final boolean nuspecDisabled = cli.isNuspecDisabled();
-  236  0
         final boolean centralDisabled = cli.isCentralDisabled();
-  237  0
         final boolean nexusDisabled = cli.isNexusDisabled();
-  238  0
         final String nexusUrl = cli.getNexusUrl();
-  239  0
         final String databaseDriverName = cli.getDatabaseDriverName();
-  240  0
         final String databaseDriverPath = cli.getDatabaseDriverPath();
-  241  0
         final String connectionString = cli.getConnectionString();
-  242  0
         final String databaseUser = cli.getDatabaseUser();
-  243  0
         final String databasePassword = cli.getDatabasePassword();
-  244  0
         final String additionalZipExtensions = cli.getAdditionalZipExtensions();
-  245  0
         final String pathToMono = cli.getPathToMono();
-  246   +  244  0
         final boolean autoUpdate = cli.isAutoUpdate();
+  245  0
         final String connectionTimeout = cli.getConnectionTimeout();
+  246  0
         final String proxyServer = cli.getProxyServer();
+  247  0
         final String proxyPort = cli.getProxyPort();
+  248  0
         final String proxyUser = cli.getProxyUsername();
+  249  0
         final String proxyPass = cli.getProxyPassword();
+  250  0
         final String dataDirectory = cli.getDataDirectory();
+  251  0
         final File propertiesFile = cli.getPropertiesFile();
+  252  0
         final String suppressionFile = cli.getSuppressionFile();
+  253  0
         final boolean jarDisabled = cli.isJarDisabled();
+  254  0
         final boolean archiveDisabled = cli.isArchiveDisabled();
+  255  0
         final boolean assemblyDisabled = cli.isAssemblyDisabled();
+  256  0
         final boolean nuspecDisabled = cli.isNuspecDisabled();
+  257  0
         final boolean centralDisabled = cli.isCentralDisabled();
+  258  0
         final boolean nexusDisabled = cli.isNexusDisabled();
+  259  0
         final String nexusUrl = cli.getNexusUrl();
+  260  0
         final String databaseDriverName = cli.getDatabaseDriverName();
+  261  0
         final String databaseDriverPath = cli.getDatabaseDriverPath();
+  262  0
         final String connectionString = cli.getConnectionString();
+  263  0
         final String databaseUser = cli.getDatabaseUser();
+  264  0
         final String databasePassword = cli.getDatabasePassword();
+  265  0
         final String additionalZipExtensions = cli.getAdditionalZipExtensions();
+  266  0
         final String pathToMono = cli.getPathToMono();
+  267  
 
-  247  0
         if (propertiesFile != null) {
-  248   +  268  0
         if (propertiesFile != null) {
+  269  
             try {
-  249  0
                 Settings.mergeProperties(propertiesFile);
-  250  0
             } catch (FileNotFoundException ex) {
-  251  0
                 final String msg = String.format("Unable to load properties file '%s'", propertiesFile.getPath());
-  252  0
                 LOGGER.log(Level.SEVERE, msg);
-  253  0
                 LOGGER.log(Level.FINE, null, ex);
-  254  0
             } catch (IOException ex) {
-  255  0
                 final String msg = String.format("Unable to find properties file '%s'", propertiesFile.getPath());
-  256  0
                 LOGGER.log(Level.SEVERE, msg);
-  257  0
                 LOGGER.log(Level.FINE, null, ex);
-  258  0
             }
-  259   +  270  0
                 Settings.mergeProperties(propertiesFile);
+  271  0
             } catch (FileNotFoundException ex) {
+  272  0
                 final String msg = String.format("Unable to load properties file '%s'", propertiesFile.getPath());
+  273  0
                 LOGGER.log(Level.SEVERE, msg);
+  274  0
                 LOGGER.log(Level.FINE, null, ex);
+  275  0
             } catch (IOException ex) {
+  276  0
                 final String msg = String.format("Unable to find properties file '%s'", propertiesFile.getPath());
+  277  0
                 LOGGER.log(Level.SEVERE, msg);
+  278  0
                 LOGGER.log(Level.FINE, null, ex);
+  279  0
             }
+  280  
         }
-  260   +  281  
         // We have to wait until we've merged the properties before attempting to set whether we use
-  261   -
         // the proxy for Nexus since it could be disabled in the properties, but not explicitly stated
-  262   -
         // on the command line
-  263  0
         final boolean nexusUsesProxy = cli.isNexusUsesProxy();
-  264  0
         if (dataDirectory != null) {
-  265  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
-  266  0
         } else if (System.getProperty("basedir") != null) {
-  267  0
             final File dataDir = new File(System.getProperty("basedir"), "data");
-  268  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-  269  0
         } else {
-  270  0
             final File jarPath = new File(App.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-  271  0
             final File base = jarPath.getParentFile();
-  272  0
             final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
-  273  0
             final File dataDir = new File(base, sub);
-  274  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
-  275   -
         }
-  276  0
         Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
-  277  0
         if (proxyServer != null && !proxyServer.isEmpty()) {
-  278  0
             Settings.setString(Settings.KEYS.PROXY_SERVER, proxyServer);
-  279   -
         }
-  280  0
         if (proxyPort != null && !proxyPort.isEmpty()) {
-  281  0
             Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
 282   -
         }
-  283  0
         if (proxyUser != null && !proxyUser.isEmpty()) {
-  284  0
             Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUser);
-  285   -
         }
-  286  0
         if (proxyPass != null && !proxyPass.isEmpty()) {
-  287  0
             Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPass);
-  288   -
         }
-  289  0
         if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
-  290  0
             Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
-  291   -
         }
-  292  0
         if (suppressionFile != null && !suppressionFile.isEmpty()) {
-  293  0
             Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
-  294   -
         }
-  295   -
 
+
         // the proxy for Nexus since it could be disabled in the properties, but not explicitly stated
+  283   +
         // on the command line
+  284  0
         final boolean nexusUsesProxy = cli.isNexusUsesProxy();
+  285  0
         if (dataDirectory != null) {
+  286  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
+  287  0
         } else if (System.getProperty("basedir") != null) {
+  288  0
             final File dataDir = new File(System.getProperty("basedir"), "data");
+  289  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
+  290  0
         } else {
+  291  0
             final File jarPath = new File(App.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+  292  0
             final File base = jarPath.getParentFile();
+  293  0
             final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
+  294  0
             final File dataDir = new File(base, sub);
+  295  0
             Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
 296   -
         //File Type Analyzer Settings
-  297  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, !jarDisabled);
-  298  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, !archiveDisabled);
-  299  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
-  300  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
-  301   -
 
-  302  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, !centralDisabled);
-  303  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, !nexusDisabled);
-  304  0
         if (nexusUrl != null && !nexusUrl.isEmpty()) {
-  305  0
             Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+
         }
+  297  0
         Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
+  298  0
         if (proxyServer != null && !proxyServer.isEmpty()) {
+  299  0
             Settings.setString(Settings.KEYS.PROXY_SERVER, proxyServer);
+  300   +
         }
+  301  0
         if (proxyPort != null && !proxyPort.isEmpty()) {
+  302  0
             Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
+  303   +
         }
+  304  0
         if (proxyUser != null && !proxyUser.isEmpty()) {
+  305  0
             Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUser);
 306  
         }
-  307  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
-  308  0
         if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
-  309  0
             Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
-  310   +  307  0
         if (proxyPass != null && !proxyPass.isEmpty()) {
+  308  0
             Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPass);
+  309  
         }
-  311  0
         if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
-  312  0
             Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
-  313   +  310  0
         if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
+  311  0
             Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
+  312   +
         }
+  313  0
         if (suppressionFile != null && !suppressionFile.isEmpty()) {
+  314  0
             Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
+  315  
         }
-  314  0
         if (connectionString != null && !connectionString.isEmpty()) {
-  315  0
             Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
 316   -
         }
-  317  0
         if (databaseUser != null && !databaseUser.isEmpty()) {
-  318  0
             Settings.setString(Settings.KEYS.DB_USER, databaseUser);
-  319   -
         }
-  320  0
         if (databasePassword != null && !databasePassword.isEmpty()) {
-  321  0
             Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
+
 
+  317   +
         //File Type Analyzer Settings
+  318  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED, !jarDisabled);
+  319  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, !archiveDisabled);
+  320  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, !nuspecDisabled);
+  321  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, !assemblyDisabled);
 322   +
 
+  323  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, !centralDisabled);
+  324  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, !nexusDisabled);
+  325  0
         if (nexusUrl != null && !nexusUrl.isEmpty()) {
+  326  0
             Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
+  327  
         }
-  323  0
         if (additionalZipExtensions != null && !additionalZipExtensions.isEmpty()) {
-  324  0
             Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, additionalZipExtensions);
-  325   +  328  0
         Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
+  329  0
         if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
+  330  0
             Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
+  331  
         }
-  326  0
         if (pathToMono != null && !pathToMono.isEmpty()) {
-  327  0
             Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
-  328   +  332  0
         if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
+  333  0
             Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
+  334  
         }
-  329  0
     }
-  330   +  335  0
         if (connectionString != null && !connectionString.isEmpty()) {
+  336  0
             Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
+  337   +
         }
+  338  0
         if (databaseUser != null && !databaseUser.isEmpty()) {
+  339  0
             Settings.setString(Settings.KEYS.DB_USER, databaseUser);
+  340   +
         }
+  341  0
         if (databasePassword != null && !databasePassword.isEmpty()) {
+  342  0
             Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
+  343   +
         }
+  344  0
         if (additionalZipExtensions != null && !additionalZipExtensions.isEmpty()) {
+  345  0
             Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, additionalZipExtensions);
+  346   +
         }
+  347  0
         if (pathToMono != null && !pathToMono.isEmpty()) {
+  348  0
             Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
+  349   +
         }
+  350  0
     }
+  351  
 }
- + diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html index 338ccee52..bfe39245f 100644 --- a/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html +++ b/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html @@ -12,8 +12,8 @@
 
- - + +
Classes in this File Line Coverage Branch Coverage Complexity
CliParser
62%
100/161
35%
35/98
2.159
CliParser$ARGUMENT
0%
0/1
N/A
2.159
CliParser
61%
101/163
34%
35/102
2.156
CliParser$ARGUMENT
0%
0/1
N/A
2.156
 
@@ -95,7 +95,7 @@  38  
  *
 39   -
  * @author Jeremy Long <jeremy.long@owasp.org>
+
  * @author Jeremy Long
 40  
  */
 41  9
 public final class CliParser {
@@ -478,1269 +478,1303 @@
     private void addAdvancedOptions(final Options options) throws IllegalArgumentException {
 268  
 
-  269  9
         final Option data = OptionBuilder.withArgName("path").hasArg().withLongOpt(ARGUMENT.DATA_DIRECTORY)
+  269  9
         final Option updateOnly = OptionBuilder.withLongOpt(ARGUMENT.UPDATE_ONLY)
 270   -
                 .withDescription("The location of the H2 Database file. This option should generally not be set.")
+
                 .withDescription("Only update the local NVD data cache; no scan will be executed.").create();
 271   -
                 .create(ARGUMENT.DATA_DIRECTORY_SHORT);
-  272  
 
-  273  9
         final Option connectionTimeout = OptionBuilder.withArgName("timeout").hasArg().withLongOpt(ARGUMENT.CONNECTION_TIMEOUT)
+  272  9
         final Option data = OptionBuilder.withArgName("path").hasArg().withLongOpt(ARGUMENT.DATA_DIRECTORY)
+  273   +
                 .withDescription("The location of the H2 Database file. This option should generally not be set.")
 274   -
                 .withDescription("The connection timeout (in milliseconds) to use when downloading resources.")
+
                 .create(ARGUMENT.DATA_DIRECTORY_SHORT);
 275   -
                 .create(ARGUMENT.CONNECTION_TIMEOUT_SHORT);
-  276  
 
-  277  9
         final Option proxyServer = OptionBuilder.withArgName("server").hasArg().withLongOpt(ARGUMENT.PROXY_SERVER)
+  276  9
         final Option connectionTimeout = OptionBuilder.withArgName("timeout").hasArg().withLongOpt(ARGUMENT.CONNECTION_TIMEOUT)
+  277   +
                 .withDescription("The connection timeout (in milliseconds) to use when downloading resources.")
 278   -
                 .withDescription("The proxy server to use when downloading resources.")
+
                 .create(ARGUMENT.CONNECTION_TIMEOUT_SHORT);
 279   -
                 .create();
-  280  
 
-  281  9
         final Option proxyPort = OptionBuilder.withArgName("port").hasArg().withLongOpt(ARGUMENT.PROXY_PORT)
+  280  9
         final Option proxyServer = OptionBuilder.withArgName("server").hasArg().withLongOpt(ARGUMENT.PROXY_SERVER)
+  281   +
                 .withDescription("The proxy server to use when downloading resources.")
 282   -
                 .withDescription("The proxy port to use when downloading resources.")
+
                 .create();
 283   -
                 .create();
-  284  
 
-  285  9
         final Option proxyUsername = OptionBuilder.withArgName("user").hasArg().withLongOpt(ARGUMENT.PROXY_USERNAME)
+  284  9
         final Option proxyPort = OptionBuilder.withArgName("port").hasArg().withLongOpt(ARGUMENT.PROXY_PORT)
+  285   +
                 .withDescription("The proxy port to use when downloading resources.")
 286   -
                 .withDescription("The proxy username to use when downloading resources.")
+
                 .create();
 287   -
                 .create();
-  288  
 
-  289  9
         final Option proxyPassword = OptionBuilder.withArgName("pass").hasArg().withLongOpt(ARGUMENT.PROXY_PASSWORD)
+  288  9
         final Option proxyUsername = OptionBuilder.withArgName("user").hasArg().withLongOpt(ARGUMENT.PROXY_USERNAME)
+  289   +
                 .withDescription("The proxy username to use when downloading resources.")
 290   -
                 .withDescription("The proxy password to use when downloading resources.")
+
                 .create();
 291   -
                 .create();
-  292  
 
-  293  9
         final Option connectionString = OptionBuilder.withArgName("connStr").hasArg().withLongOpt(ARGUMENT.CONNECTION_STRING)
+  292  9
         final Option proxyPassword = OptionBuilder.withArgName("pass").hasArg().withLongOpt(ARGUMENT.PROXY_PASSWORD)
+  293   +
                 .withDescription("The proxy password to use when downloading resources.")
 294   -
                 .withDescription("The connection string to the database.")
+
                 .create();
 295   -
                 .create();
-  296  
 
-  297  9
         final Option dbUser = OptionBuilder.withArgName("user").hasArg().withLongOpt(ARGUMENT.DB_NAME)
+  296  9
         final Option connectionString = OptionBuilder.withArgName("connStr").hasArg().withLongOpt(ARGUMENT.CONNECTION_STRING)
+  297   +
                 .withDescription("The connection string to the database.")
 298   -
                 .withDescription("The username used to connect to the database.")
+
                 .create();
 299   -
                 .create();
-  300  
 
-  301  9
         final Option dbPassword = OptionBuilder.withArgName("password").hasArg().withLongOpt(ARGUMENT.DB_PASSWORD)
+  300  9
         final Option dbUser = OptionBuilder.withArgName("user").hasArg().withLongOpt(ARGUMENT.DB_NAME)
+  301   +
                 .withDescription("The username used to connect to the database.")
 302   -
                 .withDescription("The password for connecting to the database.")
+
                 .create();
 303   -
                 .create();
-  304  
 
-  305  9
         final Option dbDriver = OptionBuilder.withArgName("driver").hasArg().withLongOpt(ARGUMENT.DB_DRIVER)
+  304  9
         final Option dbPassword = OptionBuilder.withArgName("password").hasArg().withLongOpt(ARGUMENT.DB_PASSWORD)
+  305   +
                 .withDescription("The password for connecting to the database.")
 306   -
                 .withDescription("The database driver name.")
+
                 .create();
 307   -
                 .create();
-  308  
 
-  309  9
         final Option dbDriverPath = OptionBuilder.withArgName("path").hasArg().withLongOpt(ARGUMENT.DB_DRIVER_PATH)
+  308  9
         final Option dbDriver = OptionBuilder.withArgName("driver").hasArg().withLongOpt(ARGUMENT.DB_DRIVER)
+  309   +
                 .withDescription("The database driver name.")
 310   -
                 .withDescription("The path to the database driver; note, this does not need to be set unless the JAR is outside of the classpath.")
+
                 .create();
 311   -
                 .create();
-  312  
 
-  313  9
         final Option disableJarAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_JAR)
+  312  9
         final Option dbDriverPath = OptionBuilder.withArgName("path").hasArg().withLongOpt(ARGUMENT.DB_DRIVER_PATH)
+  313   +
                 .withDescription("The path to the database driver; note, this does not need to be set unless the JAR is outside of the classpath.")
 314   -
                 .withDescription("Disable the Jar Analyzer.")
-  315  
                 .create();
-  316  9
         final Option disableArchiveAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_ARCHIVE)
+  315   +
 
+  316  9
         final Option disableJarAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_JAR)
 317   -
                 .withDescription("Disable the Archive Analyzer.")
+
                 .withDescription("Disable the Jar Analyzer.")
 318  
                 .create();
-  319  9
         final Option disableNuspecAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_NUSPEC)
+  319  9
         final Option disableArchiveAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_ARCHIVE)
 320   -
                 .withDescription("Disable the Nuspec Analyzer.")
+
                 .withDescription("Disable the Archive Analyzer.")
 321  
                 .create();
-  322  9
         final Option disableAssemblyAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_ASSEMBLY)
+  322  9
         final Option disableNuspecAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_NUSPEC)
 323   -
                 .withDescription("Disable the .NET Assembly Analyzer.")
+
                 .withDescription("Disable the Nuspec Analyzer.")
 324  
                 .create();
 325  
 
-  326  9
         final Option disableCentralAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_CENTRAL)
+  326  9
         final Option disableAssemblyAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_ASSEMBLY)
 327   -
                 .withDescription("Disable the Central Analyzer. If this analyzer is disabled it is likely you also want to disable "
+
                 .withDescription("Disable the .NET Assembly Analyzer.")
 328   -
                         + "the Nexus Analyzer.")
-  329  
                 .create();
-  330   +  329  
 
-  331  9
         final Option disableNexusAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_NEXUS)
+  330  9
         final Option disableCentralAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_CENTRAL)
+  331   +
                 .withDescription("Disable the Central Analyzer. If this analyzer is disabled it is likely you also want to disable "
 332   -
                 .withDescription("Disable the Nexus Analyzer.")
+
                         + "the Nexus Analyzer.")
 333  
                 .create();
 334  
 
-  335  9
         final Option nexusUrl = OptionBuilder.withArgName("url").hasArg().withLongOpt(ARGUMENT.NEXUS_URL)
+  335  9
         final Option disableNexusAnalyzer = OptionBuilder.withLongOpt(ARGUMENT.DISABLE_NEXUS)
 336   -
                 .withDescription("The url to the Nexus Pro Server. If not set the Nexus Analyzer will be disabled.")
+
                 .withDescription("Disable the Nexus Analyzer.")
 337  
                 .create();
 338  
 
-  339  9
         final Option nexusUsesProxy = OptionBuilder.withArgName("true/false").hasArg().withLongOpt(ARGUMENT.NEXUS_USES_PROXY)
+  339  9
         final Option nexusUrl = OptionBuilder.withArgName("url").hasArg().withLongOpt(ARGUMENT.NEXUS_URL)
 340   -
                 .withDescription("Whether or not the configured proxy should be used when connecting to Nexus.")
+
                 .withDescription("The url to the Nexus Pro Server. If not set the Nexus Analyzer will be disabled.")
 341  
                 .create();
 342  
 
-  343  9
         final Option additionalZipExtensions = OptionBuilder.withArgName("extensions").hasArg()
+  343  9
         final Option nexusUsesProxy = OptionBuilder.withArgName("true/false").hasArg().withLongOpt(ARGUMENT.NEXUS_USES_PROXY)
 344   -
                 .withLongOpt(ARGUMENT.ADDITIONAL_ZIP_EXTENSIONS)
+
                 .withDescription("Whether or not the configured proxy should be used when connecting to Nexus.")
 345   -
                 .withDescription("A comma separated list of additional extensions to be scanned as ZIP files "
-  346   -
                         + "(ZIP, EAR, WAR are already treated as zip files)")
-  347  
                 .create();
-  348   +  346  
 
-  349  9
         final Option pathToMono = OptionBuilder.withArgName("path").hasArg().withLongOpt(ARGUMENT.PATH_TO_MONO)
+  347  9
         final Option additionalZipExtensions = OptionBuilder.withArgName("extensions").hasArg()
+  348   +
                 .withLongOpt(ARGUMENT.ADDITIONAL_ZIP_EXTENSIONS)
+  349   +
                 .withDescription("A comma separated list of additional extensions to be scanned as ZIP files "
 350   -
                 .withDescription("The path to Mono for .NET Assembly analysis on non-windows systems.")
+
                         + "(ZIP, EAR, WAR are already treated as zip files)")
 351  
                 .create();
 352  
 
-  353  9
         options.addOption(proxyPort)
+  353  9
         final Option pathToMono = OptionBuilder.withArgName("path").hasArg().withLongOpt(ARGUMENT.PATH_TO_MONO)
 354   -
                 .addOption(proxyServer)
+
                 .withDescription("The path to Mono for .NET Assembly analysis on non-windows systems.")
 355   -
                 .addOption(proxyUsername)
-  356   -
                 .addOption(proxyPassword)
-  357   -
                 .addOption(connectionTimeout)
-  358   -
                 .addOption(connectionString)
-  359   -
                 .addOption(dbUser)
-  360   -
                 .addOption(data)
-  361   -
                 .addOption(dbPassword)
-  362   -
                 .addOption(dbDriver)
-  363   -
                 .addOption(dbDriverPath)
-  364   -
                 .addOption(disableJarAnalyzer)
-  365   -
                 .addOption(disableArchiveAnalyzer)
-  366   -
                 .addOption(disableAssemblyAnalyzer)
-  367   -
                 .addOption(disableNuspecAnalyzer)
-  368   -
                 .addOption(disableCentralAnalyzer)
-  369   -
                 .addOption(disableNexusAnalyzer)
-  370   -
                 .addOption(nexusUrl)
-  371   -
                 .addOption(nexusUsesProxy)
-  372   -
                 .addOption(additionalZipExtensions)
-  373   -
                 .addOption(pathToMono);
-  374  9
     }
-  375   -
 
-  376   -
     /**
-  377   -
      * Adds the deprecated command line options to the given options collection. These are split out for purposes of not including
-  378   -
      * them in the help message. We need to add the deprecated options so as not to break existing scripts.
-  379   -
      *
-  380   -
      * @param options a collection of command line arguments
-  381   -
      * @throws IllegalArgumentException thrown if there is an exception
-  382   -
      */
-  383   -
     @SuppressWarnings("static-access")
-  384   -
     private void addDeprecatedOptions(final Options options) throws IllegalArgumentException {
-  385   -
 
-  386  9
         final Option proxyServer = OptionBuilder.withArgName("url").hasArg().withLongOpt(ARGUMENT.PROXY_URL)
-  387   -
                 .withDescription("The proxy url argument is deprecated, use proxyserver instead.")
-  388  
                 .create();
+  356   +
 
+  357  9
         options.addOption(updateOnly)
+  358   +
                 .addOption(proxyPort)
+  359   +
                 .addOption(proxyServer)
+  360   +
                 .addOption(proxyUsername)
+  361   +
                 .addOption(proxyPassword)
+  362   +
                 .addOption(connectionTimeout)
+  363   +
                 .addOption(connectionString)
+  364   +
                 .addOption(dbUser)
+  365   +
                 .addOption(data)
+  366   +
                 .addOption(dbPassword)
+  367   +
                 .addOption(dbDriver)
+  368   +
                 .addOption(dbDriverPath)
+  369   +
                 .addOption(disableJarAnalyzer)
+  370   +
                 .addOption(disableArchiveAnalyzer)
+  371   +
                 .addOption(disableAssemblyAnalyzer)
+  372   +
                 .addOption(disableNuspecAnalyzer)
+  373   +
                 .addOption(disableCentralAnalyzer)
+  374   +
                 .addOption(disableNexusAnalyzer)
+  375   +
                 .addOption(nexusUrl)
+  376   +
                 .addOption(nexusUsesProxy)
+  377   +
                 .addOption(additionalZipExtensions)
+  378   +
                 .addOption(pathToMono);
+  379  9
     }
+  380   +
 
+  381   +
     /**
+  382   +
      * Adds the deprecated command line options to the given options collection. These are split out for purposes of not including
+  383   +
      * them in the help message. We need to add the deprecated options so as not to break existing scripts.
+  384   +
      *
+  385   +
      * @param options a collection of command line arguments
+  386   +
      * @throws IllegalArgumentException thrown if there is an exception
+  387   +
      */
+  388   +
     @SuppressWarnings("static-access")
 389   +
     private void addDeprecatedOptions(final Options options) throws IllegalArgumentException {
+  390  
 
-  390  9
         options.addOption(proxyServer);
-  391  9
     }
+  391  9
         final Option proxyServer = OptionBuilder.withArgName("url").hasArg().withLongOpt(ARGUMENT.PROXY_URL)
 392   -
 
+
                 .withDescription("The proxy url argument is deprecated, use proxyserver instead.")
 393   -
     /**
+
                 .create();
 394   -
      * Determines if the 'version' command line argument was passed in.
-  395   -
      *
-  396   -
      * @return whether or not the 'version' command line argument was passed in
+
 
+  395  9
         options.addOption(proxyServer);
+  396  9
     }
 397   -
      */
+
 
 398   -
     public boolean isGetVersion() {
-  399  7
         return (line != null) && line.hasOption(ARGUMENT.VERSION);
+
     /**
+  399   +
      * Determines if the 'version' command line argument was passed in.
 400   -
     }
+
      *
 401   -
 
+
      * @return whether or not the 'version' command line argument was passed in
 402   -
     /**
+
      */
 403   -
      * Determines if the 'help' command line argument was passed in.
-  404   -
      *
+
     public boolean isGetVersion() {
+  404  7
         return (line != null) && line.hasOption(ARGUMENT.VERSION);
 405   -
      * @return whether or not the 'help' command line argument was passed in
+
     }
 406   -
      */
+
 
 407   -
     public boolean isGetHelp() {
-  408  7
         return (line != null) && line.hasOption(ARGUMENT.HELP);
+
     /**
+  408   +
      * Determines if the 'help' command line argument was passed in.
 409   -
     }
+
      *
 410   -
 
+
      * @return whether or not the 'help' command line argument was passed in
 411   -
     /**
+
      */
 412   -
      * Determines if the 'scan' command line argument was passed in.
-  413   -
      *
+
     public boolean isGetHelp() {
+  413  7
         return (line != null) && line.hasOption(ARGUMENT.HELP);
 414   -
      * @return whether or not the 'scan' command line argument was passed in
+
     }
 415   -
      */
+
 
 416   -
     public boolean isRunScan() {
-  417  14
         return (line != null) && isValid && line.hasOption(ARGUMENT.SCAN);
+
     /**
+  417   +
      * Determines if the 'scan' command line argument was passed in.
 418   -
     }
+
      *
 419   -
 
+
      * @return whether or not the 'scan' command line argument was passed in
 420   -
     /**
+
      */
 421   -
      * Returns true if the disableJar command line argument was specified.
-  422   -
      *
+
     public boolean isRunScan() {
+  422  14
         return (line != null) && isValid && line.hasOption(ARGUMENT.SCAN);
 423   -
      * @return true if the disableJar command line argument was specified; otherwise false
+
     }
 424   -
      */
+
 
 425   -
     public boolean isJarDisabled() {
-  426  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_JAR);
+
     /**
+  426   +
      * Returns true if the disableJar command line argument was specified.
 427   -
     }
+
      *
 428   -
 
+
      * @return true if the disableJar command line argument was specified; otherwise false
 429   -
     /**
+
      */
 430   -
      * Returns true if the disableArchive command line argument was specified.
-  431   -
      *
+
     public boolean isJarDisabled() {
+  431  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_JAR);
 432   -
      * @return true if the disableArchive command line argument was specified; otherwise false
+
     }
 433   -
      */
+
 
 434   -
     public boolean isArchiveDisabled() {
-  435  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_ARCHIVE);
+
     /**
+  435   +
      * Returns true if the disableArchive command line argument was specified.
 436   -
     }
+
      *
 437   -
 
+
      * @return true if the disableArchive command line argument was specified; otherwise false
 438   -
     /**
+
      */
 439   -
      * Returns true if the disableNuspec command line argument was specified.
-  440   -
      *
+
     public boolean isArchiveDisabled() {
+  440  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_ARCHIVE);
 441   -
      * @return true if the disableNuspec command line argument was specified; otherwise false
+
     }
 442   -
      */
+
 
 443   -
     public boolean isNuspecDisabled() {
-  444  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_NUSPEC);
+
     /**
+  444   +
      * Returns true if the disableNuspec command line argument was specified.
 445   -
     }
+
      *
 446   -
 
+
      * @return true if the disableNuspec command line argument was specified; otherwise false
 447   -
     /**
+
      */
 448   -
      * Returns true if the disableAssembly command line argument was specified.
-  449   -
      *
+
     public boolean isNuspecDisabled() {
+  449  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_NUSPEC);
 450   -
      * @return true if the disableAssembly command line argument was specified; otherwise false
+
     }
 451   -
      */
+
 
 452   -
     public boolean isAssemblyDisabled() {
-  453  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_ASSEMBLY);
+
     /**
+  453   +
      * Returns true if the disableAssembly command line argument was specified.
 454   -
     }
+
      *
 455   -
 
+
      * @return true if the disableAssembly command line argument was specified; otherwise false
 456   -
     /**
+
      */
 457   -
      * Returns true if the disableNexus command line argument was specified.
-  458   -
      *
+
     public boolean isAssemblyDisabled() {
+  458  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_ASSEMBLY);
 459   -
      * @return true if the disableNexus command line argument was specified; otherwise false
+
     }
 460   -
      */
+
 
 461   -
     public boolean isNexusDisabled() {
-  462  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_NEXUS);
+
     /**
+  462   +
      * Returns true if the disableNexus command line argument was specified.
 463   -
     }
+
      *
 464   -
 
+
      * @return true if the disableNexus command line argument was specified; otherwise false
 465   -
     /**
+
      */
 466   -
      * Returns true if the disableCentral command line argument was specified.
-  467   -
      *
+
     public boolean isNexusDisabled() {
+  467  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_NEXUS);
 468   -
      * @return true if the disableCentral command line argument was specified; otherwise false
+
     }
 469   -
      */
+
 
 470   -
     public boolean isCentralDisabled() {
-  471  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_CENTRAL);
+
     /**
+  471   +
      * Returns true if the disableCentral command line argument was specified.
 472   -
     }
+
      *
 473   -
 
+
      * @return true if the disableCentral command line argument was specified; otherwise false
 474   -
     /**
+
      */
 475   -
      * Returns the url to the nexus server if one was specified.
-  476   -
      *
+
     public boolean isCentralDisabled() {
+  476  0
         return (line != null) && line.hasOption(ARGUMENT.DISABLE_CENTRAL);
 477   -
      * @return the url to the nexus server; if none was specified this will return null;
+
     }
 478   -
      */
+
 
 479   -
     public String getNexusUrl() {
-  480  0
         if (line == null || !line.hasOption(ARGUMENT.NEXUS_URL)) {
-  481  0
             return null;
+
     /**
+  480   +
      * Returns the url to the nexus server if one was specified.
+  481   +
      *
 482   -
         } else {
-  483  0
             return line.getOptionValue(ARGUMENT.NEXUS_URL);
+
      * @return the url to the nexus server; if none was specified this will return null;
+  483   +
      */
 484   -
         }
-  485   -
     }
-  486   -
 
+
     public String getNexusUrl() {
+  485  0
         if (line == null || !line.hasOption(ARGUMENT.NEXUS_URL)) {
+  486  0
             return null;
 487   -
     /**
-  488   -
      * Returns true if the Nexus Analyzer should use the configured proxy to connect to Nexus; otherwise false is returned.
-  489   -
      *
-  490   -
      * @return true if the Nexus Analyzer should use the configured proxy to connect to Nexus; otherwise false
-  491   -
      */
-  492   -
     public boolean isNexusUsesProxy() {
-  493   -
         // If they didn't specify whether Nexus needs to use the proxy, we should
-  494   -
         // still honor the property if it's set.
-  495  0
         if (line == null || !line.hasOption(ARGUMENT.NEXUS_USES_PROXY)) {
-  496   -
             try {
-  497  0
                 return Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY);
-  498  0
             } catch (InvalidSettingException ise) {
-  499  0
                 return true;
-  500   -
             }
-  501  
         } else {
-  502  0
             return Boolean.parseBoolean(line.getOptionValue(ARGUMENT.NEXUS_USES_PROXY));
-  503   +  488  0
             return line.getOptionValue(ARGUMENT.NEXUS_URL);
+  489  
         }
-  504   +  490  
     }
+  491   +
 
+  492   +
     /**
+  493   +
      * Returns true if the Nexus Analyzer should use the configured proxy to connect to Nexus; otherwise false is returned.
+  494   +
      *
+  495   +
      * @return true if the Nexus Analyzer should use the configured proxy to connect to Nexus; otherwise false
+  496   +
      */
+  497   +
     public boolean isNexusUsesProxy() {
+  498   +
         // If they didn't specify whether Nexus needs to use the proxy, we should
+  499   +
         // still honor the property if it's set.
+  500  0
         if (line == null || !line.hasOption(ARGUMENT.NEXUS_USES_PROXY)) {
+  501   +
             try {
+  502  0
                 return Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY);
+  503  0
             } catch (InvalidSettingException ise) {
+  504  0
                 return true;
 505   -
 
-  506   -
     /**
-  507   -
      * Displays the command line help message to the standard output.
-  508   -
      */
-  509   -
     public void printHelp() {
-  510  2
         final HelpFormatter formatter = new HelpFormatter();
-  511  2
         final Options options = new Options();
-  512  2
         addStandardOptions(options);
-  513  2
         if (line != null && line.hasOption(ARGUMENT.ADVANCED_HELP)) {
-  514  0
             addAdvancedOptions(options);
-  515   -
         }
-  516  2
         final String helpMsg = String.format("%n%s"
-  517   -
                 + " can be used to identify if there are any known CVE vulnerabilities in libraries utilized by an application. "
-  518   -
                 + "%s will automatically update required data from the Internet, such as the CVE and CPE data files from nvd.nist.gov.%n%n",
-  519   -
                 Settings.getString("application.name", "DependencyCheck"),
-  520   -
                 Settings.getString("application.name", "DependencyCheck"));
-  521   -
 
-  522  2
         formatter.printHelp(Settings.getString("application.name", "DependencyCheck"),
-  523   -
                 helpMsg,
-  524   -
                 options,
-  525   -
                 "",
-  526   -
                 true);
-  527  2
     }
-  528   -
 
-  529   -
     /**
-  530   -
      * Retrieves the file command line parameter(s) specified for the 'scan' argument.
-  531   -
      *
-  532   -
      * @return the file paths specified on the command line for scan
-  533   -
      */
-  534   -
     public String[] getScanFiles() {
-  535  3
         return line.getOptionValues(ARGUMENT.SCAN);
-  536   -
     }
-  537   -
 
-  538   -
     /**
-  539   -
      * Retrieves the list of excluded file patterns specified by the 'exclude' argument.
-  540   -
      *
-  541   -
      * @return the excluded file patterns
-  542   -
      */
-  543   -
     public String[] getExcludeList() {
-  544  0
         return line.getOptionValues(ARGUMENT.EXCLUDE);
-  545   -
     }
-  546   -
 
-  547   -
     /**
-  548   -
      * Returns the directory to write the reports to specified on the command line.
-  549   -
      *
-  550   -
      * @return the path to the reports directory.
-  551   -
      */
-  552   -
     public String getReportDirectory() {
-  553  1
         return line.getOptionValue(ARGUMENT.OUT, ".");
-  554   -
     }
-  555   -
 
-  556   -
     /**
-  557   -
      * Returns the path to Mono for .NET Assembly analysis on non-windows systems.
-  558   -
      *
-  559   -
      * @return the path to Mono
-  560   -
      */
-  561   -
     public String getPathToMono() {
-  562  1
         return line.getOptionValue(ARGUMENT.PATH_TO_MONO);
-  563   -
     }
-  564   -
 
-  565   -
     /**
-  566   -
      * Returns the output format specified on the command line. Defaults to HTML if no format was specified.
-  567   -
      *
-  568   -
      * @return the output format name.
-  569   -
      */
-  570   -
     public String getReportFormat() {
-  571  1
         return line.getOptionValue(ARGUMENT.OUTPUT_FORMAT, "HTML");
-  572   -
     }
-  573   -
 
-  574   -
     /**
-  575   -
      * Returns the application name specified on the command line.
-  576   -
      *
-  577   -
      * @return the application name.
-  578   -
      */
-  579   -
     public String getApplicationName() {
-  580  0
         return line.getOptionValue(ARGUMENT.APP_NAME);
-  581   -
     }
-  582   -
 
-  583   -
     /**
-  584   -
      * Returns the connection timeout.
-  585   -
      *
-  586   -
      * @return the connection timeout
-  587   -
      */
-  588   -
     public String getConnectionTimeout() {
-  589  0
         return line.getOptionValue(ARGUMENT.CONNECTION_TIMEOUT);
-  590   -
     }
-  591   -
 
-  592   -
     /**
-  593   -
      * Returns the proxy server.
-  594   -
      *
-  595   -
      * @return the proxy server
-  596   -
      */
-  597   -
     public String getProxyServer() {
-  598   -
 
-  599  0
         String server = line.getOptionValue(ARGUMENT.PROXY_SERVER);
-  600  0
         if (server == null) {
-  601  0
             server = line.getOptionValue(ARGUMENT.PROXY_URL);
-  602  0
             if (server != null) {
-  603  0
                 LOGGER.warning("An old command line argument 'proxyurl' was detected; use proxyserver instead");
-  604  
             }
-  605   +  506   +
         } else {
+  507  0
             return Boolean.parseBoolean(line.getOptionValue(ARGUMENT.NEXUS_USES_PROXY));
+  508  
         }
-  606  0
         return server;
-  607   +  509  
     }
-  608   +  510  
 
+  511   +
     /**
+  512   +
      * Displays the command line help message to the standard output.
+  513   +
      */
+  514   +
     public void printHelp() {
+  515  2
         final HelpFormatter formatter = new HelpFormatter();
+  516  2
         final Options options = new Options();
+  517  2
         addStandardOptions(options);
+  518  2
         if (line != null && line.hasOption(ARGUMENT.ADVANCED_HELP)) {
+  519  0
             addAdvancedOptions(options);
+  520   +
         }
+  521  2
         final String helpMsg = String.format("%n%s"
+  522   +
                 + " can be used to identify if there are any known CVE vulnerabilities in libraries utilized by an application. "
+  523   +
                 + "%s will automatically update required data from the Internet, such as the CVE and CPE data files from nvd.nist.gov.%n%n",
+  524   +
                 Settings.getString("application.name", "DependencyCheck"),
+  525   +
                 Settings.getString("application.name", "DependencyCheck"));
+  526   +
 
+  527  2
         formatter.printHelp(Settings.getString("application.name", "DependencyCheck"),
+  528   +
                 helpMsg,
+  529   +
                 options,
+  530   +
                 "",
+  531   +
                 true);
+  532  2
     }
+  533   +
 
+  534   +
     /**
+  535   +
      * Retrieves the file command line parameter(s) specified for the 'scan' argument.
+  536   +
      *
+  537   +
      * @return the file paths specified on the command line for scan
+  538   +
      */
+  539   +
     public String[] getScanFiles() {
+  540  3
         return line.getOptionValues(ARGUMENT.SCAN);
+  541   +
     }
+  542   +
 
+  543   +
     /**
+  544   +
      * Retrieves the list of excluded file patterns specified by the 'exclude' argument.
+  545   +
      *
+  546   +
      * @return the excluded file patterns
+  547   +
      */
+  548   +
     public String[] getExcludeList() {
+  549  0
         return line.getOptionValues(ARGUMENT.EXCLUDE);
+  550   +
     }
+  551   +
 
+  552   +
     /**
+  553   +
      * Returns the directory to write the reports to specified on the command line.
+  554   +
      *
+  555   +
      * @return the path to the reports directory.
+  556   +
      */
+  557   +
     public String getReportDirectory() {
+  558  1
         return line.getOptionValue(ARGUMENT.OUT, ".");
+  559   +
     }
+  560   +
 
+  561   +
     /**
+  562   +
      * Returns the path to Mono for .NET Assembly analysis on non-windows systems.
+  563   +
      *
+  564   +
      * @return the path to Mono
+  565   +
      */
+  566   +
     public String getPathToMono() {
+  567  1
         return line.getOptionValue(ARGUMENT.PATH_TO_MONO);
+  568   +
     }
+  569   +
 
+  570   +
     /**
+  571   +
      * Returns the output format specified on the command line. Defaults to HTML if no format was specified.
+  572   +
      *
+  573   +
      * @return the output format name.
+  574   +
      */
+  575   +
     public String getReportFormat() {
+  576  1
         return line.getOptionValue(ARGUMENT.OUTPUT_FORMAT, "HTML");
+  577   +
     }
+  578   +
 
+  579   +
     /**
+  580   +
      * Returns the application name specified on the command line.
+  581   +
      *
+  582   +
      * @return the application name.
+  583   +
      */
+  584   +
     public String getApplicationName() {
+  585  0
         return line.getOptionValue(ARGUMENT.APP_NAME);
+  586   +
     }
+  587   +
 
+  588   +
     /**
+  589   +
      * Returns the connection timeout.
+  590   +
      *
+  591   +
      * @return the connection timeout
+  592   +
      */
+  593   +
     public String getConnectionTimeout() {
+  594  0
         return line.getOptionValue(ARGUMENT.CONNECTION_TIMEOUT);
+  595   +
     }
+  596   +
 
+  597   +
     /**
+  598   +
      * Returns the proxy server.
+  599   +
      *
+  600   +
      * @return the proxy server
+  601   +
      */
+  602   +
     public String getProxyServer() {
+  603   +
 
+  604  0
         String server = line.getOptionValue(ARGUMENT.PROXY_SERVER);
+  605  0
         if (server == null) {
+  606  0
             server = line.getOptionValue(ARGUMENT.PROXY_URL);
+  607  0
             if (server != null) {
+  608  0
                 LOGGER.warning("An old command line argument 'proxyurl' was detected; use proxyserver instead");
 609   -
     /**
+
             }
 610   -
      * Returns the proxy port.
-  611   -
      *
-  612   -
      * @return the proxy port
-  613   -
      */
-  614   -
     public String getProxyPort() {
-  615  0
         return line.getOptionValue(ARGUMENT.PROXY_PORT);
-  616   -
     }
-  617   -
 
-  618   -
     /**
-  619   -
      * Returns the proxy username.
-  620   -
      *
-  621   -
      * @return the proxy username
-  622   -
      */
-  623   -
     public String getProxyUsername() {
-  624  0
         return line.getOptionValue(ARGUMENT.PROXY_USERNAME);
-  625   -
     }
-  626   -
 
-  627   -
     /**
-  628   -
      * Returns the proxy password.
-  629   -
      *
-  630   -
      * @return the proxy password
-  631   -
      */
-  632   -
     public String getProxyPassword() {
-  633  0
         return line.getOptionValue(ARGUMENT.PROXY_PASSWORD);
-  634   -
     }
-  635   -
 
-  636   -
     /**
-  637   -
      * Get the value of dataDirectory.
-  638   -
      *
-  639   -
      * @return the value of dataDirectory
-  640   -
      */
-  641   -
     public String getDataDirectory() {
-  642  0
         return line.getOptionValue(ARGUMENT.DATA_DIRECTORY);
-  643   -
     }
-  644   -
 
-  645   -
     /**
-  646   -
      * Returns the properties file specified on the command line.
-  647   -
      *
-  648   -
      * @return the properties file specified on the command line
-  649   -
      */
-  650   -
     public File getPropertiesFile() {
-  651  0
         final String path = line.getOptionValue(ARGUMENT.PROP);
-  652  0
         if (path != null) {
-  653  0
             return new File(path);
-  654  
         }
-  655  0
         return null;
-  656   +  611  0
         return server;
+  612  
     }
-  657   +  613  
 
-  658   +  614  
     /**
+  615   +
      * Returns the proxy port.
+  616   +
      *
+  617   +
      * @return the proxy port
+  618   +
      */
+  619   +
     public String getProxyPort() {
+  620  0
         return line.getOptionValue(ARGUMENT.PROXY_PORT);
+  621   +
     }
+  622   +
 
+  623   +
     /**
+  624   +
      * Returns the proxy username.
+  625   +
      *
+  626   +
      * @return the proxy username
+  627   +
      */
+  628   +
     public String getProxyUsername() {
+  629  0
         return line.getOptionValue(ARGUMENT.PROXY_USERNAME);
+  630   +
     }
+  631   +
 
+  632   +
     /**
+  633   +
      * Returns the proxy password.
+  634   +
      *
+  635   +
      * @return the proxy password
+  636   +
      */
+  637   +
     public String getProxyPassword() {
+  638  0
         return line.getOptionValue(ARGUMENT.PROXY_PASSWORD);
+  639   +
     }
+  640   +
 
+  641   +
     /**
+  642   +
      * Get the value of dataDirectory.
+  643   +
      *
+  644   +
      * @return the value of dataDirectory
+  645   +
      */
+  646   +
     public String getDataDirectory() {
+  647  0
         return line.getOptionValue(ARGUMENT.DATA_DIRECTORY);
+  648   +
     }
+  649   +
 
+  650   +
     /**
+  651   +
      * Returns the properties file specified on the command line.
+  652   +
      *
+  653   +
      * @return the properties file specified on the command line
+  654   +
      */
+  655   +
     public File getPropertiesFile() {
+  656  0
         final String path = line.getOptionValue(ARGUMENT.PROP);
+  657  0
         if (path != null) {
+  658  0
             return new File(path);
 659   -
      * Returns the path to the verbose log file.
-  660   -
      *
+
         }
+  660  0
         return null;
 661   -
      * @return the path to the verbose log file
+
     }
 662   -
      */
+
 
 663   -
     public String getVerboseLog() {
-  664  0
         return line.getOptionValue(ARGUMENT.VERBOSE_LOG);
+
     /**
+  664   +
      * Returns the path to the verbose log file.
 665   -
     }
+
      *
 666   -
 
+
      * @return the path to the verbose log file
 667   -
     /**
+
      */
 668   -
      * Returns the path to the suppression file.
-  669   -
      *
+
     public String getVerboseLog() {
+  669  0
         return line.getOptionValue(ARGUMENT.VERBOSE_LOG);
 670   -
      * @return the path to the suppression file
+
     }
 671   -
      */
+
 
 672   -
     public String getSuppressionFile() {
-  673  0
         return line.getOptionValue(ARGUMENT.SUPPRESSION_FILE);
+
     /**
+  673   +
      * Returns the path to the suppression file.
 674   -
     }
+
      *
 675   -
 
+
      * @return the path to the suppression file
 676   -
     /**
+
      */
 677   -
      * <p>
-  678   -
      * Prints the manifest information to standard output.</p>
+
     public String getSuppressionFile() {
+  678  0
         return line.getOptionValue(ARGUMENT.SUPPRESSION_FILE);
 679   -
      * <ul><li>Implementation-Title: ${pom.name}</li>
+
     }
 680   -
      * <li>Implementation-Version: ${pom.version}</li></ul>
+
 
 681   -
      */
+
     /**
 682   -
     public void printVersionInfo() {
-  683  1
         final String version = String.format("%s version %s",
+
      * <p>
+  683   +
      * Prints the manifest information to standard output.</p>
 684   -
                 Settings.getString(Settings.KEYS.APPLICATION_VAME, "dependency-check"),
+
      * <ul><li>Implementation-Title: ${pom.name}</li>
 685   -
                 Settings.getString(Settings.KEYS.APPLICATION_VERSION, "Unknown"));
-  686  1
         System.out.println(version);
-  687  1
     }
-  688   -
 
+
      * <li>Implementation-Version: ${pom.version}</li></ul>
+  686   +
      */
+  687   +
     public void printVersionInfo() {
+  688  1
         final String version = String.format("%s version %s",
 689   -
     /**
+
                 Settings.getString(Settings.KEYS.APPLICATION_VAME, "dependency-check"),
 690   -
      * Checks if the auto update feature has been disabled. If it has been disabled via the command line this will return false.
-  691   -
      *
-  692   -
      * @return if auto-update is allowed.
+
                 Settings.getString(Settings.KEYS.APPLICATION_VERSION, "Unknown"));
+  691  1
         System.out.println(version);
+  692  1
     }
 693   -
      */
+
 
 694   -
     public boolean isAutoUpdate() {
-  695  0
         return (line == null) || !line.hasOption(ARGUMENT.DISABLE_AUTO_UPDATE);
+
     /**
+  695   +
      * Checks if the auto update feature has been disabled. If it has been disabled via the command line this will return false.
 696   -
     }
+
      *
 697   -
 
+
      * @return <code>true</code> if auto-update is allowed; otherwise <code>false</code>
 698   -
     /**
+
      */
 699   -
      * Returns the database driver name if specified; otherwise null is returned.
-  700   -
      *
+
     public boolean isAutoUpdate() {
+  700  0
         return (line == null) || !line.hasOption(ARGUMENT.DISABLE_AUTO_UPDATE);
 701   -
      * @return the database driver name if specified; otherwise null is returned
+
     }
 702   -
      */
+
 
 703   -
     public String getDatabaseDriverName() {
-  704  0
         return line.getOptionValue(ARGUMENT.DB_DRIVER);
+
     /**
+  704   +
      * Checks if the update only flag has been set.
 705   -
     }
+
      *
 706   -
 
+
      * @return <code>true</code> if the update only flag has been set; otherwise <code>false</code>.
 707   -
     /**
+
      */
 708   -
      * Returns the database driver path if specified; otherwise null is returned.
-  709   -
      *
+
     public boolean isUpdateOnly() {
+  709  0
         return (line == null) || line.hasOption(ARGUMENT.UPDATE_ONLY);
 710   -
      * @return the database driver name if specified; otherwise null is returned
+
     }
 711   -
      */
+
 
 712   -
     public String getDatabaseDriverPath() {
-  713  0
         return line.getOptionValue(ARGUMENT.DB_DRIVER_PATH);
+
     /**
+  713   +
      * Returns the database driver name if specified; otherwise null is returned.
 714   -
     }
+
      *
 715   -
 
+
      * @return the database driver name if specified; otherwise null is returned
 716   -
     /**
+
      */
 717   -
      * Returns the database connection string if specified; otherwise null is returned.
-  718   -
      *
+
     public String getDatabaseDriverName() {
+  718  0
         return line.getOptionValue(ARGUMENT.DB_DRIVER);
 719   -
      * @return the database connection string if specified; otherwise null is returned
+
     }
 720   -
      */
+
 
 721   -
     public String getConnectionString() {
-  722  0
         return line.getOptionValue(ARGUMENT.CONNECTION_STRING);
+
     /**
+  722   +
      * Returns the database driver path if specified; otherwise null is returned.
 723   -
     }
+
      *
 724   -
 
+
      * @return the database driver name if specified; otherwise null is returned
 725   -
     /**
+
      */
 726   -
      * Returns the database database user name if specified; otherwise null is returned.
-  727   -
      *
+
     public String getDatabaseDriverPath() {
+  727  0
         return line.getOptionValue(ARGUMENT.DB_DRIVER_PATH);
 728   -
      * @return the database database user name if specified; otherwise null is returned
+
     }
 729   -
      */
+
 
 730   -
     public String getDatabaseUser() {
-  731  0
         return line.getOptionValue(ARGUMENT.DB_NAME);
+
     /**
+  731   +
      * Returns the database connection string if specified; otherwise null is returned.
 732   -
     }
+
      *
 733   -
 
+
      * @return the database connection string if specified; otherwise null is returned
 734   -
     /**
+
      */
 735   -
      * Returns the database database password if specified; otherwise null is returned.
-  736   -
      *
+
     public String getConnectionString() {
+  736  0
         return line.getOptionValue(ARGUMENT.CONNECTION_STRING);
 737   -
      * @return the database database password if specified; otherwise null is returned
+
     }
 738   -
      */
+
 
 739   -
     public String getDatabasePassword() {
-  740  0
         return line.getOptionValue(ARGUMENT.DB_PASSWORD);
+
     /**
+  740   +
      * Returns the database database user name if specified; otherwise null is returned.
 741   -
     }
-  742   -
 
-  743   -
     /**
-  744   -
      * Returns the additional Extensions if specified; otherwise null is returned.
-  745  
      *
+  742   +
      * @return the database database user name if specified; otherwise null is returned
+  743   +
      */
+  744   +
     public String getDatabaseUser() {
+  745  0
         return line.getOptionValue(ARGUMENT.DB_NAME);
 746   -
      * @return the additional Extensions; otherwise null is returned
-  747   -
      */
-  748   -
     public String getAdditionalZipExtensions() {
-  749  0
         return line.getOptionValue(ARGUMENT.ADDITIONAL_ZIP_EXTENSIONS);
-  750  
     }
-  751   +  747  
 
-  752   +  748  
     /**
-  753   -
      * A collection of static final strings that represent the possible command line arguments.
-  754   +  749   +
      * Returns the database database password if specified; otherwise null is returned.
+  750   +
      *
+  751   +
      * @return the database database password if specified; otherwise null is returned
+  752  
      */
-  755  9
     public static class ARGUMENT {
+  753   +
     public String getDatabasePassword() {
+  754  0
         return line.getOptionValue(ARGUMENT.DB_PASSWORD);
+  755   +
     }
 756  
 
 757   -
         /**
+
     /**
 758   -
          * The long CLI argument name specifying the directory/file to scan.
+
      * Returns the additional Extensions if specified; otherwise null is returned.
 759   -
          */
+
      *
 760   -
         public static final String SCAN = "scan";
+
      * @return the additional Extensions; otherwise null is returned
 761   -
         /**
+
      */
 762   -
          * The short CLI argument name specifying the directory/file to scan.
-  763   -
          */
+
     public String getAdditionalZipExtensions() {
+  763  0
         return line.getOptionValue(ARGUMENT.ADDITIONAL_ZIP_EXTENSIONS);
 764   -
         public static final String SCAN_SHORT = "s";
+
     }
 765   -
         /**
+
 
 766   -
          * The long CLI argument name specifying that the CPE/CVE/etc. data should not be automatically updated.
+
     /**
 767   -
          */
+
      * A collection of static final strings that represent the possible command line arguments.
 768   -
         public static final String DISABLE_AUTO_UPDATE = "noupdate";
-  769   -
         /**
+
      */
+  769  9
     public static class ARGUMENT {
 770   -
          * The short CLI argument name specifying that the CPE/CVE/etc. data should not be automatically updated.
+
 
 771   -
          */
+
         /**
 772   -
         public static final String DISABLE_AUTO_UPDATE_SHORT = "n";
+
          * The long CLI argument name specifying the directory/file to scan.
 773   -
         /**
+
          */
 774   -
          * The long CLI argument name specifying the directory to write the reports to.
+
         public static final String SCAN = "scan";
 775   -
          */
+
         /**
 776   -
         public static final String OUT = "out";
+
          * The short CLI argument name specifying the directory/file to scan.
 777   -
         /**
+
          */
 778   -
          * The short CLI argument name specifying the directory to write the reports to.
+
         public static final String SCAN_SHORT = "s";
 779   -
          */
+
         /**
 780   -
         public static final String OUT_SHORT = "o";
+
          * The long CLI argument name specifying that the CPE/CVE/etc. data should not be automatically updated.
 781   -
         /**
+
          */
 782   -
          * The long CLI argument name specifying the output format to write the reports to.
+
         public static final String DISABLE_AUTO_UPDATE = "noupdate";
 783   -
          */
+
         /**
 784   -
         public static final String OUTPUT_FORMAT = "format";
+
          * The short CLI argument name specifying that the CPE/CVE/etc. data should not be automatically updated.
 785   -
         /**
+
          */
 786   -
          * The short CLI argument name specifying the output format to write the reports to.
+
         public static final String DISABLE_AUTO_UPDATE_SHORT = "n";
 787   -
          */
+
         /**
 788   -
         public static final String OUTPUT_FORMAT_SHORT = "f";
+
          * The long CLI argument name specifying that only the update phase should be executed; no scan should be run.
 789   -
         /**
+
          */
 790   -
          * The long CLI argument name specifying the name of the application to be scanned.
+
         public static final String UPDATE_ONLY = "updateonly";
 791   -
          */
+
         /**
 792   -
         public static final String APP_NAME = "app";
+
          * The long CLI argument name specifying the directory to write the reports to.
 793   -
         /**
+
          */
 794   -
          * The short CLI argument name specifying the name of the application to be scanned.
+
         public static final String OUT = "out";
 795   -
          */
+
         /**
 796   -
         public static final String APP_NAME_SHORT = "a";
+
          * The short CLI argument name specifying the directory to write the reports to.
 797   -
         /**
+
          */
 798   -
          * The long CLI argument name asking for help.
+
         public static final String OUT_SHORT = "o";
 799   -
          */
+
         /**
 800   -
         public static final String HELP = "help";
+
          * The long CLI argument name specifying the output format to write the reports to.
 801   -
         /**
+
          */
 802   -
          * The long CLI argument name asking for advanced help.
+
         public static final String OUTPUT_FORMAT = "format";
 803   -
          */
+
         /**
 804   -
         public static final String ADVANCED_HELP = "advancedHelp";
+
          * The short CLI argument name specifying the output format to write the reports to.
 805   -
         /**
+
          */
 806   -
          * The short CLI argument name asking for help.
+
         public static final String OUTPUT_FORMAT_SHORT = "f";
 807   -
          */
+
         /**
 808   -
         public static final String HELP_SHORT = "h";
+
          * The long CLI argument name specifying the name of the application to be scanned.
 809   -
         /**
+
          */
 810   -
          * The long CLI argument name asking for the version.
+
         public static final String APP_NAME = "app";
 811   -
          */
+
         /**
 812   -
         public static final String VERSION_SHORT = "v";
+
          * The short CLI argument name specifying the name of the application to be scanned.
 813   -
         /**
+
          */
 814   -
          * The short CLI argument name asking for the version.
+
         public static final String APP_NAME_SHORT = "a";
 815   -
          */
+
         /**
 816   -
         public static final String VERSION = "version";
+
          * The long CLI argument name asking for help.
 817   -
         /**
+
          */
 818   -
          * The CLI argument name indicating the proxy port.
+
         public static final String HELP = "help";
 819   -
          */
+
         /**
 820   -
         public static final String PROXY_PORT = "proxyport";
+
          * The long CLI argument name asking for advanced help.
 821   -
         /**
-  822   -
          * The CLI argument name indicating the proxy server.
-  823  
          */
-  824   -
         public static final String PROXY_SERVER = "proxyserver";
-  825   +  822   +
         public static final String ADVANCED_HELP = "advancedHelp";
+  823  
         /**
+  824   +
          * The short CLI argument name asking for help.
+  825   +
          */
 826   -
          * The CLI argument name indicating the proxy url.
+
         public static final String HELP_SHORT = "h";
 827   -
          *
+
         /**
 828   -
          * @deprecated use {@link org.owasp.dependencycheck.cli.CliParser.ArgumentName#PROXY_SERVER} instead
+
          * The long CLI argument name asking for the version.
 829  
          */
 830   -
         @Deprecated
+
         public static final String VERSION_SHORT = "v";
 831   -
         public static final String PROXY_URL = "proxyurl";
+
         /**
 832   -
         /**
+
          * The short CLI argument name asking for the version.
 833   -
          * The CLI argument name indicating the proxy username.
+
          */
 834   -
          */
+
         public static final String VERSION = "version";
 835   -
         public static final String PROXY_USERNAME = "proxyuser";
+
         /**
 836   -
         /**
+
          * The CLI argument name indicating the proxy port.
 837   -
          * The CLI argument name indicating the proxy password.
+
          */
 838   -
          */
+
         public static final String PROXY_PORT = "proxyport";
 839   -
         public static final String PROXY_PASSWORD = "proxypass";
+
         /**
 840   -
         /**
+
          * The CLI argument name indicating the proxy server.
 841   -
          * The short CLI argument name indicating the connection timeout.
+
          */
 842   -
          */
+
         public static final String PROXY_SERVER = "proxyserver";
 843   -
         public static final String CONNECTION_TIMEOUT_SHORT = "c";
+
         /**
 844   -
         /**
+
          * The CLI argument name indicating the proxy url.
 845   -
          * The CLI argument name indicating the connection timeout.
+
          *
 846   -
          */
+
          * @deprecated use {@link org.owasp.dependencycheck.cli.CliParser.ArgumentName#PROXY_SERVER} instead
 847   -
         public static final String CONNECTION_TIMEOUT = "connectiontimeout";
+
          */
 848   -
         /**
+
         @Deprecated
 849   -
          * The short CLI argument name for setting the location of an additional properties file.
+
         public static final String PROXY_URL = "proxyurl";
 850   -
          */
+
         /**
 851   -
         public static final String PROP_SHORT = "P";
+
          * The CLI argument name indicating the proxy username.
 852   -
         /**
+
          */
 853   -
          * The CLI argument name for setting the location of an additional properties file.
+
         public static final String PROXY_USERNAME = "proxyuser";
 854   -
          */
+
         /**
 855   -
         public static final String PROP = "propertyfile";
+
          * The CLI argument name indicating the proxy password.
 856   -
         /**
+
          */
 857   -
          * The CLI argument name for setting the location of the data directory.
+
         public static final String PROXY_PASSWORD = "proxypass";
 858   -
          */
+
         /**
 859   -
         public static final String DATA_DIRECTORY = "data";
+
          * The short CLI argument name indicating the connection timeout.
 860   -
         /**
+
          */
 861   -
          * The short CLI argument name for setting the location of the data directory.
+
         public static final String CONNECTION_TIMEOUT_SHORT = "c";
 862   -
          */
+
         /**
 863   -
         public static final String DATA_DIRECTORY_SHORT = "d";
+
          * The CLI argument name indicating the connection timeout.
 864   -
         /**
+
          */
 865   -
          * The CLI argument name for setting the location of the data directory.
+
         public static final String CONNECTION_TIMEOUT = "connectiontimeout";
 866   -
          */
+
         /**
 867   -
         public static final String VERBOSE_LOG = "log";
+
          * The short CLI argument name for setting the location of an additional properties file.
 868   -
         /**
+
          */
 869   -
          * The short CLI argument name for setting the location of the data directory.
+
         public static final String PROP_SHORT = "P";
 870   -
          */
+
         /**
 871   -
         public static final String VERBOSE_LOG_SHORT = "l";
+
          * The CLI argument name for setting the location of an additional properties file.
 872   -
         /**
+
          */
 873   -
          * The CLI argument name for setting the location of the suppression file.
+
         public static final String PROP = "propertyfile";
 874   -
          */
+
         /**
 875   -
         public static final String SUPPRESSION_FILE = "suppression";
+
          * The CLI argument name for setting the location of the data directory.
 876   -
         /**
+
          */
 877   -
          * Disables the Jar Analyzer.
+
         public static final String DATA_DIRECTORY = "data";
 878   -
          */
+
         /**
 879   -
         public static final String DISABLE_JAR = "disableJar";
+
          * The short CLI argument name for setting the location of the data directory.
 880   -
         /**
+
          */
 881   -
          * Disables the Archive Analyzer.
+
         public static final String DATA_DIRECTORY_SHORT = "d";
 882   -
          */
+
         /**
 883   -
         public static final String DISABLE_ARCHIVE = "disableArchive";
+
          * The CLI argument name for setting the location of the data directory.
 884   -
         /**
+
          */
 885   -
          * Disables the Assembly Analyzer.
+
         public static final String VERBOSE_LOG = "log";
 886   -
          */
+
         /**
 887   -
         public static final String DISABLE_ASSEMBLY = "disableAssembly";
+
          * The short CLI argument name for setting the location of the data directory.
 888   -
         /**
+
          */
 889   -
          * Disables the Nuspec Analyzer.
+
         public static final String VERBOSE_LOG_SHORT = "l";
 890   -
          */
+
         /**
 891   -
         public static final String DISABLE_NUSPEC = "disableNuspec";
+
          * The CLI argument name for setting the location of the suppression file.
 892   -
         /**
+
          */
 893   -
          * Disables the Central Analyzer.
+
         public static final String SUPPRESSION_FILE = "suppression";
 894   -
          */
+
         /**
 895   -
         public static final String DISABLE_CENTRAL = "disableCentral";
+
          * Disables the Jar Analyzer.
 896   -
         /**
+
          */
 897   -
          * Disables the Nexus Analyzer.
+
         public static final String DISABLE_JAR = "disableJar";
 898   -
          */
+
         /**
 899   -
         public static final String DISABLE_NEXUS = "disableNexus";
+
          * Disables the Archive Analyzer.
 900   -
         /**
+
          */
 901   -
          * The URL of the nexus server.
+
         public static final String DISABLE_ARCHIVE = "disableArchive";
 902   -
          */
+
         /**
 903   -
         public static final String NEXUS_URL = "nexus";
+
          * Disables the Assembly Analyzer.
 904   -
         /**
+
          */
 905   -
          * Whether or not the defined proxy should be used when connecting to Nexus.
+
         public static final String DISABLE_ASSEMBLY = "disableAssembly";
 906   -
          */
+
         /**
 907   -
         public static final String NEXUS_USES_PROXY = "nexusUsesProxy";
+
          * Disables the Nuspec Analyzer.
 908   -
         /**
+
          */
 909   -
          * The CLI argument name for setting the connection string.
+
         public static final String DISABLE_NUSPEC = "disableNuspec";
 910   -
          */
+
         /**
 911   -
         public static final String CONNECTION_STRING = "connectionString";
+
          * Disables the Central Analyzer.
 912   -
         /**
+
          */
 913   -
          * The CLI argument name for setting the database user name.
+
         public static final String DISABLE_CENTRAL = "disableCentral";
 914   -
          */
+
         /**
 915   -
         public static final String DB_NAME = "dbUser";
+
          * Disables the Nexus Analyzer.
 916   -
         /**
+
          */
 917   -
          * The CLI argument name for setting the database password.
+
         public static final String DISABLE_NEXUS = "disableNexus";
 918   -
          */
+
         /**
 919   -
         public static final String DB_PASSWORD = "dbPassword";
+
          * The URL of the nexus server.
 920   -
         /**
+
          */
 921   -
          * The CLI argument name for setting the database driver name.
+
         public static final String NEXUS_URL = "nexus";
 922   -
          */
+
         /**
 923   -
         public static final String DB_DRIVER = "dbDriverName";
+
          * Whether or not the defined proxy should be used when connecting to Nexus.
 924   -
         /**
+
          */
 925   -
          * The CLI argument name for setting the path to the database driver; in case it is not on the class path.
+
         public static final String NEXUS_USES_PROXY = "nexusUsesProxy";
 926   -
          */
+
         /**
 927   -
         public static final String DB_DRIVER_PATH = "dbDriverPath";
+
          * The CLI argument name for setting the connection string.
 928   -
         /**
+
          */
 929   -
          * The CLI argument name for setting the path to mono for .NET Assembly analysis on non-windows systems.
+
         public static final String CONNECTION_STRING = "connectionString";
 930   -
          */
+
         /**
 931   -
         public static final String PATH_TO_MONO = "mono";
+
          * The CLI argument name for setting the database user name.
 932   -
         /**
+
          */
 933   -
          * The CLI argument name for setting extra extensions.
+
         public static final String DB_NAME = "dbUser";
 934   -
          */
-  935   -
         public static final String ADDITIONAL_ZIP_EXTENSIONS = "zipExtensions";
-  936  
         /**
-  937   -
          * Exclude path argument.
-  938   +  935   +
          * The CLI argument name for setting the database password.
+  936  
          */
+  937   +
         public static final String DB_PASSWORD = "dbPassword";
+  938   +
         /**
 939   -
         public static final String EXCLUDE = "exclude";
+
          * The CLI argument name for setting the database driver name.
 940   -
     }
+
          */
 941   +
         public static final String DB_DRIVER = "dbDriverName";
+  942   +
         /**
+  943   +
          * The CLI argument name for setting the path to the database driver; in case it is not on the class path.
+  944   +
          */
+  945   +
         public static final String DB_DRIVER_PATH = "dbDriverPath";
+  946   +
         /**
+  947   +
          * The CLI argument name for setting the path to mono for .NET Assembly analysis on non-windows systems.
+  948   +
          */
+  949   +
         public static final String PATH_TO_MONO = "mono";
+  950   +
         /**
+  951   +
          * The CLI argument name for setting extra extensions.
+  952   +
          */
+  953   +
         public static final String ADDITIONAL_ZIP_EXTENSIONS = "zipExtensions";
+  954   +
         /**
+  955   +
          * Exclude path argument.
+  956   +
          */
+  957   +
         public static final String EXCLUDE = "exclude";
+  958   +
     }
+  959  
 }
- + diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html index 41d63d122..b3a9d683c 100644 --- a/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html +++ b/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html @@ -62,7 +62,7 @@  22  
  *
 23   -
  * @author Jeremy Long <jeremy.long@owasp.org>
+
  * @author Jeremy Long
 24  
  */
 25   @@ -133,6 +133,6 @@
 }
- + diff --git a/dependency-check-cli/dependency-updates-report.html b/dependency-check-cli/dependency-updates-report.html index 5c1306e4f..73b30d8ff 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 @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +1.17-beta1 Next Incremental

org.owasp:dependency-check-core

@@ -497,7 +497,7 @@ - + @@ -521,7 +521,7 @@ - + diff --git a/dependency-check-cli/findbugs.html b/dependency-check-cli/findbugs.html index 52383e252..34edaaf62 100644 --- a/dependency-check-cli/findbugs.html +++ b/dependency-check-cli/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-cli - FindBugs Bug Detector Report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ - +
dependency-check-core
Current Version1.2.9
1.2.10
Scope compile
dependency-check-utils
Current Version1.2.9
1.2.10
Scope compile
Hard coded reference to an absolute pathname in org.owasp.dependencycheck.App.runScan(String, String, String, String[], String[]) STYLE DMI_HARDCODED_ABSOLUTE_FILENAME151154 Medium
diff --git a/dependency-check-cli/images/dc-cli.svg b/dependency-check-cli/images/dc-cli.svg new file mode 100644 index 000000000..081c7c4ec --- /dev/null +++ b/dependency-check-cli/images/dc-cli.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dependency-check-cli/index.html b/dependency-check-cli/index.html index d520185e5..958c2fe37 100644 --- a/dependency-check-cli/index.html +++ b/dependency-check-cli/index.html @@ -1,13 +1,13 @@ - + dependency-check-cli - About @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalysisPhase.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalysisPhase.html index 5ee01299b..eec8ad1da 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalysisPhase.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalysisPhase.html @@ -2,16 +2,16 @@ - + -AnalysisPhase (Dependency-Check Core 1.2.9 API) - +AnalysisPhase (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends Enum<AnalysisPhase>
An enumeration defining the phases of analysis.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/Analyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/Analyzer.html index 381815f92..c3971ddcb 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/Analyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/Analyzer.html @@ -2,16 +2,16 @@ - + -Analyzer (Dependency-Check Core 1.2.9 API) - +Analyzer (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@
An interface that defines an Analyzer that is used to identify Dependencies. An analyzer will collect information about the dependency in the form of Evidence.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalyzerService.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalyzerService.html index e3dfc0080..a31e243df 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalyzerService.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AnalyzerService.html @@ -2,16 +2,16 @@ - + -AnalyzerService (Dependency-Check Core 1.2.9 API) - +AnalyzerService (Dependency-Check Core 1.2.10 API) + @@ -102,7 +102,7 @@ extends The Analyzer Service Loader. This class loads all services that implement org.owasp.dependencycheck.analyzer.Analyzer.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.html index 69c16aea7..81f861199 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.html @@ -2,16 +2,16 @@ - + -ArchiveAnalyzer (Dependency-Check Core 1.2.9 API) - +ArchiveAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -117,7 +117,7 @@ extends
Author: -
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.html index 2413be193..8f18c71a7 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.html @@ -2,16 +2,16 @@ - + -AssemblyAnalyzer (Dependency-Check Core 1.2.9 API) - +AssemblyAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CPEAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CPEAnalyzer.html index 0093e9fa1..e52f21c2b 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CPEAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CPEAnalyzer.html @@ -2,16 +2,16 @@ - + -CPEAnalyzer (Dependency-Check Core 1.2.9 API) - +CPEAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -107,7 +107,7 @@ implements
CPEAnalyzer is a utility class that takes a project dependency and attempts to discern if there is an associated CPE. It uses the evidence contained within the dependency to search the Lucene index.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CentralAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CentralAnalyzer.html index 5bc284176..fa9f84022 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CentralAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CentralAnalyzer.html @@ -2,16 +2,16 @@ - + -CentralAnalyzer (Dependency-Check Core 1.2.9 API) - +CentralAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.html index e918f5511..ea3fb92e4 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.html @@ -2,16 +2,16 @@ - + -CpeSuppressionAnalyzer (Dependency-Check Core 1.2.9 API) - +CpeSuppressionAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -116,7 +116,7 @@ extends
The suppression analyzer processes an externally defined XML document that complies with the suppressions.xsd schema. Any identified CPE entries within the dependencies that match will be removed.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html index 926d6fb8f..b50d4f9e1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.html @@ -2,16 +2,16 @@ - + -DependencyBundlingAnalyzer (Dependency-Check Core 1.2.9 API) - +DependencyBundlingAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -116,7 +116,7 @@ implements
Author: -
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.html index 6748076f4..0b0ea7a8e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.html @@ -2,16 +2,16 @@ - + -FalsePositiveAnalyzer (Dependency-Check Core 1.2.9 API) - +FalsePositiveAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends
AbstractAnalyzer
This analyzer attempts to remove some well known false positives - specifically regarding the java runtime.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html index 3ba3d9c10..0221fe0e9 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html @@ -2,16 +2,16 @@ - + -FileNameAnalyzer (Dependency-Check Core 1.2.9 API) - +FileNameAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -111,7 +111,7 @@ extends Analyzer
Takes a dependency and analyzes the filename and determines the hashes.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.html index a4740348f..64f39755a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.html @@ -2,16 +2,16 @@ - + -FileTypeAnalyzer (Dependency-Check Core 1.2.9 API) - +FileTypeAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@ extends Analyzer
An Analyzer that scans specific file types.
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/HintAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/HintAnalyzer.html index 3f17a199d..069de66bb 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/HintAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/HintAnalyzer.html @@ -2,16 +2,16 @@ - + -HintAnalyzer (Dependency-Check Core 1.2.9 API) - +HintAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends AbstractAnalyzer implements Analyzer
Author:
-
Jeremy Long
+
Jeremy Long
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.ClassNameInformation.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.ClassNameInformation.html index 27fce65f9..75eb3e664 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.ClassNameInformation.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.ClassNameInformation.html @@ -2,16 +2,16 @@ - + -JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.2.9 API) - +JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.html index fd582574a..dc168f14f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/JarAnalyzer.html @@ -2,16 +2,16 @@ - + -JarAnalyzer (Dependency-Check Core 1.2.9 API) - +JarAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@ extends AbstractFileTypeAnalyzer
Used to load a JAR file and collect information that can be used to determine the associated CPE.
Author:
-
Jeremy Long
+
Jeremy Long
@@ -216,7 +216,7 @@ extends static void -extractLicense(Model pom, +extractLicense(Model pom, Properties pomProperties, Dependency dependency)
Extracts the license information from the pom and adds it to the dependency.
@@ -519,13 +519,13 @@ extends Returns:
the interpolated text.
-
+ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html index 4d29faaf8..8eb1c18be 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NexusAnalyzer.html @@ -2,16 +2,16 @@ - + -NexusAnalyzer (Dependency-Check Core 1.2.9 API) - +NexusAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -118,10 +118,10 @@ extends Settings.KEYS.ANALYZER_NEXUS_ENABLED determines whether this analyzer is - even enabled. This can be overridden by setting the system property. -
  • Settings.KEYS.ANALYZER_NEXUS_URL the URL to a Nexus service to search by - SHA-1. There is an expected %s in this where the SHA-1 will get entered.
  • +
  • Settings.KEYS.ANALYZER_NEXUS_ENABLED determines whether this analyzer is even + enabled. This can be overridden by setting the system property.
  • +
  • Settings.KEYS.ANALYZER_NEXUS_URL the URL to a Nexus service to search by SHA-1. + There is an expected %s in this where the SHA-1 will get entered.
  • Author:
    colezlaw
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.html index 57ceb0c5a..97b63da61 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.html @@ -2,16 +2,16 @@ - + -NuspecAnalyzer (Dependency-Check Core 1.2.9 API) - +NuspecAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html index 966555a01..f4ebc1d3c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.html @@ -2,16 +2,16 @@ - + -NvdCveAnalyzer (Dependency-Check Core 1.2.9 API) - +NvdCveAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -107,7 +107,7 @@ implements NvdCveAnalyzer is a utility class that takes a project dependency and attempts to discern if there is an associated CVEs. It uses the the identifiers found by other analyzers to lookup the CVE data.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.html index 97f1ed973..4fd35fca6 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.html @@ -2,16 +2,16 @@ - + -VulnerabilitySuppressionAnalyzer (Dependency-Check Core 1.2.9 API) - +VulnerabilitySuppressionAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -116,7 +116,7 @@ extends
    The suppression analyzer processes an externally defined XML document that complies with the suppressions.xsd schema. Any identified Vulnerability entries within the dependencies that match will be removed.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractAnalyzer.html index 6204d8fc4..0b3e1052f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.AbstractAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.AbstractAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -79,13 +79,7 @@
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractFileTypeAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractFileTypeAnalyzer.html index 874598a4b..4031b32ee 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractFileTypeAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractFileTypeAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -79,13 +79,7 @@ org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractSuppressionAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractSuppressionAnalyzer.html index 83439f41a..59c4f90eb 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractSuppressionAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AbstractSuppressionAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -79,13 +79,7 @@ org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalysisPhase.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalysisPhase.html index a0f353466..dcffa3a39 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalysisPhase.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalysisPhase.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.AnalysisPhase (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.AnalysisPhase (Dependency-Check Core 1.2.10 API) + @@ -79,24 +79,13 @@ org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/Analyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/Analyzer.html index 4acc7b60a..0c5c65040 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/Analyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/Analyzer.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.analyzer.Analyzer (Dependency-Check Core 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.analyzer.Analyzer (Dependency-Check Core 1.2.10 API) + @@ -79,35 +79,19 @@ org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.reporting -
    - - org.owasp.dependencycheck.reporting - - - Contains classes used to generate reports.
    +
    Contains classes used to generate reports.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalyzerService.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalyzerService.html index be942f472..30fb7e576 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalyzerService.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AnalyzerService.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.AnalyzerService (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.AnalyzerService (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/ArchiveAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/ArchiveAnalyzer.html index e357848ee..b126520be 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/ArchiveAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/ArchiveAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.ArchiveAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.ArchiveAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AssemblyAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AssemblyAnalyzer.html index 433dd7d74..07a4c2b8f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AssemblyAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/AssemblyAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.AssemblyAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.AssemblyAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CPEAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CPEAnalyzer.html index 9fbcf73c6..896dafa85 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CPEAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CPEAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.CPEAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.CPEAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CentralAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CentralAnalyzer.html index b8a39f0c2..9eff533d8 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CentralAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CentralAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.CentralAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.CentralAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CpeSuppressionAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CpeSuppressionAnalyzer.html index 1e9d21627..ebe8ebf69 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CpeSuppressionAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/CpeSuppressionAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/DependencyBundlingAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/DependencyBundlingAnalyzer.html index 675ce2bfe..d610c9db6 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/DependencyBundlingAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/DependencyBundlingAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FalsePositiveAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FalsePositiveAnalyzer.html index dcec9e8c9..bb3e68560 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FalsePositiveAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FalsePositiveAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileNameAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileNameAnalyzer.html index 397893930..4f06db30e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileNameAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileNameAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.FileNameAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.FileNameAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileTypeAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileTypeAnalyzer.html index 7d69ff245..f19b7c4ee 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileTypeAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/FileTypeAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.analyzer.FileTypeAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.analyzer.FileTypeAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -79,24 +79,13 @@ org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/HintAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/HintAnalyzer.html index b8c66268c..8699c3bde 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/HintAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/HintAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.HintAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.HintAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.ClassNameInformation.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.ClassNameInformation.html index e7ebc6d73..f24efd00a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.ClassNameInformation.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.ClassNameInformation.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.2.10 API) + @@ -79,13 +79,7 @@ org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.html index 357f9fdc2..fadead5a3 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JarAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JavaScriptAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JavaScriptAnalyzer.html index 6b0c389bb..56563f53f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JavaScriptAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/JavaScriptAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NexusAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NexusAnalyzer.html index f1c4e5f39..fbcd189d2 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NexusAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NexusAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.NexusAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.NexusAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NuspecAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NuspecAnalyzer.html index 3e0abcec2..8eef6ff3f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NuspecAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NuspecAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.NuspecAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.NuspecAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NvdCveAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NvdCveAnalyzer.html index 6dd62d5db..7cd124058 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NvdCveAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/NvdCveAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.NvdCveAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.NvdCveAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/VulnerabilitySuppressionAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/VulnerabilitySuppressionAnalyzer.html index 6b3f3c07f..778ad0234 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/VulnerabilitySuppressionAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/class-use/VulnerabilitySuppressionAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/AnalysisException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/AnalysisException.html index a62e33ca2..19bd6ed96 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/AnalysisException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/AnalysisException.html @@ -2,16 +2,16 @@ - + -AnalysisException (Dependency-Check Core 1.2.9 API) - +AnalysisException (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@ extends Exception
    An exception thrown when the analysis of a dependency fails.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.html index 4ef676623..849a2b70d 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.html @@ -2,16 +2,16 @@ - + -ArchiveExtractionException (Dependency-Check Core 1.2.9 API) - +ArchiveExtractionException (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@ extends Exception
    An exception thrown when files in an archive cannot be extracted.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/AnalysisException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/AnalysisException.html index d662809a3..5c270593d 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/AnalysisException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/AnalysisException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.exception.AnalysisException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.exception.AnalysisException (Dependency-Check Core 1.2.10 API) + @@ -79,24 +79,13 @@ org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    -org.owasp.dependencycheck.jaxb.pom +org.owasp.dependencycheck.xml.pom -
    - - org.owasp.dependencycheck.analyzer.pom - - - This package contains utility classes used to parse pom.xml files.
    +
    This package contains classes used to parse pom.xml files.
    @@ -250,33 +239,34 @@ -
  • +
  • -

    Uses of AnalysisException in org.owasp.dependencycheck.jaxb.pom

    +

    Uses of AnalysisException in org.owasp.dependencycheck.xml.pom

    - + - - + - - + - - + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/ArchiveExtractionException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/ArchiveExtractionException.html index 454cb769b..b8beed900 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/ArchiveExtractionException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/class-use/ArchiveExtractionException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-frame.html index ee720b023..507de629f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-summary.html index 466ee71e5..db5755af5 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,7 @@

    Package org.owasp.dependencycheck.analyzer.exception

    -
    - - org.owasp.dependencycheck.analyzer.exception - -
    +
    A collection of exception classes used within the analyzers.

    See: Description

    @@ -104,15 +100,7 @@

    Package org.owasp.dependencycheck.analyzer.exception Description

    -
    - - org.owasp.dependencycheck.analyzer.exception - - -

    - A collection of exception classes used within the analyzers.

    - -
    +
    A collection of exception classes used within the analyzers.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-tree.html index 673b07614..7897dba30 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.analyzer.exception Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.analyzer.exception Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-use.html index 229c2f1ea..9086a7dc5 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/exception/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.2.10 API) + @@ -79,24 +79,13 @@
    - + @@ -119,17 +108,17 @@
    Methods in org.owasp.dependencycheck.jaxb.pom that throw AnalysisException Methods in org.owasp.dependencycheck.xml.pom that throw AnalysisException 
    Modifier and Type Method and Description
    voidPomUtils.analyzePOM(Dependency dependency, +static voidPomUtils.analyzePOM(Dependency dependency, File pomFile)
    Reads in the pom file and adds elements as evidence to the given dependency.
    ModelPomUtils.readPom(File file) +static ModelPomUtils.readPom(File file)
    Reads in the specified POM and converts it to a Model.
    ModelPomUtils.readPom(SAXSource source) +static ModelPomUtils.readPom(String path, + JarFile jar)
    Retrieves the specified POM from a jar file and converts it to a Model.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.jaxb.pomorg.owasp.dependencycheck.xml.pom -
    - - org.owasp.dependencycheck.analyzer.pom - - - This package contains utility classes used to parse pom.xml files.
    +
    This package contains classes used to parse pom.xml files.
  • -
  • +
  • - + - diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-frame.html index 29d1c2dc1..e12bb4452 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-summary.html index 74c4a58a9..480dc6f78 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.2.10 API) + @@ -66,13 +66,7 @@

    Package org.owasp.dependencycheck.analyzer

    -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.

    See: Description

    @@ -255,15 +249,7 @@

    Package org.owasp.dependencycheck.analyzer Description

    -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies. - -
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-tree.html index 775b644aa..f6a98ab71 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.analyzer Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.analyzer Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-use.html index 32868ace8..7698a8502 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.2.10 API) + @@ -79,35 +79,19 @@
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/class-use/Engine.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/class-use/Engine.html index 1a0c69734..b5a648fdd 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/class-use/Engine.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/class-use/Engine.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.Engine (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.Engine (Dependency-Check Core 1.2.10 API) + @@ -77,26 +77,22 @@ - + + + + + @@ -104,6 +100,26 @@
  • Classes in org.owasp.dependencycheck.analyzer.exception used by org.owasp.dependencycheck.jaxb.pom Classes in org.owasp.dependencycheck.analyzer.exception used by org.owasp.dependencycheck.xml.pom 
    Class and Description
    AnalysisException +AnalysisException
    An exception thrown when the analysis of a dependency fails.
    org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.reporting -
    - - org.owasp.dependencycheck.reporting - - - Contains classes used to generate reports.
    +
    Contains classes used to generate reports.
    org.owasp.dependencycheck.analyzerorg.owasp.dependencycheck.agent -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    The agent package holds an agent API that can be used by other applications that have information about dependencies; but would + rather implement something in their code directly rather then spawn a process to run the entire dependency-check engine.
    org.owasp.dependencycheck.analyzer +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    +
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    +
    Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    + + + + + + + + + + + +
    Methods in org.owasp.dependencycheck.agent that return Engine 
    Modifier and TypeMethod and Description
    EngineDependencyCheckScanAgent.execute() +
    Executes the dependency-check and generates the report.
    +
    +
  • diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/CentralSearch.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/CentralSearch.html index ea7bcb0b3..d132170db 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/CentralSearch.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/CentralSearch.html @@ -2,16 +2,16 @@ - + -CentralSearch (Dependency-Check Core 1.2.9 API) - +CentralSearch (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/class-use/CentralSearch.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/class-use/CentralSearch.html index 41d4fffab..d3c3342be 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/class-use/CentralSearch.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/class-use/CentralSearch.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.central.CentralSearch (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.central.CentralSearch (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-frame.html index 0794855a3..32de2d789 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.central (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.central (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-summary.html index a5084b7e8..576619c15 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.central (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.central (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,9 @@

    Package org.owasp.dependencycheck.data.central

    -
    - - org.owasp.dependencycheck.data.central - -
    +
    Contains classes related to searching Maven Central.

    + + These are used to abstract Maven Central searching away from OWASP Dependency Check so they can be reused elsewhere.

    See: Description

    @@ -98,17 +96,9 @@

    Package org.owasp.dependencycheck.data.central Description

    -
    - - org.owasp.dependencycheck.data.central - - -

    - Contains classes related to searching Maven Central.

    -

    - These are used to abstract Maven Central searching away from OWASP Dependency Check so they can be reused elsewhere.

    - -
    +
    Contains classes related to searching Maven Central.

    + + These are used to abstract Maven Central searching away from OWASP Dependency Check so they can be reused elsewhere.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-tree.html index b2646ac5f..fac09af4c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.central Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.central Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-use.html index 8a21f55ec..6d33e2173 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/central/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.central (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.central (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.html index 74a937a85..dfd585234 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.html @@ -2,16 +2,16 @@ - + -CpeMemoryIndex (Dependency-Check Core 1.2.9 API) - +CpeMemoryIndex (Dependency-Check Core 1.2.10 API) + @@ -102,7 +102,7 @@ extends An in memory lucene index that contains the vendor/product combinations from the CPE (application) identifiers within the NVD CVE data.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
  • diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/Fields.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/Fields.html index 809aa0b94..1e64c2dff 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/Fields.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/Fields.html @@ -2,16 +2,16 @@ - + -Fields (Dependency-Check Core 1.2.9 API) - +Fields (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    Fields is a collection of field names used within the Lucene index for CPE entries.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html index 3c0f5e0d5..824081bfe 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html @@ -2,16 +2,16 @@ - + -IndexEntry (Dependency-Check Core 1.2.9 API) - +IndexEntry (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends Serializable
    A CPE entry containing the name, vendor, product, and version.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexException.html index cbb9791c0..7fb9e8c8c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexException.html @@ -2,16 +2,16 @@ - + -IndexException (Dependency-Check Core 1.2.9 API) - +IndexException (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@ extends Exception
    An exception thrown when the there is an issue using the in-memory CPE Index.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/CpeMemoryIndex.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/CpeMemoryIndex.html index 438e29dfb..a7c15c19b 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/CpeMemoryIndex.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/CpeMemoryIndex.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.cpe.CpeMemoryIndex (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.cpe.CpeMemoryIndex (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.data.cpe -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index.
    +
    Contains classes for working with the CPE Lucene Index.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/Fields.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/Fields.html index 6f4517b88..03ab064b0 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/Fields.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/Fields.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.cpe.Fields (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.cpe.Fields (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexEntry.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexEntry.html index b1bce84c3..4abbe8e9c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexEntry.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexEntry.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.cpe.IndexEntry (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.cpe.IndexEntry (Dependency-Check Core 1.2.10 API) + @@ -79,24 +79,13 @@ org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexException.html index 72a788269..f816b6d8b 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/IndexException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.cpe.IndexException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.cpe.IndexException (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.data.cpe -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index.
    +
    Contains classes for working with the CPE Lucene Index.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-frame.html index c91c03a3d..e932a005a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-summary.html index a10e6c473..bda45901c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.2.10 API) + @@ -66,12 +66,7 @@

    Package org.owasp.dependencycheck.data.cpe

    -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index.
    +
    Contains classes for working with the CPE Lucene Index.

    See: Description

    @@ -129,14 +124,7 @@

    Package org.owasp.dependencycheck.data.cpe Description

    -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index. - -
    +
    Contains classes for working with the CPE Lucene Index.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-tree.html index b3215f1dd..e54c9ffa5 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.cpe Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.cpe Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-use.html index c24282592..e4e3055b1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.2.10 API) + @@ -79,35 +79,19 @@ org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.data.cpe -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index.
    +
    Contains classes for working with the CPE Lucene Index.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html index b1faf3bfd..2f30b8a9a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html @@ -2,16 +2,16 @@ - + -CweDB (Dependency-Check Core 1.2.9 API) - +CweDB (Dependency-Check Core 1.2.10 API) + @@ -100,7 +100,7 @@
    public final class CweDB
     extends Object
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweHandler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweHandler.html index 8c627130f..d29a1532e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweHandler.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweHandler.html @@ -2,16 +2,16 @@ - + -CweHandler (Dependency-Check Core 1.2.9 API) - +CweHandler (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends org.xml.sax.helpers.DefaultHandler
    A SAX Handler that will parse the CWE XML.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweDB.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweDB.html index 97f0aa95b..0baff7614 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweDB.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweDB.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.cwe.CweDB (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.cwe.CweDB (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweHandler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweHandler.html index e221256b0..afeab0a93 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweHandler.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/class-use/CweHandler.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.cwe.CweHandler (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.cwe.CweHandler (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-frame.html index d74cdfd7f..461eaa7ff 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-summary.html index 52e41bded..d5245d556 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.2.10 API) + @@ -66,12 +66,7 @@

    Package org.owasp.dependencycheck.data.cwe

    -
    - - org.owasp.dependencycheck.data.cwe - - - Contains classes for working with the CWE Database.
    +
    Contains classes for working with the CWE Database.

    See: Description

    @@ -103,14 +98,7 @@

    Package org.owasp.dependencycheck.data.cwe Description

    -
    - - org.owasp.dependencycheck.data.cwe - - - Contains classes for working with the CWE Database. - -
    +
    Contains classes for working with the CWE Database.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-tree.html index 90bc49894..c040e2861 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.cwe Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.cwe Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-use.html index 84986f6f1..ac1b8d8ae 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html index de7dac30e..70b6b3a99 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html @@ -2,16 +2,16 @@ - + -AbstractTokenizingFilter (Dependency-Check Core 1.2.9 API) - +AbstractTokenizingFilter (Dependency-Check Core 1.2.10 API) + @@ -124,7 +124,7 @@ extends org.apache.lucene.analysis.TokenFilter
    An abstract tokenizing filter that can be used as the base for a tokenizing filter.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.html index cc8f26808..e587e48ba 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.html @@ -2,16 +2,16 @@ - + -AlphaNumericTokenizer (Dependency-Check Core 1.2.9 API) - +AlphaNumericTokenizer (Dependency-Check Core 1.2.10 API) + @@ -125,7 +125,7 @@ extends org.apache.lucene.analysis.util.CharTokenizer
    Tokenizes the input breaking it into tokens when non-alpha/numeric characters are found.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/DependencySimilarity.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/DependencySimilarity.html index 18314a233..11f08905a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/DependencySimilarity.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/DependencySimilarity.html @@ -2,16 +2,16 @@ - + -DependencySimilarity (Dependency-Check Core 1.2.9 API) - +DependencySimilarity (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@
    public class DependencySimilarity
     extends org.apache.lucene.search.similarities.DefaultSimilarity
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.html index 820da5e3f..045835b80 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.html @@ -2,16 +2,16 @@ - + -FieldAnalyzer (Dependency-Check Core 1.2.9 API) - +FieldAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -112,7 +112,7 @@ extends org.apache.lucene.analysis.Analyzer A Lucene Analyzer that utilizes the WhitespaceTokenizer, WordDelimiterFilter, LowerCaseFilter, and StopFilter. The intended purpose of this Analyzer is to index the CPE fields vendor and product.

    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/LuceneUtils.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/LuceneUtils.html index a8c8356ce..52a7d9e4e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/LuceneUtils.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/LuceneUtils.html @@ -2,16 +2,16 @@ - + -LuceneUtils (Dependency-Check Core 1.2.9 API) - +LuceneUtils (Dependency-Check Core 1.2.10 API) + @@ -102,7 +102,7 @@ extends

    Lucene utils is a set of utilize written to make constructing Lucene queries simpler.

    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.html index ddff56cee..7f10f21a6 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.html @@ -2,16 +2,16 @@ - + -SearchFieldAnalyzer (Dependency-Check Core 1.2.9 API) - +SearchFieldAnalyzer (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends org.apache.lucene.analysis.Analyzer
    A Lucene field analyzer used to analyzer queries against the CPE data.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.html index 9c56f3a72..8743684da 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.html @@ -2,16 +2,16 @@ - + -TokenPairConcatenatingFilter (Dependency-Check Core 1.2.9 API) - +TokenPairConcatenatingFilter (Dependency-Check Core 1.2.10 API) + @@ -123,7 +123,7 @@ extends org.apache.lucene.analysis.TokenFilter

    Example: "Spring Framework Core" -> "Spring SpringFramework Framework FrameworkCore Core".

    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html index 941e20e35..4829353c5 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html @@ -2,16 +2,16 @@ - + -UrlTokenizingFilter (Dependency-Check Core 1.2.9 API) - +UrlTokenizingFilter (Dependency-Check Core 1.2.10 API) + @@ -128,7 +128,7 @@ extends
    "3 3.0 3.0.0 RELEASE 3.0.0.RELEASE".

    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AbstractTokenizingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AbstractTokenizingFilter.html index 9f2dd41a1..5c934fed7 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AbstractTokenizingFilter.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AbstractTokenizingFilter.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@
    org.owasp.dependencycheck.data.lucene -
    - - org.owasp.dependencycheck.data.lucene - - - Contains classes used to work with the Lucene Indexes.
    +
    Contains classes used to work with the Lucene Indexes.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AlphaNumericTokenizer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AlphaNumericTokenizer.html index d5b510089..bbb060221 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AlphaNumericTokenizer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AlphaNumericTokenizer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/DependencySimilarity.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/DependencySimilarity.html index 009556bb7..dc406d036 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/DependencySimilarity.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/DependencySimilarity.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.DependencySimilarity (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.DependencySimilarity (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/FieldAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/FieldAnalyzer.html index ab2887cfb..caa93d8b4 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/FieldAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/FieldAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.FieldAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.FieldAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/LuceneUtils.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/LuceneUtils.html index efa45a029..baabb3c5c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/LuceneUtils.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/LuceneUtils.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.LuceneUtils (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.LuceneUtils (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/SearchFieldAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/SearchFieldAnalyzer.html index d1471ed68..10d3c2bc8 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/SearchFieldAnalyzer.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/SearchFieldAnalyzer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/TokenPairConcatenatingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/TokenPairConcatenatingFilter.html index dfbcbb1b5..e6af82e0a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/TokenPairConcatenatingFilter.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/TokenPairConcatenatingFilter.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/UrlTokenizingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/UrlTokenizingFilter.html index acee33cf1..74d5ee3ef 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/UrlTokenizingFilter.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/UrlTokenizingFilter.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-frame.html index 35d853078..8a632a625 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-summary.html index 368d900ee..a1c9b5a5d 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.2.10 API) + @@ -66,12 +66,7 @@

    Package org.owasp.dependencycheck.data.lucene

    -
    - - org.owasp.dependencycheck.data.lucene - - - Contains classes used to work with the Lucene Indexes.
    +
    Contains classes used to work with the Lucene Indexes.

    See: Description

    @@ -143,14 +138,7 @@

    Package org.owasp.dependencycheck.data.lucene Description

    -
    - - org.owasp.dependencycheck.data.lucene - - - Contains classes used to work with the Lucene Indexes. - -
    +
    Contains classes used to work with the Lucene Indexes.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-tree.html index 800f27706..d82f0f106 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.lucene Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.lucene Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-use.html index 2bd286605..c59f3e619 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.data.lucene -
    - - org.owasp.dependencycheck.data.lucene - - - Contains classes used to work with the Lucene Indexes.
    +
    Contains classes used to work with the Lucene Indexes.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/MavenArtifact.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/MavenArtifact.html index 25dd6ce76..c5d40be16 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/MavenArtifact.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/MavenArtifact.html @@ -2,16 +2,16 @@ - + -MavenArtifact (Dependency-Check Core 1.2.9 API) - +MavenArtifact (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/NexusSearch.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/NexusSearch.html index db27f1b5f..4e6dcb491 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/NexusSearch.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/NexusSearch.html @@ -2,16 +2,16 @@ - + -NexusSearch (Dependency-Check Core 1.2.9 API) - +NexusSearch (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/MavenArtifact.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/MavenArtifact.html index 14ed4354c..d9e3fd300 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/MavenArtifact.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/MavenArtifact.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nexus.MavenArtifact (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nexus.MavenArtifact (Dependency-Check Core 1.2.10 API) + @@ -79,32 +79,23 @@ org.owasp.dependencycheck.data.central -
    - - org.owasp.dependencycheck.data.central - -
    +
    Contains classes related to searching Maven Central.

    + + These are used to abstract Maven Central searching away from OWASP Dependency Check so they can be reused elsewhere.
    org.owasp.dependencycheck.data.nexus -
    - - org.owasp.dependencycheck.data.nexus - -
    +
    Contains classes related to searching a Nexus repository.

    + + These are used to abstract Nexus searching away from OWASP Dependency Check so they can be reused elsewhere.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/NexusSearch.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/NexusSearch.html index f43c5c660..9a4075320 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/NexusSearch.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/class-use/NexusSearch.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nexus.NexusSearch (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nexus.NexusSearch (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-frame.html index 02c199752..8e7a17c2b 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-summary.html index ba6387c44..e67baaa49 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,9 @@

    Package org.owasp.dependencycheck.data.nexus

    -
    - - org.owasp.dependencycheck.data.nexus - -
    +
    Contains classes related to searching a Nexus repository.

    + + These are used to abstract Nexus searching away from OWASP Dependency Check so they can be reused elsewhere.

    See: Description

    @@ -104,17 +102,9 @@

    Package org.owasp.dependencycheck.data.nexus Description

    -
    - - org.owasp.dependencycheck.data.nexus - - -

    - Contains classes related to searching a Nexus repository.

    -

    - These are used to abstract Nexus searching away from OWASP Dependency Check so they can be reused elsewhere.

    - -
    +
    Contains classes related to searching a Nexus repository.

    + + These are used to abstract Nexus searching away from OWASP Dependency Check so they can be reused elsewhere.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-tree.html index 78cf6f699..196a45f4d 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.nexus Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nexus Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-use.html index 99cac8b1d..1c2d9326f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nexus/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.2.10 API) + @@ -79,32 +79,23 @@ org.owasp.dependencycheck.data.central -
    - - org.owasp.dependencycheck.data.central - -
    +
    Contains classes related to searching Maven Central.

    + + These are used to abstract Maven Central searching away from OWASP Dependency Check so they can be reused elsewhere.
    org.owasp.dependencycheck.data.nexus -
    - - org.owasp.dependencycheck.data.nexus - -
    +
    Contains classes related to searching a Nexus repository.

    + + These are used to abstract Nexus searching away from OWASP Dependency Check so they can be reused elsewhere.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NugetPackage.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NugetPackage.html index cb22b668e..f40904e6c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NugetPackage.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NugetPackage.html @@ -2,16 +2,16 @@ - + -NugetPackage (Dependency-Check Core 1.2.9 API) - +NugetPackage (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParseException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParseException.html index c76917f68..d475746f1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParseException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParseException.html @@ -2,16 +2,16 @@ - + -NuspecParseException (Dependency-Check Core 1.2.9 API) - +NuspecParseException (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParser.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParser.html index 6b5d2ea32..082a5e8b2 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParser.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/NuspecParser.html @@ -2,16 +2,16 @@ - + -NuspecParser (Dependency-Check Core 1.2.9 API) - +NuspecParser (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.html index 3e43f7fe9..19f09ecbf 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.html @@ -2,16 +2,16 @@ - + -XPathNuspecParser (Dependency-Check Core 1.2.9 API) - +XPathNuspecParser (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NugetPackage.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NugetPackage.html index d3a183680..3a73d7041 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NugetPackage.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NugetPackage.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nuget.NugetPackage (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nuget.NugetPackage (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,8 @@ org.owasp.dependencycheck.data.nuget -
    - - org.owasp.dependencycheck.data.nuget - -
    +
    Contains classes related to parsing Nuget related files

    + These are used to abstract away Nuget-related handling from Dependency Check so they can be used elsewhere.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParseException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParseException.html index ba3b64bb6..0c3e218b4 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParseException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParseException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nuget.NuspecParseException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nuget.NuspecParseException (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,8 @@ org.owasp.dependencycheck.data.nuget -
    - - org.owasp.dependencycheck.data.nuget - -
    +
    Contains classes related to parsing Nuget related files

    + These are used to abstract away Nuget-related handling from Dependency Check so they can be used elsewhere.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParser.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParser.html index 5e1e952c3..2900dc426 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParser.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/NuspecParser.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.data.nuget.NuspecParser (Dependency-Check Core 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.data.nuget.NuspecParser (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,8 @@ org.owasp.dependencycheck.data.nuget -
    - - org.owasp.dependencycheck.data.nuget - -
    +
    Contains classes related to parsing Nuget related files

    + These are used to abstract away Nuget-related handling from Dependency Check so they can be used elsewhere.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/XPathNuspecParser.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/XPathNuspecParser.html index 860e879f9..d010dc0dc 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/XPathNuspecParser.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/class-use/XPathNuspecParser.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nuget.XPathNuspecParser (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nuget.XPathNuspecParser (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-frame.html index 8296d4fc7..8bdd42b0e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-summary.html index 1cca6a991..e0b270908 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,8 @@

    Package org.owasp.dependencycheck.data.nuget

    -
    - - org.owasp.dependencycheck.data.nuget - -
    +
    Contains classes related to parsing Nuget related files

    + These are used to abstract away Nuget-related handling from Dependency Check so they can be used elsewhere.

    See: Description

    @@ -138,18 +135,8 @@

    Package org.owasp.dependencycheck.data.nuget Description

    -
    - - org.owasp.dependencycheck.data.nuget - - -

    - Contains classes related to parsing Nuget related files

    -

    - These are used to abstract away Nuget-related handling from Dependency Check - so they can be used elsewhere.

    - -
    +
    Contains classes related to parsing Nuget related files

    + These are used to abstract away Nuget-related handling from Dependency Check so they can be used elsewhere.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-tree.html index c34cfc00a..1eccbf5f3 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.nuget Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nuget Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-use.html index a3b24b3ad..f4f64025e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nuget/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,8 @@ org.owasp.dependencycheck.data.nuget -
    - - org.owasp.dependencycheck.data.nuget - -
    +
    Contains classes related to parsing Nuget related files

    + These are used to abstract away Nuget-related handling from Dependency Check so they can be used elsewhere.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.html index d44b26550..241af9905 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.html @@ -2,16 +2,16 @@ - + -ConnectionFactory (Dependency-Check Core 1.2.9 API) - +ConnectionFactory (Dependency-Check Core 1.2.10 API) + @@ -103,7 +103,7 @@ extends Author: -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/CveDB.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/CveDB.html index 79a16cf12..0f002c8be 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/CveDB.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/CveDB.html @@ -2,16 +2,16 @@ - + -CveDB (Dependency-Check Core 1.2.9 API) - +CveDB (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    The database holding information about the NVD CVE data.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseException.html index 2528c9afc..2f7ce5998 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseException.html @@ -2,16 +2,16 @@ - + -DatabaseException (Dependency-Check Core 1.2.9 API) - +DatabaseException (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@ extends Exception
    An exception thrown if an operation against the database fails.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.html index 5be90128d..f59642155 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.html @@ -2,16 +2,16 @@ - + -DatabaseProperties (Dependency-Check Core 1.2.9 API) - +DatabaseProperties (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    This is a wrapper around a set of properties that are stored in the database.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.html index 0a7a95226..f032985c9 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.html @@ -2,16 +2,16 @@ - + -DriverLoadException (Dependency-Check Core 1.2.9 API) - +DriverLoadException (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@ extends Exception
    An exception thrown the database driver is unable to be loaded.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoader.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoader.html index 3a501b8ef..a35821f63 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoader.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/DriverLoader.html @@ -2,16 +2,16 @@ - + -DriverLoader (Dependency-Check Core 1.2.9 API) - +DriverLoader (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    DriverLoader is a utility class that is used to load database drivers.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/ConnectionFactory.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/ConnectionFactory.html index 52f283685..320f6204a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/ConnectionFactory.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/ConnectionFactory.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nvdcve.ConnectionFactory (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nvdcve.ConnectionFactory (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html index 61cd03b6f..680af88aa 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nvdcve.CveDB (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nvdcve.CveDB (Dependency-Check Core 1.2.10 API) + @@ -79,32 +79,21 @@ org.owasp.dependencycheck.data.cpe -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index.
    +
    Contains classes for working with the CPE Lucene Index.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    org.owasp.dependencycheck.data.update.xml -
    - - org.owasp.dependencycheck.data.nvdcve.xml - -
    +
    Contains classes used to parse the NVD CVE XML file.

    + + The basic use is that the Importer is called to import an NVD CVE file.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html index 72dc667b7..7721ca162 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseException (Dependency-Check Core 1.2.10 API) + @@ -79,66 +79,39 @@ org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    +
    Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseProperties.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseProperties.html index 90faa576b..a7e8d9772 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseProperties.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseProperties.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseProperties (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseProperties (Dependency-Check Core 1.2.10 API) + @@ -79,33 +79,21 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.reporting -
    - - org.owasp.dependencycheck.reporting - - - Contains classes used to generate reports.
    +
    Contains classes used to generate reports.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoadException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoadException.html index 5e6df0169..fd9b3f0c5 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoadException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoadException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nvdcve.DriverLoadException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nvdcve.DriverLoadException (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoader.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoader.html index b2f3631c7..59d40d0e0 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoader.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DriverLoader.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.nvdcve.DriverLoader (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.nvdcve.DriverLoader (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-frame.html index 7bd0e02f4..eeea3e3c1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-summary.html index e45e600b3..4d141874d 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.2.10 API) + @@ -66,12 +66,7 @@

    Package org.owasp.dependencycheck.data.nvdcve

    -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.

    See: Description

    @@ -140,14 +135,7 @@

    Package org.owasp.dependencycheck.data.nvdcve Description

    -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data. - -
    +
    Contains classes used to work with the NVD CVE data.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-tree.html index 0d87302b4..c1e46cd8a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.nvdcve Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.nvdcve Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-use.html index 7036d8781..e15a439a1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.2.10 API) + @@ -79,98 +79,59 @@ org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.data.cpe -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index.
    +
    Contains classes for working with the CPE Lucene Index.
    org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    org.owasp.dependencycheck.data.update.xml -
    - - org.owasp.dependencycheck.data.nvdcve.xml - -
    +
    Contains classes used to parse the NVD CVE XML file.

    + + The basic use is that the Importer is called to import an NVD CVE file.
    org.owasp.dependencycheck.reporting -
    - - org.owasp.dependencycheck.reporting - - - Contains classes used to generate reports.
    +
    Contains classes used to generate reports.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    +
    Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/CachedWebDataSource.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/CachedWebDataSource.html index bd57c2bf1..2a832eb22 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/CachedWebDataSource.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/CachedWebDataSource.html @@ -2,16 +2,16 @@ - + -CachedWebDataSource (Dependency-Check Core 1.2.9 API) - +CachedWebDataSource (Dependency-Check Core 1.2.10 API) + @@ -97,7 +97,7 @@
    Defines a data source who's data is retrieved from the Internet. This data can be downloaded and the local cache updated.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/EngineVersionCheck.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/EngineVersionCheck.html index 1cb9792dd..91a444582 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/EngineVersionCheck.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/EngineVersionCheck.html @@ -2,16 +2,16 @@ - + -EngineVersionCheck (Dependency-Check Core 1.2.9 API) - +EngineVersionCheck (Dependency-Check Core 1.2.10 API) + @@ -105,7 +105,7 @@ extends Object implements CachedWebDataSource
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveInfo.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveInfo.html index b76ce17a6..cb0fd0eb5 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveInfo.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveInfo.html @@ -2,16 +2,16 @@ - + -NvdCveInfo (Dependency-Check Core 1.2.9 API) - +NvdCveInfo (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    A pojo that contains the Url and timestamp of the current NvdCve XML files.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveUpdater.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveUpdater.html index 582b8ee0f..8829c4876 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveUpdater.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/NvdCveUpdater.html @@ -2,16 +2,16 @@ - + -NvdCveUpdater (Dependency-Check Core 1.2.9 API) - +NvdCveUpdater (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends CachedWebDataSource
    Class responsible for updating the NVD CVE and CPE data stores.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/StandardUpdate.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/StandardUpdate.html index 323c28bc9..7d0362550 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/StandardUpdate.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/StandardUpdate.html @@ -2,16 +2,16 @@ - + -StandardUpdate (Dependency-Check Core 1.2.9 API) - +StandardUpdate (Dependency-Check Core 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    Class responsible for updating the NVDCVE data store.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateService.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateService.html index 19dabc3d9..5760e873e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateService.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateService.html @@ -2,16 +2,16 @@ - + -UpdateService (Dependency-Check Core 1.2.9 API) - +UpdateService (Dependency-Check Core 1.2.10 API) + @@ -102,7 +102,7 @@ extends The CachedWebDataSource Service Loader. This class loads all services that implement org.owasp.dependencycheck.data.update.CachedWebDataSource.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateableNvdCve.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateableNvdCve.html index 71bcbcd88..521417d31 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateableNvdCve.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateableNvdCve.html @@ -2,16 +2,16 @@ - + -UpdateableNvdCve (Dependency-Check Core 1.2.9 API) - +UpdateableNvdCve (Dependency-Check Core 1.2.10 API) + @@ -107,7 +107,7 @@ implements
    Contains a collection of updateable NvdCveInfo objects. This is used to determine which files need to be downloaded and processed.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/CachedWebDataSource.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/CachedWebDataSource.html index edf115c85..85345063f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/CachedWebDataSource.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/CachedWebDataSource.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.data.update.CachedWebDataSource (Dependency-Check Core 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.data.update.CachedWebDataSource (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,9 @@
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/EngineVersionCheck.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/EngineVersionCheck.html index db858a9a1..3684b4a6c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/EngineVersionCheck.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/EngineVersionCheck.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.EngineVersionCheck (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.EngineVersionCheck (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveInfo.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveInfo.html index 1662d67f2..88ca23f73 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveInfo.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveInfo.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.NvdCveInfo (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.NvdCveInfo (Dependency-Check Core 1.2.10 API) + @@ -79,32 +79,21 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveUpdater.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveUpdater.html index f6e8a285b..4150f1625 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveUpdater.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/NvdCveUpdater.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.NvdCveUpdater (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.NvdCveUpdater (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/StandardUpdate.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/StandardUpdate.html index 721578ad0..1645c9e6e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/StandardUpdate.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/StandardUpdate.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.StandardUpdate (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.StandardUpdate (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateService.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateService.html index 34402eb98..05f57ab79 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateService.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateService.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.UpdateService (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.UpdateService (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateableNvdCve.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateableNvdCve.html index dd2f37e2b..d30302f3a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateableNvdCve.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateableNvdCve.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.UpdateableNvdCve (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.UpdateableNvdCve (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,9 @@ org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/InvalidDataException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/InvalidDataException.html index 5304181cf..15a785f07 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/InvalidDataException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/InvalidDataException.html @@ -2,16 +2,16 @@ - + -InvalidDataException (Dependency-Check Core 1.2.9 API) - +InvalidDataException (Dependency-Check Core 1.2.10 API) + @@ -115,7 +115,7 @@ extends Exception
    An InvalidDataDataException is a generic exception used when trying to load the NVD CVE meta data.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/UpdateException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/UpdateException.html index 37f0f6f9c..f8885cb27 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/UpdateException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/UpdateException.html @@ -2,16 +2,16 @@ - + -UpdateException (Dependency-Check Core 1.2.9 API) - +UpdateException (Dependency-Check Core 1.2.10 API) + @@ -120,7 +120,7 @@ extends IOException
    An exception used when an error occurs reading a setting.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/InvalidDataException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/InvalidDataException.html index 20f05c27f..5267eb117 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/InvalidDataException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/InvalidDataException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.exception.InvalidDataException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.exception.InvalidDataException (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/UpdateException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/UpdateException.html index 947b3efeb..9dc8aca28 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/UpdateException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/class-use/UpdateException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.exception.UpdateException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.exception.UpdateException (Dependency-Check Core 1.2.10 API) + @@ -79,32 +79,21 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-frame.html index af50b7472..72ab077c4 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-summary.html index b4b29c73c..f2983f7aa 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,7 @@

    Package org.owasp.dependencycheck.data.update.exception

    -
    - - org.owasp.dependencycheck.data.update.exception - -
    +
    A collection of exception classes used within the application.

    See: Description

    @@ -104,14 +100,7 @@

    Package org.owasp.dependencycheck.data.update.exception Description

    -
    - - org.owasp.dependencycheck.data.update.exception - - -

    A collection of exception classes used within the application.

    - -
    +
    A collection of exception classes used within the application.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-tree.html index 6b5c153a5..fbf868ead 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update.exception Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.exception Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-use.html index dbef7d2d0..723bc44fc 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/exception/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.2.10 API) + @@ -79,32 +79,21 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html index 13b1145cc..31bb83d9a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html index d8eb8cbe1..dd05c2dcf 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,9 @@

    Package org.owasp.dependencycheck.data.update

    -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.

    See: Description

    @@ -143,18 +141,11 @@

    Package org.owasp.dependencycheck.data.update Description

    -
    - - org.owasp.dependencycheck.data.update - - -

    Contains classes used to update the data stores.

    -

    The UpdateService will load, any correctly defined CachedWebDataSource(s) - and call update() on them. The Cached Data Source must determine if it needs - to be updated and if so perform the update. The sub packages contain classes - used to perform the actual updates.

    - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them. The Cached Data Source + must determine if it needs to be updated and if so perform the update. The sub packages contain classes used to perform the + actual updates.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html index 9d87e76a8..9d352210e 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-use.html index 229cc8ee7..71140c74c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.update (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.update (Dependency-Check Core 1.2.10 API) + @@ -79,32 +79,21 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/DownloadTask.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/DownloadTask.html index 4800446c1..fce0e1478 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/DownloadTask.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/DownloadTask.html @@ -2,16 +2,16 @@ - + -DownloadTask (Dependency-Check Core 1.2.9 API) - +DownloadTask (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends Callable<Future<ProcessTask>>
    A callable object to download two files.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/ProcessTask.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/ProcessTask.html index c2e1a7456..85074dc53 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/ProcessTask.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/ProcessTask.html @@ -2,16 +2,16 @@ - + -ProcessTask (Dependency-Check Core 1.2.9 API) - +ProcessTask (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends Callable<ProcessTask>
    A callable task that will process a given set of NVD CVE xml files and update the Cve Database accordingly.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/DownloadTask.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/DownloadTask.html index a25c13d47..047f913a1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/DownloadTask.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/class-use/DownloadTask.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.task.DownloadTask (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.task.DownloadTask (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,7 @@ org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    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 ae4b1988b..d749d597d 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.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.task.ProcessTask (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,7 @@ org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-frame.html index 275a4edf8..f15e9e7b6 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-summary.html index 789e93f84..88f8c7220 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,7 @@

    Package org.owasp.dependencycheck.data.update.task

    -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.

    See: Description

    @@ -104,15 +100,7 @@

    Package org.owasp.dependencycheck.data.update.task Description

    -
    - - org.owasp.dependencycheck.data.update.task - - -

    A collection of callable/runnable tasks used to speed up the update - process.

    - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-tree.html index d5abd1297..c5aee95f1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update.task Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.task Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-use.html index 0a0f46c24..4ef6c6b5f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/task/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.update.task (Dependency-Check Core 1.2.10 API) + @@ -79,11 +79,7 @@ org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.Element.html index e0ec8d79e..ebd57b524 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.Element.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.Element.html @@ -2,16 +2,16 @@ - + -NvdCve12Handler.Element (Dependency-Check Core 1.2.9 API) - +NvdCve12Handler.Element (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.html index dbd81d3ff..86fdaf57c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.html @@ -2,16 +2,16 @@ - + -NvdCve12Handler (Dependency-Check Core 1.2.9 API) - +NvdCve12Handler (Dependency-Check Core 1.2.10 API) + @@ -112,7 +112,7 @@ extends Author: -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.Element.html index 9d7984dac..804ea16f7 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.Element.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.Element.html @@ -2,16 +2,16 @@ - + -NvdCve20Handler.Element (Dependency-Check Core 1.2.9 API) - +NvdCve20Handler.Element (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.html index 9e4ae882d..d574dd428 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.html @@ -2,16 +2,16 @@ - + -NvdCve20Handler (Dependency-Check Core 1.2.9 API) - +NvdCve20Handler (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends org.xml.sax.helpers.DefaultHandler
    A SAX Handler that will parse the NVD CVE XML (schema version 2.0).
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.Element.html index 5875a3d79..ac0f59177 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.Element.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.Element.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.Element (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.Element (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.html index 562f8b143..d3d09406b 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve12Handler.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve12Handler (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.Element.html index 8fd9f2b8c..596c8785c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.Element.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.Element.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.Element (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.Element (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.html index cf17db547..aa73de7bf 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/class-use/NvdCve20Handler.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.data.update.xml.NvdCve20Handler (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-frame.html index e42dcea17..5cf404d08 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-summary.html index 54c3f382c..b049180d3 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.10 API) + @@ -66,11 +66,9 @@

    Package org.owasp.dependencycheck.data.update.xml

    -
    - - org.owasp.dependencycheck.data.nvdcve.xml - -
    +
    Contains classes used to parse the NVD CVE XML file.

    + + The basic use is that the Importer is called to import an NVD CVE file.

    See: Description

    @@ -116,19 +114,11 @@

    Package org.owasp.dependencycheck.data.update.xml Description

    -
    - - org.owasp.dependencycheck.data.nvdcve.xml - - -

    Contains classes used to parse the NVD CVE XML file.

    -

    The basic use is that the Importer is called to import an NVD CVE file. - The Importer instantiates an Indexer object (which extends Index). The - Indexer creates a partial-unmarshalling SAX parser (implemented in the - NvdCveXmlFilter) that extracts VulnerabilityTypes (aka Entry) from the NVD - CVE data file and stores these into a Lucene Index.

    - -
    +
    Contains classes used to parse the NVD CVE XML file.

    + + The basic use is that the Importer is called to import an NVD CVE file. The Importer instantiates an Indexer object (which + extends Index). The Indexer creates a partial-unmarshalling SAX parser (implemented in the NvdCveXmlFilter) that extracts + VulnerabilityTypes (aka Entry) from the NVD CVE data file and stores these into a Lucene Index.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-tree.html index c017b7b76..7a75ee6ff 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.data.update.xml Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.data.update.xml Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-use.html index 29203b4eb..173684d81 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/xml/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.data.update.xml (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Confidence.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Confidence.html index 91eb53d21..8b1b21d11 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Confidence.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Confidence.html @@ -2,16 +2,16 @@ - + -Confidence (Dependency-Check Core 1.2.9 API) - +Confidence (Dependency-Check Core 1.2.10 API) + @@ -110,7 +110,7 @@ extends Enum<Confidence>
    A confidence enumeration.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html index 55c7f62a1..346595227 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html @@ -2,16 +2,16 @@ - + -Dependency (Dependency-Check Core 1.2.9 API) - +Dependency (Dependency-Check Core 1.2.10 API) + @@ -108,7 +108,7 @@ implements Author: -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    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 722eb05cf..ef7c2356e 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.2.9 API) - +Evidence (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends Serializable, Comparable<Evidence>
    Evidence is a piece of information about a Dependency.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    @@ -237,13 +237,19 @@ implements Set the value of value. + +String +toString() +
    Standard toString() implementation.
    + + @@ -445,7 +451,7 @@ implements - diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/EvidenceCollection.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/EvidenceCollection.html index aa513e4d7..9bf427ad1 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/EvidenceCollection.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/EvidenceCollection.html @@ -2,16 +2,16 @@ - + -EvidenceCollection (Dependency-Check Core 1.2.9 API) - +EvidenceCollection (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends Serializable, Iterable<Evidence>
    Used to maintain a collection of Evidence.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Identifier.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Identifier.html index c90d573b9..2daedaddd 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Identifier.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Identifier.html @@ -2,16 +2,16 @@ - + -Identifier (Dependency-Check Core 1.2.9 API) - +Identifier (Dependency-Check Core 1.2.10 API) + @@ -105,7 +105,7 @@ extends Object implements Serializable, Comparable<Identifier>
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Reference.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Reference.html index 69bd45712..849fcab31 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Reference.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Reference.html @@ -2,16 +2,16 @@ - + -Reference (Dependency-Check Core 1.2.9 API) - +Reference (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends Serializable, Comparable<Reference>
    An external reference for a vulnerability. This contains a name, URL, and a source.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Vulnerability.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Vulnerability.html index c9919b6a3..cc78faa9a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Vulnerability.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Vulnerability.html @@ -2,16 +2,16 @@ - + -Vulnerability (Dependency-Check Core 1.2.9 API) - +Vulnerability (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends Serializable, Comparable<Vulnerability>
    Contains the information about a vulnerability.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerabilityComparator.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerabilityComparator.html index 75d3a06a0..81edcb821 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerabilityComparator.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerabilityComparator.html @@ -2,16 +2,16 @@ - + -VulnerabilityComparator (Dependency-Check Core 1.2.9 API) - +VulnerabilityComparator (Dependency-Check Core 1.2.10 API) + @@ -106,7 +106,7 @@ extends Comparator<Vulnerability>, Serializable
    Comparator for Vulnerability objects.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerableSoftware.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerableSoftware.html index c7bd049aa..4635939c4 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerableSoftware.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/VulnerableSoftware.html @@ -2,16 +2,16 @@ - + -VulnerableSoftware (Dependency-Check Core 1.2.9 API) - +VulnerableSoftware (Dependency-Check Core 1.2.10 API) + @@ -111,7 +111,7 @@ extends Serializable, Comparable<VulnerableSoftware>
    A record containing information about vulnerable software. This is referenced from a vulnerability.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Confidence.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Confidence.html index 7b7849c27..5a140f262 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Confidence.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Confidence.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.Confidence (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.Confidence (Dependency-Check Core 1.2.10 API) + @@ -79,24 +79,13 @@ org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Dependency.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Dependency.html index 27ad64c1b..e9523e70f 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Dependency.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Dependency.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.Dependency (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.Dependency (Dependency-Check Core 1.2.10 API) + @@ -79,81 +79,44 @@ org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.agent -
    - - org.owasp.dependencycheck.agent - - - The agent package holds an agent API that can be used by other applications that have information about dependencies; - but would rather implement something in their code directly rather then spawn a process to run the entire - dependency-check engine.
    +
    The agent package holds an agent API that can be used by other applications that have information about dependencies; but would + rather implement something in their code directly rather then spawn a process to run the entire dependency-check engine.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    -org.owasp.dependencycheck.jaxb.pom +org.owasp.dependencycheck.reporting -
    - - org.owasp.dependencycheck.analyzer.pom - - - This package contains utility classes used to parse pom.xml files.
    +
    Contains classes used to generate reports.
    -org.owasp.dependencycheck.reporting +org.owasp.dependencycheck.suppression -
    - - org.owasp.dependencycheck.reporting - - - Contains classes used to generate reports.
    +
    Contains classes used to suppress findings.
    -org.owasp.dependencycheck.suppression +org.owasp.dependencycheck.xml.pom -
    - - org.owasp.dependencycheck.suppression - - - Contains classes used to suppress findings.
    +
    This package contains classes used to parse pom.xml files.
    @@ -467,7 +430,7 @@ static void -JarAnalyzer.extractLicense(Model pom, +JarAnalyzer.extractLicense(Model pom, Properties pomProperties, Dependency dependency)
    Extracts the license information from the pom and adds it to the dependency.
    @@ -540,27 +503,6 @@ -
  • - - -

    Uses of Dependency in org.owasp.dependencycheck.jaxb.pom

    - - - - - - - - - - - - -
    Methods in org.owasp.dependencycheck.jaxb.pom with parameters of type Dependency 
    Modifier and TypeMethod and Description
    voidPomUtils.analyzePOM(Dependency dependency, - File pomFile) -
    Reads in the pom file and adds elements as evidence to the given dependency.
    -
    -
  • @@ -602,6 +544,27 @@
  • +
  • + + +

    Uses of Dependency in org.owasp.dependencycheck.xml.pom

    + + + + + + + + + + + + +
    Methods in org.owasp.dependencycheck.xml.pom with parameters of type Dependency 
    Modifier and TypeMethod and Description
    static voidPomUtils.analyzePOM(Dependency dependency, + File pomFile) +
    Reads in the pom file and adds elements as evidence to the given dependency.
    +
    +
  • diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Evidence.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Evidence.html index 44fb6825f..76a6e9bf9 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Evidence.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Evidence.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.Evidence (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.Evidence (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/EvidenceCollection.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/EvidenceCollection.html index b085b7a41..d85ff8a31 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/EvidenceCollection.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/EvidenceCollection.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.EvidenceCollection (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.EvidenceCollection (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Identifier.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Identifier.html index e25c46803..99c5534fd 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Identifier.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Identifier.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.Identifier (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.Identifier (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    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 df63ead09..07c29e75c 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.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.Reference (Dependency-Check Core 1.2.10 API) + @@ -79,12 +79,7 @@ org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Vulnerability.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Vulnerability.html index 94290f0a4..5bac7ddb7 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Vulnerability.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/Vulnerability.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.Vulnerability (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.Vulnerability (Dependency-Check Core 1.2.10 API) + @@ -79,23 +79,13 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerabilityComparator.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerabilityComparator.html index 3587f8439..4ee524a12 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerabilityComparator.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerabilityComparator.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.VulnerabilityComparator (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.VulnerabilityComparator (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerableSoftware.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerableSoftware.html index d949afd45..c9a46e8c7 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerableSoftware.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/class-use/VulnerableSoftware.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.dependency.VulnerableSoftware (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.dependency.VulnerableSoftware (Dependency-Check Core 1.2.10 API) + @@ -79,33 +79,21 @@ org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update.xml -
    - - org.owasp.dependencycheck.data.nvdcve.xml - -
    +
    Contains classes used to parse the NVD CVE XML file.

    + + The basic use is that the Importer is called to import an NVD CVE file.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-frame.html index 866e430d6..2a9fbfad7 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-summary.html index ab08282ca..44760cc98 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.10 API) + @@ -66,12 +66,7 @@

    Package org.owasp.dependencycheck.dependency

    -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.

    See: Description

    @@ -156,14 +151,7 @@

    Package org.owasp.dependencycheck.dependency Description

    -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation. - -
    +
    Contains the core Dependency implementation.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-tree.html index f12156d7e..6aaeff921 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-tree.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.dependency Class Hierarchy (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.dependency Class Hierarchy (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-use.html index 0ce525546..366e9f0ae 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-use.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.dependency (Dependency-Check Core 1.2.10 API) + @@ -79,102 +79,58 @@ org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.agent -
    - - org.owasp.dependencycheck.agent - - - The agent package holds an agent API that can be used by other applications that have information about dependencies; - but would rather implement something in their code directly rather then spawn a process to run the entire - dependency-check engine.
    +
    The agent package holds an agent API that can be used by other applications that have information about dependencies; but would + rather implement something in their code directly rather then spawn a process to run the entire dependency-check engine.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update.xml -
    - - org.owasp.dependencycheck.data.nvdcve.xml - -
    +
    Contains classes used to parse the NVD CVE XML file.

    + + The basic use is that the Importer is called to import an NVD CVE file.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    -org.owasp.dependencycheck.jaxb.pom +org.owasp.dependencycheck.reporting -
    - - org.owasp.dependencycheck.analyzer.pom - - - This package contains utility classes used to parse pom.xml files.
    +
    Contains classes used to generate reports.
    -org.owasp.dependencycheck.reporting +org.owasp.dependencycheck.suppression -
    - - org.owasp.dependencycheck.reporting - - - Contains classes used to generate reports.
    +
    Contains classes used to suppress findings.
    -org.owasp.dependencycheck.suppression +org.owasp.dependencycheck.xml.pom -
    - - org.owasp.dependencycheck.suppression - - - Contains classes used to suppress findings.
    +
    This package contains classes used to parse pom.xml files.
    @@ -325,23 +281,6 @@ -
  • - - - - - - - - - - - - -
    Classes in org.owasp.dependencycheck.dependency used by org.owasp.dependencycheck.jaxb.pom 
    Class and Description
    Dependency -
    A program dependency.
    -
    -
  • @@ -376,6 +315,23 @@
  • +
  • + + + + + + + + + + + + +
    Classes in org.owasp.dependencycheck.dependency used by org.owasp.dependencycheck.xml.pom 
    Class and Description
    Dependency +
    A program dependency.
    +
    +
  • diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/NoDataException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/NoDataException.html index f174a91b5..703c8766a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/NoDataException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/NoDataException.html @@ -2,16 +2,16 @@ - + -NoDataException (Dependency-Check Core 1.2.9 API) - +NoDataException (Dependency-Check Core 1.2.10 API) + @@ -120,7 +120,7 @@ extends IOException
    An exception used when the data needed does not exist to perform analysis.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/ScanAgentException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/ScanAgentException.html index da4f3790b..298bf4a1a 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/ScanAgentException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/ScanAgentException.html @@ -2,16 +2,16 @@ - + -ScanAgentException (Dependency-Check Core 1.2.9 API) - +ScanAgentException (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/NoDataException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/NoDataException.html index f84930b0e..bb6e759df 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/NoDataException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/NoDataException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.exception.NoDataException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.exception.NoDataException (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/ScanAgentException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/ScanAgentException.html index f842f43bb..958af73b9 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/ScanAgentException.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/class-use/ScanAgentException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.exception.ScanAgentException (Dependency-Check Core 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.exception.ScanAgentException (Dependency-Check Core 1.2.10 API) + @@ -79,14 +79,8 @@ org.owasp.dependencycheck.agent -
    - - org.owasp.dependencycheck.agent - - - The agent package holds an agent API that can be used by other applications that have information about dependencies; - but would rather implement something in their code directly rather then spawn a process to run the entire - dependency-check engine.
    +
    The agent package holds an agent API that can be used by other applications that have information about dependencies; but would + rather implement something in their code directly rather then spawn a process to run the entire dependency-check engine.
    @@ -106,7 +100,7 @@ -void +Engine DependencyCheckScanAgent.execute()
    Executes the dependency-check and generates the report.
    diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-frame.html index 04712cadb..3f19326af 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-frame.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.exception (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.exception (Dependency-Check Core 1.2.10 API) + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-summary.html index 4a09b671a..6fc44de10 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/exception/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.exception (Dependency-Check Core 1.2.9 API) - +org.owasp.dependencycheck.exception (Dependency-Check Core 1.2.10 API) + @@ -38,7 +38,7 @@
    @@ -133,7 +122,7 @@ +
    +
      +
    • + +
        +
      • + + +

        Constructor Detail

        + + + +
          +
        • +

          License

          +
          public License()
          +
        • +
        + + + +
          +
        • +

          License

          +
          public License(String name,
          +       String url)
          +
          Constructs a new license.
          +
          Parameters:
          name -
          url -
          +
        • +
        +
      • +
      + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          getUrl

          +
          public String getUrl()
          +
          Get the value of url.
          +
          Returns:
          the value of url
          +
        • +
        + + + +
          +
        • +

          setUrl

          +
          public void setUrl(String url)
          +
          Set the value of url.
          +
          Parameters:
          url - new value of url
          +
        • +
        + + + +
          +
        • +

          getName

          +
          public String getName()
          +
          Get the value of name.
          +
          Returns:
          the value of name
          +
        • +
        + + + +
          +
        • +

          setName

          +
          public void setName(String name)
          +
          Set the value of name.
          +
          Parameters:
          name - new value of name
          +
        • +
        +
      • +
      +
    • +
    +
    +
    + + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/Model.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/Model.html new file mode 100644 index 000000000..ed86998af --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/Model.html @@ -0,0 +1,588 @@ + + + + + + +Model (Dependency-Check Core 1.2.10 API) + + + + + + + + + + + +
    +
    org.owasp.dependencycheck.xml.pom
    +

    Class Model

    +
    +
    + +
    +
      +
    • +
      +
      +
      public class Model
      +extends Object
      +
      A simple pojo to hold data related to a Maven POM file.
      +
      Author:
      +
      jeremy
      +
    • +
    +
    +
    + +
    +
    +
      +
    • + +
        +
      • + + +

        Constructor Detail

        + + + +
          +
        • +

          Model

          +
          public Model()
          +
        • +
        +
      • +
      + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          getName

          +
          public String getName()
          +
          Get the value of name.
          +
          Returns:
          the value of name
          +
        • +
        + + + +
          +
        • +

          setName

          +
          public void setName(String name)
          +
          Set the value of name.
          +
          Parameters:
          name - new value of name
          +
        • +
        + + + +
          +
        • +

          getOrganization

          +
          public String getOrganization()
          +
          Get the value of organization.
          +
          Returns:
          the value of organization
          +
        • +
        + + + +
          +
        • +

          setOrganization

          +
          public void setOrganization(String organization)
          +
          Set the value of organization.
          +
          Parameters:
          organization - new value of organization
          +
        • +
        + + + +
          +
        • +

          getDescription

          +
          public String getDescription()
          +
          Get the value of description.
          +
          Returns:
          the value of description
          +
        • +
        + + + +
          +
        • +

          setDescription

          +
          public void setDescription(String description)
          +
          Set the value of description.
          +
          Parameters:
          description - new value of description
          +
        • +
        + + + +
          +
        • +

          getGroupId

          +
          public String getGroupId()
          +
          Get the value of groupId.
          +
          Returns:
          the value of groupId
          +
        • +
        + + + +
          +
        • +

          setGroupId

          +
          public void setGroupId(String groupId)
          +
          Set the value of groupId.
          +
          Parameters:
          groupId - new value of groupId
          +
        • +
        + + + +
          +
        • +

          getArtifactId

          +
          public String getArtifactId()
          +
          Get the value of artifactId.
          +
          Returns:
          the value of artifactId
          +
        • +
        + + + +
          +
        • +

          setArtifactId

          +
          public void setArtifactId(String artifactId)
          +
          Set the value of artifactId.
          +
          Parameters:
          artifactId - new value of artifactId
          +
        • +
        + + + +
          +
        • +

          getVersion

          +
          public String getVersion()
          +
          Get the value of version.
          +
          Returns:
          the value of version
          +
        • +
        + + + +
          +
        • +

          setVersion

          +
          public void setVersion(String version)
          +
          Set the value of version.
          +
          Parameters:
          version - new value of version
          +
        • +
        + + + +
          +
        • +

          getParentGroupId

          +
          public String getParentGroupId()
          +
          Get the value of parentGroupId.
          +
          Returns:
          the value of parentGroupId
          +
        • +
        + + + +
          +
        • +

          setParentGroupId

          +
          public void setParentGroupId(String parentGroupId)
          +
          Set the value of parentGroupId.
          +
          Parameters:
          parentGroupId - new value of parentGroupId
          +
        • +
        + + + +
          +
        • +

          getParentArtifactId

          +
          public String getParentArtifactId()
          +
          Get the value of parentArtifactId.
          +
          Returns:
          the value of parentArtifactId
          +
        • +
        + + + +
          +
        • +

          setParentArtifactId

          +
          public void setParentArtifactId(String parentArtifactId)
          +
          Set the value of parentArtifactId.
          +
          Parameters:
          parentArtifactId - new value of parentArtifactId
          +
        • +
        + + + +
          +
        • +

          getParentVersion

          +
          public String getParentVersion()
          +
          Get the value of parentVersion.
          +
          Returns:
          the value of parentVersion
          +
        • +
        + + + +
          +
        • +

          setParentVersion

          +
          public void setParentVersion(String parentVersion)
          +
          Set the value of parentVersion.
          +
          Parameters:
          parentVersion - new value of parentVersion
          +
        • +
        + + + +
          +
        • +

          getLicenses

          +
          public List<License> getLicenses()
          +
          Returns the list of licenses.
          +
          Returns:
          the list of licenses
          +
        • +
        + + + +
          +
        • +

          addLicense

          +
          public void addLicense(License license)
          +
          Adds a new license to the list of licenses.
          +
          Parameters:
          license - the license to add
          +
        • +
        +
      • +
      +
    • +
    +
    +
    + + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomHandler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomHandler.html new file mode 100644 index 000000000..2139c65a1 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomHandler.html @@ -0,0 +1,580 @@ + + + + + + +PomHandler (Dependency-Check Core 1.2.10 API) + + + + + + + + + + + +
    +
    org.owasp.dependencycheck.xml.pom
    +

    Class PomHandler

    +
    +
    + +
    + +
    +
    + +
    +
    + +
    +
    + + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomParseException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomParseException.html new file mode 100644 index 000000000..c55069dcf --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomParseException.html @@ -0,0 +1,313 @@ + + + + + + +PomParseException (Dependency-Check Core 1.2.10 API) + + + + + + + + + + + +
    +
    org.owasp.dependencycheck.xml.pom
    +

    Class PomParseException

    +
    +
    + +
    +
      +
    • +
      +
      All Implemented Interfaces:
      +
      Serializable
      +
      +
      +
      +
      public class PomParseException
      +extends IOException
      +
      An exception used when parsing a suppression rule file fails.
      +
      Author:
      +
      Jeremy Long
      +
      See Also:
      Serialized Form
      +
    • +
    +
    +
    + +
    +
    +
      +
    • + +
        +
      • + + +

        Constructor Detail

        + + + +
          +
        • +

          PomParseException

          +
          public PomParseException()
          +
          Creates a new SuppressionParseException.
          +
        • +
        + + + +
          +
        • +

          PomParseException

          +
          public PomParseException(String msg)
          +
          Creates a new SuppressionParseException.
          +
          Parameters:
          msg - a message for the exception.
          +
        • +
        + + + +
          +
        • +

          PomParseException

          +
          public PomParseException(Throwable ex)
          +
          Creates a new SuppressionParseException.
          +
          Parameters:
          ex - the cause of the parse exception
          +
        • +
        + + + +
          +
        • +

          PomParseException

          +
          public PomParseException(String msg,
          +                 Throwable ex)
          +
          Creates a new SuppressionParseException.
          +
          Parameters:
          msg - a message for the exception.
          ex - the cause of the parse exception
          +
        • +
        +
      • +
      +
    • +
    +
    +
    + + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomParser.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomParser.html new file mode 100644 index 000000000..469790ae8 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomParser.html @@ -0,0 +1,291 @@ + + + + + + +PomParser (Dependency-Check Core 1.2.10 API) + + + + + + + + + + + +
    +
    org.owasp.dependencycheck.xml.pom
    +

    Class PomParser

    +
    +
    + +
    +
      +
    • +
      +
      +
      public class PomParser
      +extends Object
      +
      A parser for pom.xml files.
      +
      Author:
      +
      Jeremy Long
      +
    • +
    +
    +
    + +
    +
    +
      +
    • + +
        +
      • + + +

        Constructor Detail

        + + + +
          +
        • +

          PomParser

          +
          public PomParser()
          +
        • +
        +
      • +
      + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          parse

          +
          public Model parse(File file)
          +            throws PomParseException
          +
          Parses the given xml file and returns a Model object containing only the fields dependency-check requires.
          +
          Parameters:
          file - a pom.xml
          +
          Returns:
          a Model object containing only the fields dependency-check requires
          +
          Throws:
          +
          PomParseException - thrown if the xml file cannot be parsed
          +
        • +
        + + + +
          +
        • +

          parse

          +
          public Model parse(InputStream inputStream)
          +            throws PomParseException
          +
          Parses the given xml file and returns a Model object containing only the fields dependency-check requires.
          +
          Parameters:
          inputStream - an InputStream containing suppression rues
          +
          Returns:
          a list of suppression rules
          +
          Throws:
          +
          SuppressionParseException - if the xml cannot be parsed
          +
          PomParseException
          +
        • +
        +
      • +
      +
    • +
    +
    +
    + + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomUtils.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomUtils.html new file mode 100644 index 000000000..3f6aa411b --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/PomUtils.html @@ -0,0 +1,281 @@ + + + + + + +PomUtils (Dependency-Check Core 1.2.10 API) + + + + + + + + + + + +
    +
    org.owasp.dependencycheck.xml.pom
    +

    Class PomUtils

    +
    +
    + +
    +
      +
    • +
      +
      +
      public final class PomUtils
      +extends Object
      +
      Author:
      +
      jeremy
      +
    • +
    +
    +
    + +
    +
    +
      +
    • + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          readPom

          +
          public static Model readPom(File file)
          +                     throws AnalysisException
          +
          Reads in the specified POM and converts it to a Model.
          +
          Parameters:
          file - the pom.xml file
          +
          Returns:
          returns a
          +
          Throws:
          +
          AnalysisException - is thrown if there is an exception extracting or parsing the POM + org.owasp.dependencycheck.jaxb.pom.generated.Model object
          +
        • +
        + + + +
          +
        • +

          readPom

          +
          public static Model readPom(String path,
          +            JarFile jar)
          +                     throws AnalysisException
          +
          Retrieves the specified POM from a jar file and converts it to a Model.
          +
          Parameters:
          path - the path to the pom.xml file within the jar file
          jar - the jar file to extract the pom from
          +
          Returns:
          returns a
          +
          Throws:
          +
          AnalysisException - is thrown if there is an exception extracting or parsing the POM + org.owasp.dependencycheck.jaxb.pom.generated.Model object
          +
        • +
        + + + +
          +
        • +

          analyzePOM

          +
          public static void analyzePOM(Dependency dependency,
          +              File pomFile)
          +                       throws AnalysisException
          +
          Reads in the pom file and adds elements as evidence to the given dependency.
          +
          Parameters:
          dependency - the dependency being analyzed
          pomFile - the pom file to read
          +
          Throws:
          +
          AnalysisException - is thrown if there is an exception parsing the pom
          +
        • +
        +
      • +
      +
    • +
    +
    +
    + + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/License.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/License.html new file mode 100644 index 000000000..d222e6eed --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/License.html @@ -0,0 +1,176 @@ + + + + + + +Uses of Class org.owasp.dependencycheck.xml.pom.License (Dependency-Check Core 1.2.10 API) + + + + + + + + + + +
    +

    Uses of Class
    org.owasp.dependencycheck.xml.pom.License

    +
    +
    + +
    + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/Model.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/Model.html new file mode 100644 index 000000000..6a272300c --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/Model.html @@ -0,0 +1,214 @@ + + + + + + +Uses of Class org.owasp.dependencycheck.xml.pom.Model (Dependency-Check Core 1.2.10 API) + + + + + + + + + + +
    +

    Uses of Class
    org.owasp.dependencycheck.xml.pom.Model

    +
    +
    + +
    + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomHandler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomHandler.html new file mode 100644 index 000000000..b2f4266af --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomHandler.html @@ -0,0 +1,117 @@ + + + + + + +Uses of Class org.owasp.dependencycheck.xml.pom.PomHandler (Dependency-Check Core 1.2.10 API) + + + + + + + + + + +
    +

    Uses of Class
    org.owasp.dependencycheck.xml.pom.PomHandler

    +
    +
    No usage of org.owasp.dependencycheck.xml.pom.PomHandler
    + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomParseException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomParseException.html new file mode 100644 index 000000000..95c6069bf --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomParseException.html @@ -0,0 +1,167 @@ + + + + + + +Uses of Class org.owasp.dependencycheck.xml.pom.PomParseException (Dependency-Check Core 1.2.10 API) + + + + + + + + + + +
    +

    Uses of Class
    org.owasp.dependencycheck.xml.pom.PomParseException

    +
    +
    + +
    + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomParser.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomParser.html new file mode 100644 index 000000000..d31b61fa0 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomParser.html @@ -0,0 +1,117 @@ + + + + + + +Uses of Class org.owasp.dependencycheck.xml.pom.PomParser (Dependency-Check Core 1.2.10 API) + + + + + + + + + + +
    +

    Uses of Class
    org.owasp.dependencycheck.xml.pom.PomParser

    +
    +
    No usage of org.owasp.dependencycheck.xml.pom.PomParser
    + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomUtils.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomUtils.html new file mode 100644 index 000000000..6fd9831c7 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/class-use/PomUtils.html @@ -0,0 +1,117 @@ + + + + + + +Uses of Class org.owasp.dependencycheck.xml.pom.PomUtils (Dependency-Check Core 1.2.10 API) + + + + + + + + + + +
    +

    Uses of Class
    org.owasp.dependencycheck.xml.pom.PomUtils

    +
    +
    No usage of org.owasp.dependencycheck.xml.pom.PomUtils
    + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-frame.html new file mode 100644 index 000000000..d1b7c7a23 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-frame.html @@ -0,0 +1,28 @@ + + + + + + +org.owasp.dependencycheck.xml.pom (Dependency-Check Core 1.2.10 API) + + + + +

    org.owasp.dependencycheck.xml.pom

    +
    +

    Classes

    + +

    Exceptions

    + +
    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-summary.html new file mode 100644 index 000000000..ba48bc3f1 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-summary.html @@ -0,0 +1,183 @@ + + + + + + +org.owasp.dependencycheck.xml.pom (Dependency-Check Core 1.2.10 API) + + + + + + + +
    + + + + + +
    + + +
    +

    Package org.owasp.dependencycheck.xml.pom

    +
    +
    This package contains classes used to parse pom.xml files.
    +
    +

    See: Description

    +
    +
    +
      +
    • + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Class Summary 
      ClassDescription
      License 
      Model +
      A simple pojo to hold data related to a Maven POM file.
      +
      PomHandler +
      A handler to read the pom.xml model.
      +
      PomParser +
      A parser for pom.xml files.
      +
      PomUtils 
      +
    • +
    • + + + + + + + + + + + + +
      Exception Summary 
      ExceptionDescription
      PomParseException +
      An exception used when parsing a suppression rule file fails.
      +
      +
    • +
    + + + +

    Package org.owasp.dependencycheck.xml.pom Description

    +
    This package contains classes used to parse pom.xml files.
    +
    + +
    + + + + + +
    + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-tree.html new file mode 100644 index 000000000..0055cb678 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-tree.html @@ -0,0 +1,151 @@ + + + + + + +org.owasp.dependencycheck.xml.pom Class Hierarchy (Dependency-Check Core 1.2.10 API) + + + + + + + +
    + + + + + +
    + + +
    +

    Hierarchy For Package org.owasp.dependencycheck.xml.pom

    +Package Hierarchies: + +
    +
    +

    Class Hierarchy

    + +
    + +
    + + + + + +
    + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-use.html new file mode 100644 index 000000000..fcebcc815 --- /dev/null +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/xml/pom/package-use.html @@ -0,0 +1,185 @@ + + + + + + +Uses of Package org.owasp.dependencycheck.xml.pom (Dependency-Check Core 1.2.10 API) + + + + + + + + + + +
    +

    Uses of Package
    org.owasp.dependencycheck.xml.pom

    +
    +
    + +
    + + + + +

    Copyright© 2012-15 Jeremy Long. All Rights Reserved.

    + + diff --git a/dependency-check-core/apidocs/overview-frame.html b/dependency-check-core/apidocs/overview-frame.html index 55d336075..bfe34ac2b 100644 --- a/dependency-check-core/apidocs/overview-frame.html +++ b/dependency-check-core/apidocs/overview-frame.html @@ -2,10 +2,10 @@ - + -Overview List (Dependency-Check Core 1.2.9 API) - +Overview List (Dependency-Check Core 1.2.10 API) + @@ -30,11 +30,10 @@
  • org.owasp.dependencycheck.data.update.xml
  • org.owasp.dependencycheck.dependency
  • org.owasp.dependencycheck.exception
  • -
  • org.owasp.dependencycheck.jaxb.pom
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated
  • org.owasp.dependencycheck.reporting
  • org.owasp.dependencycheck.suppression
  • org.owasp.dependencycheck.utils
  • +
  • org.owasp.dependencycheck.xml.pom
  •  

    diff --git a/dependency-check-core/apidocs/overview-summary.html b/dependency-check-core/apidocs/overview-summary.html index 76a1d13ea..6b56beb45 100644 --- a/dependency-check-core/apidocs/overview-summary.html +++ b/dependency-check-core/apidocs/overview-summary.html @@ -2,16 +2,16 @@ - + -Overview (Dependency-Check Core 1.2.9 API) - +Overview (Dependency-Check Core 1.2.10 API) + @@ -64,7 +64,7 @@
    -

    Dependency-Check Core 1.2.9 API

    +

    Dependency-Check Core 1.2.10 API

    @@ -77,230 +77,137 @@ - - - - - - - - + + + + diff --git a/dependency-check-core/apidocs/overview-tree.html b/dependency-check-core/apidocs/overview-tree.html index 2595d662b..bdaef10be 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.2.9 API) - +Class Hierarchy (Dependency-Check Core 1.2.10 API) + @@ -84,11 +84,10 @@
  • org.owasp.dependencycheck.data.update.xml,
  • org.owasp.dependencycheck.dependency,
  • org.owasp.dependencycheck.exception,
  • -
  • org.owasp.dependencycheck.jaxb.pom,
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated,
  • org.owasp.dependencycheck.reporting,
  • org.owasp.dependencycheck.suppression,
  • -
  • org.owasp.dependencycheck.utils
  • +
  • org.owasp.dependencycheck.utils,
  • +
  • org.owasp.dependencycheck.xml.pom
  • @@ -121,10 +120,6 @@
  • org.owasp.dependencycheck.analyzer.HintAnalyzer (implements org.owasp.dependencycheck.analyzer.Analyzer)
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Activation
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty
  • org.apache.lucene.analysis.Analyzer (implements java.io.Closeable)
    • org.owasp.dependencycheck.data.lucene.FieldAnalyzer
    • @@ -159,24 +154,8 @@
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Build
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Build.Extensions
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Build.Filters
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Build.Plugins
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Build.Resources
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Build.TestResources
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.BuildBase
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Filters
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Plugins
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Resources
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.TestResources
  • org.owasp.dependencycheck.data.central.CentralSearch
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.CiManagement
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.Notifiers
  • org.owasp.dependencycheck.data.nvdcve.ConnectionFactory
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Contributor
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Properties
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Roles
  • org.owasp.dependencycheck.analyzer.CPEAnalyzer (implements org.owasp.dependencycheck.analyzer.Analyzer)
  • org.owasp.dependencycheck.data.cpe.CpeMemoryIndex
  • org.owasp.dependencycheck.data.nvdcve.CveDB
  • @@ -189,22 +168,14 @@
  • org.owasp.dependencycheck.data.cwe.CweHandler
  • org.owasp.dependencycheck.data.update.xml.NvdCve12Handler
  • org.owasp.dependencycheck.data.update.xml.NvdCve20Handler
  • +
  • org.owasp.dependencycheck.xml.pom.PomHandler
  • org.owasp.dependencycheck.suppression.SuppressionHandler
  • org.owasp.dependencycheck.dependency.Dependency (implements java.lang.Comparable<T>, java.io.Serializable)
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Dependency
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Dependency.Exclusions
  • org.owasp.dependencycheck.agent.DependencyCheckScanAgent
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.Dependencies
  • org.owasp.dependencycheck.utils.DependencyVersion (implements java.lang.Comparable<T>, java.lang.Iterable<T>)
  • org.owasp.dependencycheck.utils.DependencyVersionUtil
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Developer
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Developer.Properties
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Developer.Roles
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement
  • org.owasp.dependencycheck.data.update.task.DownloadTask (implements java.util.concurrent.Callable<V>)
  • org.owasp.dependencycheck.data.nvdcve.DriverLoader
  • org.owasp.dependencycheck.Engine
  • @@ -212,8 +183,6 @@
  • org.owasp.dependencycheck.reporting.EscapeTool
  • org.owasp.dependencycheck.dependency.Evidence (implements java.lang.Comparable<T>, java.io.Serializable)
  • org.owasp.dependencycheck.dependency.EvidenceCollection (implements java.lang.Iterable<T>, java.io.Serializable)
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Exclusion
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Extension
  • org.owasp.dependencycheck.utils.ExtractionUtil
  • org.owasp.dependencycheck.data.cpe.Fields
  • org.owasp.dependencycheck.utils.Filter<T>
  • @@ -232,76 +201,25 @@ -
  • org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement
  • org.owasp.dependencycheck.analyzer.JarAnalyzer.ClassNameInformation
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.License
  • +
  • org.owasp.dependencycheck.xml.pom.License
  • org.owasp.dependencycheck.data.lucene.LuceneUtils
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.MailingList
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.MailingList.OtherArchives
  • org.owasp.dependencycheck.data.nexus.MavenArtifact
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Contributors
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Dependencies
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Developers
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Licenses
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.MailingLists
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Modules
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.PluginRepositories
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Profiles
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Properties
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Reports
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Model.Repositories
  • +
  • org.owasp.dependencycheck.xml.pom.Model
  • org.owasp.dependencycheck.data.nexus.NexusSearch
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Notifier
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Notifier.Configuration
  • org.owasp.dependencycheck.data.nuget.NugetPackage
  • org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.Element
  • org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.Element
  • org.owasp.dependencycheck.analyzer.NvdCveAnalyzer (implements org.owasp.dependencycheck.analyzer.Analyzer)
  • org.owasp.dependencycheck.data.update.NvdCveInfo
  • org.owasp.dependencycheck.data.update.NvdCveUpdater (implements org.owasp.dependencycheck.data.update.CachedWebDataSource)
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Organization
  • org.owasp.dependencycheck.utils.Pair<L,R>
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Parent
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Plugin
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Configuration
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Dependencies
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Executions
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Goals
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Configuration
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Goals
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.Plugins
  • -
  • org.owasp.dependencycheck.jaxb.pom.PomUtils
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites
  • +
  • org.owasp.dependencycheck.xml.pom.PomParser
  • +
  • org.owasp.dependencycheck.xml.pom.PomUtils
  • org.owasp.dependencycheck.data.update.task.ProcessTask (implements java.util.concurrent.Callable<V>)
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Profile
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Profile.Dependencies
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Profile.Modules
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Profile.PluginRepositories
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Profile.Properties
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Profile.Reports
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Profile.Repositories
  • org.owasp.dependencycheck.suppression.PropertyType
  • org.owasp.dependencycheck.dependency.Reference (implements java.lang.Comparable<T>, java.io.Serializable)
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Relocation
  • org.owasp.dependencycheck.reporting.ReportGenerator
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Reporting
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Reporting.Plugins
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.Configuration
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.ReportSets
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ReportSet
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Configuration
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Reports
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Repository
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Resource
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Resource.Excludes
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Resource.Includes
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Scm
  • org.apache.lucene.search.similarities.Similarity
    • org.apache.lucene.search.similarities.TFIDFSimilarity @@ -315,7 +233,6 @@
  • -
  • org.owasp.dependencycheck.jaxb.pom.generated.Site
  • org.owasp.dependencycheck.data.update.StandardUpdate
  • org.owasp.dependencycheck.suppression.SuppressionErrorHandler (implements org.xml.sax.ErrorHandler)
  • org.owasp.dependencycheck.suppression.SuppressionParser
  • @@ -333,6 +250,7 @@
  • java.io.IOException
  • diff --git a/dependency-check-core/apidocs/package-list b/dependency-check-core/apidocs/package-list index 32600e0a1..5aaee1d78 100644 --- a/dependency-check-core/apidocs/package-list +++ b/dependency-check-core/apidocs/package-list @@ -15,8 +15,7 @@ org.owasp.dependencycheck.data.update.task org.owasp.dependencycheck.data.update.xml org.owasp.dependencycheck.dependency org.owasp.dependencycheck.exception -org.owasp.dependencycheck.jaxb.pom -org.owasp.dependencycheck.jaxb.pom.generated org.owasp.dependencycheck.reporting org.owasp.dependencycheck.suppression org.owasp.dependencycheck.utils +org.owasp.dependencycheck.xml.pom diff --git a/dependency-check-core/apidocs/serialized-form.html b/dependency-check-core/apidocs/serialized-form.html index e808d0908..684fa9494 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.2.9 API) - +Serialized Form (Dependency-Check Core 1.2.10 API) + @@ -666,6 +666,16 @@ +
  • +

    Package org.owasp.dependencycheck.xml.pom

    + +
  • diff --git a/dependency-check-core/checkstyle.html b/dependency-check-core/checkstyle.html index c03bf6302..2a9716104 100644 --- a/dependency-check-core/checkstyle.html +++ b/dependency-check-core/checkstyle.html @@ -1,13 +1,13 @@ - + dependency-check-core - Checkstyle Results @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ - + -
    org.owasp.dependencycheck -
    - - org.owasp.dependencycheck - - - Includes the main entry point (i.e.
    +
    Includes the main entry point for dependency-check.
    org.owasp.dependencycheck.agent -
    - - org.owasp.dependencycheck.agent - - - The agent package holds an agent API that can be used by other applications that have information about dependencies; - but would rather implement something in their code directly rather then spawn a process to run the entire - dependency-check engine.
    +
    The agent package holds an agent API that can be used by other applications that have information about dependencies; but would + rather implement something in their code directly rather then spawn a process to run the entire dependency-check engine.
    org.owasp.dependencycheck.analyzer -
    - - org.owasp.dependencycheck.analyzer - - - Analyzers are used to inspect the identified dependencies, collect Evidence, - and process the dependencies.
    +
    Analyzers are used to inspect the identified dependencies, collect Evidence, and process the dependencies.
    org.owasp.dependencycheck.analyzer.exception -
    - - org.owasp.dependencycheck.analyzer.exception - -
    +
    A collection of exception classes used within the analyzers.
    org.owasp.dependencycheck.data.central -
    - - org.owasp.dependencycheck.data.central - -
    +
    Contains classes related to searching Maven Central.

    + + These are used to abstract Maven Central searching away from OWASP Dependency Check so they can be reused elsewhere.
    org.owasp.dependencycheck.data.cpe -
    - - org.owasp.dependencycheck.data.cpe - - - Contains classes for working with the CPE Lucene Index.
    +
    Contains classes for working with the CPE Lucene Index.
    org.owasp.dependencycheck.data.cwe -
    - - org.owasp.dependencycheck.data.cwe - - - Contains classes for working with the CWE Database.
    +
    Contains classes for working with the CWE Database.
    org.owasp.dependencycheck.data.lucene -
    - - org.owasp.dependencycheck.data.lucene - - - Contains classes used to work with the Lucene Indexes.
    +
    Contains classes used to work with the Lucene Indexes.
    org.owasp.dependencycheck.data.nexus -
    - - org.owasp.dependencycheck.data.nexus - -
    +
    Contains classes related to searching a Nexus repository.

    + + These are used to abstract Nexus searching away from OWASP Dependency Check so they can be reused elsewhere.
    org.owasp.dependencycheck.data.nuget -
    - - org.owasp.dependencycheck.data.nuget - -
    +
    Contains classes related to parsing Nuget related files

    + These are used to abstract away Nuget-related handling from Dependency Check so they can be used elsewhere.
    org.owasp.dependencycheck.data.nvdcve -
    - - org.owasp.dependencycheck.data.nvdcve - - - Contains classes used to work with the NVD CVE data.
    +
    Contains classes used to work with the NVD CVE data.
    org.owasp.dependencycheck.data.update -
    - - org.owasp.dependencycheck.data.update - -
    +
    Contains classes used to update the data stores.

    + + The UpdateService will load, any correctly defined CachedWebDataSource(s) and call update() on them.
    org.owasp.dependencycheck.data.update.exception -
    - - org.owasp.dependencycheck.data.update.exception - -
    +
    A collection of exception classes used within the application.
    org.owasp.dependencycheck.data.update.task -
    - - org.owasp.dependencycheck.data.update.task - -
    +
    A collection of callable/runnable tasks used to speed up the update process.
    org.owasp.dependencycheck.data.update.xml -
    - - org.owasp.dependencycheck.data.nvdcve.xml - -
    +
    Contains classes used to parse the NVD CVE XML file.

    + + The basic use is that the Importer is called to import an NVD CVE file.
    org.owasp.dependencycheck.dependency -
    - - org.owasp.dependencycheck.dependency - - - Contains the core Dependency implementation.
    +
    Contains the core Dependency implementation.
    org.owasp.dependencycheck.exception -
    - - org.owasp.dependencycheck.exception - -
    +
    A collection of exception classes used within the application.
    org.owasp.dependencycheck.jaxb.pom -
    - - org.owasp.dependencycheck.analyzer.pom - - - This package contains utility classes used to parse pom.xml files.
    -
    org.owasp.dependencycheck.jaxb.pom.generated 
    org.owasp.dependencycheck.reporting -
    - - org.owasp.dependencycheck.reporting - - - Contains classes used to generate reports.
    +
    Contains classes used to generate reports.
    org.owasp.dependencycheck.suppression -
    - - org.owasp.dependencycheck.suppression - - - Contains classes used to suppress findings.
    +
    Contains classes used to suppress findings.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    +
    Includes various utility classes such as a Settings wrapper, a Checksum utility, etc.
    +
    org.owasp.dependencycheck.xml.pom +
    This package contains classes used to parse pom.xml files.
    Warnings Warnings Errors Errors
    232198 0 06
    +28

    Details

    @@ -257,23 +257,66 @@ Line Errors -Total number of methods is 70 (max allowed is 40). -60
    +Total number of methods is 72 (max allowed is 40). +60 + +Errors +Expected an @return tag. +971

    org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java

    + + + + + + + + + + + +
    ViolationMessageLine
    ErrorsInner assignments should be avoided.124
    ErrorsMust have at least one statement.239
    +
    +

    org/owasp/dependencycheck/analyzer/JarAnalyzer.java

    + - - + + - -
    Violation Message Line
    ErrorsInner assignments should be avoided.124
    Unused import - java.io.FileInputStream.22
    ErrorsMust have at least one statement.239
    +Unused import - java.io.FileNotFoundException. +23 + +Errors +Unused import - java.io.UnsupportedEncodingException. +30 + +Errors +Unused import - javax.xml.transform.sax.SAXSource. +49 + +Errors +Unused import - org.owasp.dependencycheck.utils.NonClosingStream. +60 + +Errors +Unused import - org.owasp.dependencycheck.xml.pom.PomParser. +62 + +Errors +Unused import - org.xml.sax.InputSource. +63 + +Errors +Variable 'model' should be declared final. +423

    org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java

    @@ -290,6 +333,17 @@
    Variable 'sb' should be declared final. 116
    +

    org/owasp/dependencycheck/data/nexus/NexusSearch.java

    + + + + + + + + +
    ViolationMessageLine
    ErrorsVariable 'url' should be declared final.173
    +

    org/owasp/dependencycheck/dependency/Dependency.java

    @@ -299,7 +353,90 @@ -
    Errors Total number of methods is 56 (max allowed is 40).43
    +43 +
    +

    org/owasp/dependencycheck/xml/pom/License.java

    + + + + + + + + + + + + + + + + + + + + +
    ViolationMessageLine
    ErrorsLine does not match expected header line of '^ \* This file is part of dependency-check-(ant|core|cli|maven)\.\s*$'.2
    ErrorsMissing a Javadoc comment.24
    ErrorsExpected @param tag for 'name'.33
    ErrorsExpected @param tag for 'url'.33
    +
    +

    org/owasp/dependencycheck/xml/pom/PomHandler.java

    + + + + + + + + + + + + +
    ViolationMessageLine
    ErrorsMust have at least one statement.158
    ErrorsMust have at least one statement.169
    +
    +

    org/owasp/dependencycheck/xml/pom/PomParseException.java

    + + + + + + + + +
    ViolationMessageLine
    ErrorsUsing the '.*' form of import should be avoided - org.owasp.dependencycheck.suppression.*.20
    +
    +

    org/owasp/dependencycheck/xml/pom/PomParser.java

    + + + + + + + + + + + + + + + + + + + + +
    ViolationMessageLine
    ErrorsUnused import - java.util.List.27
    ErrorsUnable to get class information for @throws tag 'SuppressionParseException'.80
    ErrorsUnused @throws tag for 'SuppressionParseException'.80
    ErrorsExpected @throws tag for 'PomParseException'.82
    +
    +

    org/owasp/dependencycheck/xml/pom/PomUtils.java

    + + + + + + + + +
    ViolationMessageLine
    ErrorsVariable 'parser' should be declared final.58
    diff --git a/dependency-check-core/checkstyle.rss b/dependency-check-core/checkstyle.rss index ef3021819..b31c62c1f 100644 --- a/dependency-check-core/checkstyle.rss +++ b/dependency-check-core/checkstyle.rss @@ -25,8 +25,8 @@ under the License. en-us ©2012 - 2015 OWASP - File: 232, - Errors: 6, + <title>File: 198, + Errors: 28, Warnings: 0, Infos: 0 @@ -83,7 +83,7 @@ under the License. 0 - 0 + 1 @@ -113,6 +113,20 @@ under the License. 0 + + + + org/owasp/dependencycheck/xml/pom/License.java + + + 0 + + + 0 + + + 4 + @@ -155,20 +169,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Dependency.java - - - 0 - - - 0 - - - 0 - @@ -183,20 +183,6 @@ under the License. 1 - - - - org/owasp/dependencycheck/jaxb/pom/generated/IssueManagement.java - - - 0 - - - 0 - - - 0 - @@ -295,20 +281,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Parent.java - - - 0 - - - 0 - - - 0 - @@ -337,20 +309,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/RepositoryPolicy.java - - - 0 - - - 0 - - - 0 - @@ -407,34 +365,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Exclusion.java - - - 0 - - - 0 - - - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/generated/Build.java - - - 0 - - - 0 - - - 0 - @@ -449,20 +379,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Relocation.java - - - 0 - - - 0 - - - 0 - @@ -480,7 +396,7 @@ under the License. - org/owasp/dependencycheck/jaxb/pom/generated/Developer.java + org/owasp/dependencycheck/xml/pom/PomParser.java 0 @@ -489,7 +405,7 @@ under the License. 0 - 0 + 4 @@ -508,7 +424,7 @@ under the License. - org/owasp/dependencycheck/jaxb/pom/generated/Notifier.java + org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java 0 @@ -533,20 +449,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java - - - 0 - - - 0 - - - 0 - @@ -603,6 +505,20 @@ under the License. 0 + + + + org/owasp/dependencycheck/xml/pom/PomParseException.java + + + 0 + + + 0 + + + 1 + @@ -645,20 +561,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/CiManagement.java - - - 0 - - - 0 - - - 0 - @@ -785,20 +687,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Reporting.java - - - 0 - - - 0 - - - 0 - @@ -911,20 +799,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Prerequisites.java - - - 0 - - - 0 - - - 0 - @@ -995,20 +869,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/PluginManagement.java - - - 0 - - - 0 - - - 0 - @@ -1107,20 +967,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/PomUtils.java - - - 0 - - - 0 - - - 0 - @@ -1163,6 +1009,20 @@ under the License. 0 + + + + org/owasp/dependencycheck/xml/pom/PomUtils.java + + + 0 + + + 0 + + + 1 + @@ -1233,34 +1093,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Profile.java - - - 0 - - - 0 - - - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/generated/ActivationFile.java - - - 0 - - - 0 - - - 0 - @@ -1275,34 +1107,6 @@ under the License. 0 - - - - dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_de.properties - - - 0 - - - 0 - - - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/generated/Organization.java - - - 0 - - - 0 - - - 0 - @@ -1317,6 +1121,20 @@ under the License. 0 + + + + dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_de.properties + + + 0 + + + 0 + + + 0 + @@ -1446,7 +1264,7 @@ under the License. - dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_da.properties + org/owasp/dependencycheck/exception/NoDataException.java 0 @@ -1460,7 +1278,7 @@ under the License. - org/owasp/dependencycheck/exception/NoDataException.java + dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_da.properties 0 @@ -1502,7 +1320,7 @@ under the License. - org/owasp/dependencycheck/jaxb/pom/generated/DistributionManagement.java + org/owasp/dependencycheck/xml/pom/PomHandler.java 0 @@ -1511,7 +1329,7 @@ under the License. 0 - 0 + 2 @@ -1555,34 +1373,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/MailingList.java - - - 0 - - - 0 - - - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/package-info.java - - - 0 - - - 0 - - - 0 - @@ -1667,20 +1457,6 @@ under the License. 0 - - - - dependency-check-maven/target/classes/log.properties - - - 0 - - - 0 - - - 0 - @@ -1712,7 +1488,7 @@ under the License. - dependency-check-maven/target/generated-classes/cobertura/mojo.properties + dependency-check-maven/target/classes/log.properties 0 @@ -1737,6 +1513,20 @@ under the License. 0 + + + + dependency-check-maven/target/generated-classes/cobertura/mojo.properties + + + 0 + + + 0 + + + 0 + @@ -1749,21 +1539,7 @@ under the License. 0 - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/generated/Plugin.java - - - 0 - - - 0 - - - 0 + 8 @@ -1779,34 +1555,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/BuildBase.java - - - 0 - - - 0 - - - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/generated/PluginExecution.java - - - 0 - - - 0 - - - 0 - @@ -1936,7 +1684,7 @@ under the License. - org/owasp/dependencycheck/jaxb/pom/generated/ActivationProperty.java + org/owasp/dependencycheck/xml/pom/Model.java 0 @@ -1975,20 +1723,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Model.java - - - 0 - - - 0 - - - 0 - @@ -2059,20 +1793,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Site.java - - - 0 - - - 0 - - - 0 - @@ -2087,20 +1807,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/package-info.java - - - 0 - - - 0 - - - 0 - @@ -2115,20 +1821,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/ReportSet.java - - - 0 - - - 0 - - - 0 - @@ -2185,20 +1877,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/ObjectFactory.java - - - 0 - - - 0 - - - 0 - @@ -2241,20 +1919,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Repository.java - - - 0 - - - 0 - - - 0 - @@ -2325,20 +1989,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/DeploymentRepository.java - - - 0 - - - 0 - - - 0 - @@ -2370,7 +2020,7 @@ under the License. - dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_tr.properties + org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java 0 @@ -2384,7 +2034,7 @@ under the License. - org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java + dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_tr.properties 0 @@ -2437,20 +2087,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Contributor.java - - - 0 - - - 0 - - - 0 - @@ -2507,20 +2143,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Scm.java - - - 0 - - - 0 - - - 0 - @@ -2535,20 +2157,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/ActivationOS.java - - - 0 - - - 0 - - - 0 - @@ -2605,6 +2213,20 @@ under the License. 0 + + + + org/owasp/dependencycheck/xml/pom/package-info.java + + + 0 + + + 0 + + + 0 + @@ -2706,7 +2328,7 @@ under the License. - dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_fr.properties + org/owasp/dependencycheck/suppression/SuppressionRule.java 0 @@ -2720,7 +2342,7 @@ under the License. - org/owasp/dependencycheck/suppression/SuppressionRule.java + dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_fr.properties 0 @@ -2773,20 +2395,6 @@ under the License. 0 - - - - dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_cs.properties - - - 0 - - - 0 - - - 0 - @@ -2804,21 +2412,7 @@ under the License. - org/owasp/dependencycheck/jaxb/pom/generated/DependencyManagement.java - - - 0 - - - 0 - - - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/generated/ReportPlugin.java + dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_cs.properties 0 @@ -2871,20 +2465,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/Extension.java - - - 0 - - - 0 - - - 0 - @@ -2955,20 +2535,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/generated/License.java - - - 0 - - - 0 - - - 0 - @@ -3025,20 +2591,6 @@ under the License. 0 - - - - org/owasp/dependencycheck/jaxb/pom/MavenNamespaceFilter.java - - - 0 - - - 0 - - - 0 - @@ -3079,7 +2631,7 @@ under the License. 0 - 1 + 2 @@ -3221,20 +2773,6 @@ under the License. 0 - - - - dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_no.properties - - - 0 - - - 0 - - - 0 - @@ -3252,21 +2790,7 @@ under the License. - org/owasp/dependencycheck/jaxb/pom/generated/Resource.java - - - 0 - - - 0 - - - 0 - - - - - org/owasp/dependencycheck/jaxb/pom/generated/Activation.java + dependency-check-maven/target/maven-plugin-plugin-sources/org.apache.maven.plugins/maven-site-plugin/3.4/sources/site-plugin_no.properties 0 diff --git a/dependency-check-core/cobertura/frame-packages.html b/dependency-check-core/cobertura/frame-packages.html index 7b1496335..4b41888c1 100644 --- a/dependency-check-core/cobertura/frame-packages.html +++ b/dependency-check-core/cobertura/frame-packages.html @@ -64,12 +64,6 @@ org.owasp.dependencycheck.exception -org.owasp.dependencycheck.jaxb.pom - - -org.owasp.dependencycheck.jaxb.pom.generated - - org.owasp.dependencycheck.reporting @@ -78,6 +72,9 @@ org.owasp.dependencycheck.utils + +org.owasp.dependencycheck.xml.pom + 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 7ee707e77..457bf785b 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 @@ -42,7 +42,7 @@ org.owasp.dependencycheck.analyzer CPEAnalyzer (73%) -CentralAnalyzer (26%) +CentralAnalyzer (25%) CpeSuppressionAnalyzer (90%) @@ -63,13 +63,13 @@ org.owasp.dependencycheck.analyzer HintAnalyzer (78%) -JarAnalyzer (59%) +JarAnalyzer (63%) JavaScriptAnalyzer (29%) -NexusAnalyzer (20%) +NexusAnalyzer (18%) NuspecAnalyzer (22%) 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 8e93bc145..8a33cb245 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 @@ -21,7 +21,7 @@ org.owasp.dependencycheck.dependency Dependency (58%) -Evidence (60%) +Evidence (65%) EvidenceCollection (73%) 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 847d73701..a5ca6471d 100644 --- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.utils.html +++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.utils.html @@ -33,7 +33,7 @@ org.owasp.dependencycheck.utils Filter (92%) -NonClosingStream (100%) +NonClosingStream (0%) Pair (42%) diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.xml.pom.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.xml.pom.html new file mode 100644 index 000000000..f3be1c877 --- /dev/null +++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.xml.pom.html @@ -0,0 +1,38 @@ + + + + +Coverage Report Classes + + + +
    +org.owasp.dependencycheck.xml.pom +
    +
     
    +
    Classes
    + + + + + + + + + + + + + + + + + + + + + +
    License (0%)
    Model (87%)
    PomHandler (77%)
    PomParseException (0%)
    PomParser (50%)
    PomUtils (14%)
    + + diff --git a/dependency-check-core/cobertura/frame-sourcefiles.html b/dependency-check-core/cobertura/frame-sourcefiles.html index 4fec32827..2add37856 100644 --- a/dependency-check-core/cobertura/frame-sourcefiles.html +++ b/dependency-check-core/cobertura/frame-sourcefiles.html @@ -27,18 +27,6 @@ All Packages AbstractTokenizingFilter (100%) -Activation (6%) - - -ActivationFile (0%) - - -ActivationOS (0%) - - -ActivationProperty (14%) - - AlphaNumericTokenizer (60%) @@ -63,36 +51,24 @@ All Packages AssemblyAnalyzer (67%) -Build (4%) - - -BuildBase (7%) - - CPEAnalyzer (73%) CachedWebDataSource (N/A) -CentralAnalyzer (26%) +CentralAnalyzer (25%) CentralSearch (83%) -CiManagement (0%) - - Confidence (100%) ConnectionFactory (42%) -Contributor (0%) - - CorruptDatabaseException (0%) @@ -126,18 +102,12 @@ All Packages Dependency (58%) -Dependency (9%) - - DependencyBundlingAnalyzer (41%) DependencyCheckScanAgent (0%) -DependencyManagement (0%) - - DependencySimilarity (0%) @@ -147,15 +117,6 @@ All Packages DependencyVersionUtil (88%) -DeploymentRepository (0%) - - -Developer (0%) - - -DistributionManagement (0%) - - DownloadTask (52%) @@ -177,18 +138,12 @@ All Packages EscapeTool (0%) -Evidence (60%) +Evidence (65%) EvidenceCollection (73%) -Exclusion (14%) - - -Extension (0%) - - ExtractionUtil (0%) @@ -225,34 +180,25 @@ All Packages InvalidDataException (0%) -IssueManagement (0%) - - -JarAnalyzer (59%) +JarAnalyzer (63%) JavaScriptAnalyzer (29%) -License (0%) +License (0%) LuceneUtils (88%) -MailingList (0%) - - MavenArtifact (52%) -MavenNamespaceFilter (15%) +Model (87%) -Model (8%) - - -NexusAnalyzer (20%) +NexusAnalyzer (18%) NexusSearch (0%) @@ -261,10 +207,7 @@ All Packages NoDataException (0%) -NonClosingStream (100%) - - -Notifier (0%) +NonClosingStream (0%) NugetPackage (58%) @@ -294,81 +237,39 @@ All Packages NvdCveUpdater (0%) -ObjectFactory (0%) - - -Organization (0%) - - Pair (42%) -Parent (30%) +PomHandler (77%) -Plugin (8%) +PomParseException (0%) -PluginExecution (16%) +PomParser (50%) -PluginManagement (0%) - - -PomUtils (15%) - - -Prerequisites (0%) +PomUtils (14%) ProcessTask (0%) -Profile (4%) - - PropertyType (70%) Reference (38%) -Relocation (0%) - - ReportGenerator (0%) -ReportPlugin (10%) - - -ReportSet (0%) - - -Reporting (20%) - - -Repository (0%) - - -RepositoryPolicy (0%) - - -Resource (0%) - - ScanAgentException (0%) -Scm (7%) - - SearchFieldAnalyzer (100%) -Site (0%) - - StandardUpdate (0%) @@ -422,9 +323,6 @@ All Packages XPathNuspecParser (94%) - -package-info (N/A) - 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 f5812a606..d37783c65 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 @@ - +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.agent1
    0%
    0/240
    0%
    0/110
    1.857
    org.owasp.dependencycheck.agent1
    0%
    0/245
    0%
    0/112
    1.847
    - + 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 bebf6edc2..d043cf23d 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.exception.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.exception.html @@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.html index 3ed602ef7..03e4cae13 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 @@ - +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.analyzer25
    54%
    1059/1927
    41%
    484/1156
    5.038
    org.owasp.dependencycheck.analyzer25
    55%
    1050/1878
    42%
    485/1152
    4.984
    org.owasp.dependencycheck.analyzer.exception2
    12%
    2/16
    N/A
    1
    @@ -49,7 +49,7 @@ packageTable.sort(0); CPEAnalyzer$IdentifierConfidence
    100%
    4/4
    N/A
    4.593 CPEAnalyzer$IdentifierMatch
    38%
    15/39
    16%
    4/24
    4.593 - CentralAnalyzer
    26%
    18/69
    13%
    4/30
    3.625 + CentralAnalyzer
    25%
    17/68
    13%
    4/30
    3.625 CpeSuppressionAnalyzer
    90%
    9/10
    66%
    4/6
    2.333 @@ -63,12 +63,12 @@ packageTable.sort(0); HintAnalyzer
    78%
    26/33
    54%
    12/22
    4.667 - JarAnalyzer
    58%
    321/549
    50%
    171/342
    7.394 - JarAnalyzer$ClassNameInformation
    80%
    17/21
    80%
    8/10
    7.394 + JarAnalyzer
    62%
    314/502
    50%
    172/338
    7.156 + JarAnalyzer$ClassNameInformation
    80%
    17/21
    80%
    8/10
    7.156 JavaScriptAnalyzer
    29%
    8/27
    0%
    0/4
    2 - NexusAnalyzer
    20%
    14/70
    4%
    1/24
    3.375 + NexusAnalyzer
    18%
    13/69
    4%
    1/24
    3.375 NuspecAnalyzer
    22%
    8/35
    0%
    0/6
    2.667 @@ -83,6 +83,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html index 3499e0888..cfbb53dd7 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html @@ -37,6 +37,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html index fbee826c0..53ecf148f 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html @@ -43,6 +43,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html index 3e399d830..553e38350 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html @@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html index 245eaa4f7..8f965959b 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 @@ -51,6 +51,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html index 49d45bad5..5de31451f 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 @@ - +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.data.nexus2
    21%
    20/95
    7%
    2/28
    2.389
    org.owasp.dependencycheck.data.nexus2
    20%
    20/97
    7%
    2/28
    2.389
    - + 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 250310a96..e3efbaed6 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nuget.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nuget.html @@ -43,6 +43,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html index ff9f59652..982ef79e2 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 @@ -52,6 +52,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html index 447f76890..393c899cb 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html @@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html index 2dac6ef53..8f39fd7f9 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 @@ -52,6 +52,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.task.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.task.html index 1ee0ba837..67549c4aa 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 @@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html index 9cf42440c..5b4f72dd0 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html @@ -41,6 +41,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html index 82d08a178..a71494aa3 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 @@ - +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.dependency14
    61%
    402/654
    37%
    170/454
    2.497
    org.owasp.dependencycheck.dependency14
    62%
    407/655
    39%
    179/454
    2.489
    - + 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 e9b4eed26..e19e89027 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.exception.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.exception.html @@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html index 05290bef0..0924f6063 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html @@ -17,27 +17,26 @@ Package # Classes Line Coverage Branch Coverage Complexity org.owasp.dependencycheck1
    52%
    112/212
    55%
    39/70
    3.25 - org.owasp.dependencycheck.agent1
    0%
    0/240
    0%
    0/110
    1.857 - org.owasp.dependencycheck.analyzer25
    54%
    1059/1927
    41%
    484/1156
    5.038 + org.owasp.dependencycheck.agent1
    0%
    0/245
    0%
    0/112
    1.847 + org.owasp.dependencycheck.analyzer25
    55%
    1050/1878
    42%
    485/1152
    4.984 org.owasp.dependencycheck.analyzer.exception2
    12%
    2/16
    N/A
    1 org.owasp.dependencycheck.data.central1
    83%
    46/55
    85%
    17/20
    9 org.owasp.dependencycheck.data.cpe4
    65%
    95/144
    37%
    21/56
    2.452 org.owasp.dependencycheck.data.cwe2
    39%
    13/33
    25%
    2/8
    2.8 org.owasp.dependencycheck.data.lucene8
    90%
    98/108
    92%
    35/38
    2.696 - org.owasp.dependencycheck.data.nexus2
    21%
    20/95
    7%
    2/28
    2.389 + org.owasp.dependencycheck.data.nexus2
    20%
    20/97
    7%
    2/28
    2.389 org.owasp.dependencycheck.data.nuget4
    70%
    41/58
    15%
    6/40
    2.238 org.owasp.dependencycheck.data.nvdcve9
    42%
    294/698
    45%
    89/196
    3.951 org.owasp.dependencycheck.data.update7
    28%
    82/285
    20%
    17/84
    2.925 org.owasp.dependencycheck.data.update.exception2
    0%
    0/12
    N/A
    1 org.owasp.dependencycheck.data.update.task2
    34%
    51/150
    22%
    10/44
    3.556 org.owasp.dependencycheck.data.update.xml4
    85%
    172/202
    88%
    101/114
    2.914 - org.owasp.dependencycheck.dependency14
    61%
    402/654
    37%
    170/454
    2.497 + org.owasp.dependencycheck.dependency14
    62%
    407/655
    39%
    179/454
    2.489 org.owasp.dependencycheck.exception2
    0%
    0/16
    N/A
    1 - org.owasp.dependencycheck.jaxb.pom2
    15%
    18/117
    0%
    0/82
    8.25 - org.owasp.dependencycheck.jaxb.pom.generated87
    4%
    46/945
    0%
    0/98
    1.091 org.owasp.dependencycheck.reporting4
    0%
    0/138
    0%
    0/70
    4.25 org.owasp.dependencycheck.suppression6
    72%
    222/307
    62%
    112/178
    3.073 - org.owasp.dependencycheck.utils11
    61%
    173/281
    58%
    86/148
    3.556 + org.owasp.dependencycheck.utils11
    60%
    170/281
    58%
    86/148
    3.556 + org.owasp.dependencycheck.xml.pom6
    41%
    94/227
    20%
    25/120
    3.125 - + 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 90ffb22b6..8c4725c1e 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 @@ -42,6 +42,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html index 120429604..ba5e6b8b8 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html @@ -47,6 +47,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html index fe5f05479..76bf22eee 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 @@ - +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.utils11
    61%
    173/281
    58%
    86/148
    3.556
    org.owasp.dependencycheck.utils11
    60%
    170/281
    58%
    86/148
    3.556
    - + diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.xml.pom.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.xml.pom.html new file mode 100644 index 000000000..c7cad2ae7 --- /dev/null +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.xml.pom.html @@ -0,0 +1,52 @@ + + + + +Coverage Report + + + + + + + +
    Coverage Report - org.owasp.dependencycheck.xml.pom
    +
     
    + + + + + +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.xml.pom6
    41%
    94/227
    20%
    25/120
    3.125
    + +
     
    + + + + + + + + + + + + + + + + +
    Classes in this Package Line Coverage Branch Coverage Complexity
    License
    0%
    0/12
    N/A
    1
    Model
    87%
    28/32
    N/A
    1
    PomHandler
    77%
    35/45
    60%
    23/38
    5.75
    PomParseException
    0%
    0/8
    N/A
    1
    PomParser
    50%
    17/34
    50%
    1/2
    8
    PomUtils
    14%
    14/96
    1%
    1/80
    14
    + + + + diff --git a/dependency-check-core/cobertura/frame-summary.html b/dependency-check-core/cobertura/frame-summary.html index 253a971be..6d69a5aef 100644 --- a/dependency-check-core/cobertura/frame-summary.html +++ b/dependency-check-core/cobertura/frame-summary.html @@ -16,29 +16,28 @@ - + - - + + - + - + - - - + +
    Package # Classes Line Coverage Branch Coverage Complexity
    All Packages200
    44%
    2946/6693
    39%
    1191/2994
    2.464
    All Packages117
    51%
    2969/5817
    41%
    1226/2932
    3.251
    org.owasp.dependencycheck1
    52%
    112/212
    55%
    39/70
    3.25
    org.owasp.dependencycheck.agent1
    0%
    0/240
    0%
    0/110
    1.857
    org.owasp.dependencycheck.analyzer25
    54%
    1059/1927
    41%
    484/1156
    5.038
    org.owasp.dependencycheck.agent1
    0%
    0/245
    0%
    0/112
    1.847
    org.owasp.dependencycheck.analyzer25
    55%
    1050/1878
    42%
    485/1152
    4.984
    org.owasp.dependencycheck.analyzer.exception2
    12%
    2/16
    N/A
    1
    org.owasp.dependencycheck.data.central1
    83%
    46/55
    85%
    17/20
    9
    org.owasp.dependencycheck.data.cpe4
    65%
    95/144
    37%
    21/56
    2.452
    org.owasp.dependencycheck.data.cwe2
    39%
    13/33
    25%
    2/8
    2.8
    org.owasp.dependencycheck.data.lucene8
    90%
    98/108
    92%
    35/38
    2.696
    org.owasp.dependencycheck.data.nexus2
    21%
    20/95
    7%
    2/28
    2.389
    org.owasp.dependencycheck.data.nexus2
    20%
    20/97
    7%
    2/28
    2.389
    org.owasp.dependencycheck.data.nuget4
    70%
    41/58
    15%
    6/40
    2.238
    org.owasp.dependencycheck.data.nvdcve9
    42%
    294/698
    45%
    89/196
    3.951
    org.owasp.dependencycheck.data.update7
    28%
    82/285
    20%
    17/84
    2.925
    org.owasp.dependencycheck.data.update.exception2
    0%
    0/12
    N/A
    1
    org.owasp.dependencycheck.data.update.task2
    34%
    51/150
    22%
    10/44
    3.556
    org.owasp.dependencycheck.data.update.xml4
    85%
    172/202
    88%
    101/114
    2.914
    org.owasp.dependencycheck.dependency14
    61%
    402/654
    37%
    170/454
    2.497
    org.owasp.dependencycheck.dependency14
    62%
    407/655
    39%
    179/454
    2.489
    org.owasp.dependencycheck.exception2
    0%
    0/16
    N/A
    1
    org.owasp.dependencycheck.jaxb.pom2
    15%
    18/117
    0%
    0/82
    8.25
    org.owasp.dependencycheck.jaxb.pom.generated87
    4%
    46/945
    0%
    0/98
    1.091
    org.owasp.dependencycheck.reporting4
    0%
    0/138
    0%
    0/70
    4.25
    org.owasp.dependencycheck.suppression6
    72%
    222/307
    62%
    112/178
    3.073
    org.owasp.dependencycheck.utils11
    61%
    173/281
    58%
    86/148
    3.556
    org.owasp.dependencycheck.utils11
    60%
    170/281
    58%
    86/148
    3.556
    org.owasp.dependencycheck.xml.pom6
    41%
    94/227
    20%
    25/120
    3.125
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html index 45e999962..41d0808e9 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html @@ -110,801 +110,799 @@  46  
     /**
     47   -
      * Scans files, directories, etc. for Dependencies. Analyzers are loaded and used to process the files found by the
    +
      * Scans files, directories, etc. for Dependencies. Analyzers are loaded and used to process the files found by the scan, if a
     48   -
      * scan, if a file is encountered and an Analyzer is associated with the file type then the file is turned into a
    +
      * file is encountered and an Analyzer is associated with the file type then the file is turned into a dependency.
     49   -
      * dependency.
    -  50  
      *
    +  50   +
      * @author Jeremy Long
     51   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    -  52  
      */
    -  53   +  52  
     public class Engine {
    +  53   +
     
     54   -
     
    +
         /**
     55   -
         /**
    -  56  
          * The list of dependencies.
    -  57   +  56  
          */
    -  58  1
         private List<Dependency> dependencies = new ArrayList<Dependency>();
    +  57  1
         private List<Dependency> dependencies = new ArrayList<Dependency>();
    +  58   +
         /**
     59   -
         /**
    +
          * A Map of analyzers grouped by Analysis phase.
     60   -
          * A Map of analyzers grouped by Analysis phase.
    -  61  
          */
    -  62  1
         private EnumMap<AnalysisPhase, List<Analyzer>> analyzers = new EnumMap<AnalysisPhase, List<Analyzer>>(AnalysisPhase.class);
    +  61  1
         private EnumMap<AnalysisPhase, List<Analyzer>> analyzers = new EnumMap<AnalysisPhase, List<Analyzer>>(AnalysisPhase.class);
    +  62   +
     
     63   -
     
    +
         /**
     64   -
         /**
    -  65  
          * A Map of analyzers grouped by Analysis phase.
    -  66   +  65  
          */
    -  67  1
         private Set<FileTypeAnalyzer> fileTypeAnalyzers = new HashSet<FileTypeAnalyzer>();
    +  66  1
         private Set<FileTypeAnalyzer> fileTypeAnalyzers = new HashSet<FileTypeAnalyzer>();
    +  67   +
     
     68   -
     
    +
         /**
     69   -
         /**
    -  70  
          * The ClassLoader to use when dynamically loading Analyzer and Update services.
    -  71   +  70  
          */
    -  72  1
         private ClassLoader serviceClassLoader = Thread.currentThread().getContextClassLoader();
    +  71  1
         private ClassLoader serviceClassLoader = Thread.currentThread().getContextClassLoader();
    +  72   +
         /**
     73   -
         /**
    -  74  
          * The Logger for use throughout the class.
    -  75   +  74  
          */
    -  76  1
         private static final Logger LOGGER = Logger.getLogger(Engine.class.getName());
    +  75  1
         private static final Logger LOGGER = Logger.getLogger(Engine.class.getName());
    +  76   +
     
     77   -
     
    +
         /**
     78   -
         /**
    +
          * Creates a new Engine.
     79   -
          * Creates a new Engine.
    +
          *
     80   -
          *
    +
          * @throws DatabaseException thrown if there is an error connecting to the database
     81   -
          * @throws DatabaseException thrown if there is an error connecting to the database
    -  82  
          */
    -  83  1
         public Engine() throws DatabaseException {
    -  84  1
             initializeEngine();
    -  85  1
         }
    +  82  1
         public Engine() throws DatabaseException {
    +  83  1
             initializeEngine();
    +  84  1
         }
    +  85   +
     
     86   -
     
    +
         /**
     87   -
         /**
    -  88  
          * Creates a new Engine.
    +  88   +
          *
     89   -
          *
    -  90  
          * @param serviceClassLoader a reference the class loader being used
    +  90   +
          * @throws DatabaseException thrown if there is an error connecting to the database
     91   -
          * @throws DatabaseException thrown if there is an error connecting to the database
    -  92  
          */
    -  93  0
         public Engine(ClassLoader serviceClassLoader) throws DatabaseException {
    -  94  0
             this.serviceClassLoader = serviceClassLoader;
    -  95  0
             initializeEngine();
    -  96  0
         }
    +  92  0
         public Engine(ClassLoader serviceClassLoader) throws DatabaseException {
    +  93  0
             this.serviceClassLoader = serviceClassLoader;
    +  94  0
             initializeEngine();
    +  95  0
         }
    +  96   +
     
     97   -
     
    +
         /**
     98   -
         /**
    -  99  
          * Creates a new Engine using the specified classloader to dynamically load Analyzer and Update services.
    +  99   +
          *
     100   -
          *
    -  101  
          * @throws DatabaseException thrown if there is an error connecting to the database
    +  101   +
          */
     102   -
          */
    -  103  
         protected final void initializeEngine() throws DatabaseException {
    -  104  1
             ConnectionFactory.initialize();
    -  105  1
             loadAnalyzers();
    -  106  1
         }
    +  103  1
             ConnectionFactory.initialize();
    +  104  1
             loadAnalyzers();
    +  105  1
         }
    +  106   +
     
     107   -
     
    +
         /**
     108   -
         /**
    -  109  
          * Properly cleans up resources allocated during analysis.
    +  109   +
          */
     110   -
          */
    -  111  
         public void cleanup() {
    -  112  0
             ConnectionFactory.cleanup();
    -  113  0
         }
    +  111  0
             ConnectionFactory.cleanup();
    +  112  0
         }
    +  113   +
     
     114   -
     
    +
         /**
     115   -
         /**
    -  116  
          * Loads the analyzers specified in the configuration file (or system properties).
    +  116   +
          */
     117   -
          */
    -  118  
         private void loadAnalyzers() {
    -  119  1
             if (!analyzers.isEmpty()) {
    -  120  0
                 return;
    -  121   +  118  1
             if (!analyzers.isEmpty()) {
    +  119  0
                 return;
    +  120   +
             }
    +  121  10
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    +  122  9
                 analyzers.put(phase, new ArrayList<Analyzer>());
    +  123  
             }
    -  122  10
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    -  123  9
                 analyzers.put(phase, new ArrayList<Analyzer>());
     124   -
             }
    -  125  
     
    -  126  1
             final AnalyzerService service = new AnalyzerService(serviceClassLoader);
    -  127  1
             final Iterator<Analyzer> iterator = service.getAnalyzers();
    -  128  15
             while (iterator.hasNext()) {
    -  129  14
                 final Analyzer a = iterator.next();
    -  130  14
                 analyzers.get(a.getAnalysisPhase()).add(a);
    -  131  14
                 if (a instanceof FileTypeAnalyzer) {
    -  132  6
                     this.fileTypeAnalyzers.add((FileTypeAnalyzer) a);
    -  133   +  125  1
             final AnalyzerService service = new AnalyzerService(serviceClassLoader);
    +  126  1
             final Iterator<Analyzer> iterator = service.getAnalyzers();
    +  127  15
             while (iterator.hasNext()) {
    +  128  14
                 final Analyzer a = iterator.next();
    +  129  14
                 analyzers.get(a.getAnalysisPhase()).add(a);
    +  130  14
                 if (a instanceof FileTypeAnalyzer) {
    +  131  6
                     this.fileTypeAnalyzers.add((FileTypeAnalyzer) a);
    +  132  
                 }
    -  134  14
             }
    -  135  1
         }
    +  133  14
             }
    +  134  1
         }
    +  135   +
     
     136   -
     
    +
         /**
     137   -
         /**
    -  138  
          * Get the List of the analyzers for a specific phase of analysis.
    +  138   +
          *
     139   -
          *
    -  140  
          * @param phase the phase to get the configured analyzers.
    -  141   +  140  
          * @return the analyzers loaded
    +  141   +
          */
     142   -
          */
    -  143  
         public List<Analyzer> getAnalyzers(AnalysisPhase phase) {
    -  144  0
             return analyzers.get(phase);
    +  143  0
             return analyzers.get(phase);
    +  144   +
         }
     145   -
         }
    +
     
     146   -
     
    +
         /**
     147   -
         /**
    -  148  
          * Get the dependencies identified.
    +  148   +
          *
     149   -
          *
    -  150  
          * @return the dependencies identified
    +  150   +
          */
     151   -
          */
    -  152  
         public List<Dependency> getDependencies() {
    -  153  10
             return dependencies;
    +  152  10
             return dependencies;
    +  153   +
         }
     154   -
         }
    +
     
     155   -
     
    +
         /**
     156   -
         /**
    -  157  
          * Sets the dependencies.
    +  157   +
          *
     158   -
          *
    -  159  
          * @param dependencies the dependencies
    +  159   +
          */
     160   -
          */
    -  161  
         public void setDependencies(List<Dependency> dependencies) {
    -  162  0
             this.dependencies = dependencies;
    -  163  0
         }
    +  161  0
             this.dependencies = dependencies;
    +  162  0
         }
    +  163   +
     
     164   -
     
    +
         /**
     165   -
         /**
    +
          * Scans an array of files or directories. If a directory is specified, it will be scanned recursively. Any dependencies
     166   -
          * Scans an array of files or directories. If a directory is specified, it will be scanned recursively. Any
    +
          * identified are added to the dependency collection.
     167   -
          * dependencies identified are added to the dependency collection.
    +
          *
     168   -
          *
    -  169  
          * @param paths an array of paths to files or directories to be analyzed
    +  169   +
          * @return the list of dependencies scanned
     170   -
          * @return the list of dependencies scanned
    +
          *
     171   -
          *
    +
          * @since v0.3.2.5
     172   -
          * @since v0.3.2.5
    +
          */
     173   -
          */
    -  174  
         public List<Dependency> scan(String[] paths) {
    -  175  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    -  176  0
             for (String path : paths) {
    -  177  0
                 final File file = new File(path);
    -  178  0
                 final List<Dependency> d = scan(file);
    -  179  0
                 if (d != null) {
    -  180  0
                     deps.addAll(d);
    +  174  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    +  175  0
             for (String path : paths) {
    +  176  0
                 final File file = new File(path);
    +  177  0
                 final List<Dependency> d = scan(file);
    +  178  0
                 if (d != null) {
    +  179  0
                     deps.addAll(d);
    +  180   +
                 }
     181   -
                 }
    -  182  
             }
    -  183  0
             return deps;
    +  182  0
             return deps;
    +  183   +
         }
     184   -
         }
    +
     
     185   -
     
    +
         /**
     186   -
         /**
    +
          * Scans a given file or directory. If a directory is specified, it will be scanned recursively. Any dependencies identified
     187   -
          * Scans a given file or directory. If a directory is specified, it will be scanned recursively. Any dependencies
    +
          * are added to the dependency collection.
     188   -
          * identified are added to the dependency collection.
    +
          *
     189   -
          *
    -  190  
          * @param path the path to a file or directory to be analyzed
    +  190   +
          * @return the list of dependencies scanned
     191   -
          * @return the list of dependencies scanned
    +
          */
     192   -
          */
    -  193  
         public List<Dependency> scan(String path) {
    -  194  0
             final File file = new File(path);
    -  195  0
             return scan(file);
    +  193  0
             final File file = new File(path);
    +  194  0
             return scan(file);
    +  195   +
         }
     196   -
         }
    +
     
     197   -
     
    +
         /**
     198   -
         /**
    +
          * Scans an array of files or directories. If a directory is specified, it will be scanned recursively. Any dependencies
     199   -
          * Scans an array of files or directories. If a directory is specified, it will be scanned recursively. Any
    -  200   -
          * dependencies identified are added to the dependency collection.
    -  201   -
          *
    -  202   -
          * @param files an array of paths to files or directories to be analyzed.
    -  203   -
          * @return the list of dependencies
    -  204   -
          *
    -  205   -
          * @since v0.3.2.5
    -  206   -
          */
    -  207   -
         public List<Dependency> scan(File[] files) {
    -  208  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    -  209  0
             for (File file : files) {
    -  210  0
                 final List<Dependency> d = scan(file);
    -  211  0
                 if (d != null) {
    -  212  0
                     deps.addAll(d);
    -  213   -
                 }
    -  214   -
             }
    -  215  0
             return deps;
    -  216   -
         }
    -  217   -
     
    -  218   -
         /**
    -  219   -
          * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any
    -  220   -
          * dependencies identified are added to the dependency collection.
    -  221   -
          *
    -  222   -
          * @param files a set of paths to files or directories to be analyzed
    -  223   -
          * @return the list of dependencies scanned
    -  224   -
          *
    -  225   -
          * @since v0.3.2.5
    -  226   -
          */
    -  227   -
         public List<Dependency> scan(Set<File> files) {
    -  228  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    -  229  0
             for (File file : files) {
    -  230  0
                 final List<Dependency> d = scan(file);
    -  231  0
                 if (d != null) {
    -  232  0
                     deps.addAll(d);
    -  233   -
                 }
    -  234  0
             }
    -  235  0
             return deps;
    -  236   -
         }
    -  237   -
     
    -  238   -
         /**
    -  239   -
          * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any
    -  240   -
          * dependencies identified are added to the dependency collection.
    -  241   -
          *
    -  242   -
          * @param files a set of paths to files or directories to be analyzed
    -  243   -
          * @return the list of dependencies scanned
    -  244   -
          *
    -  245   -
          * @since v0.3.2.5
    -  246   -
          */
    -  247   -
         public List<Dependency> scan(List<File> files) {
    -  248  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    -  249  0
             for (File file : files) {
    -  250  0
                 final List<Dependency> d = scan(file);
    -  251  0
                 if (d != null) {
    -  252  0
                     deps.addAll(d);
    -  253   -
                 }
    -  254  0
             }
    -  255  0
             return deps;
    -  256   -
         }
    -  257   -
     
    -  258   -
         /**
    -  259   -
          * Scans a given file or directory. If a directory is specified, it will be scanned recursively. Any dependencies
    -  260  
          * identified are added to the dependency collection.
    -  261   +  200  
          *
    -  262   -
          * @param file the path to a file or directory to be analyzed
    -  263   +  201   +
          * @param files an array of paths to files or directories to be analyzed.
    +  202   +
          * @return the list of dependencies
    +  203   +
          *
    +  204   +
          * @since v0.3.2.5
    +  205   +
          */
    +  206   +
         public List<Dependency> scan(File[] files) {
    +  207  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    +  208  0
             for (File file : files) {
    +  209  0
                 final List<Dependency> d = scan(file);
    +  210  0
                 if (d != null) {
    +  211  0
                     deps.addAll(d);
    +  212   +
                 }
    +  213   +
             }
    +  214  0
             return deps;
    +  215   +
         }
    +  216   +
     
    +  217   +
         /**
    +  218   +
          * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any dependencies
    +  219   +
          * identified are added to the dependency collection.
    +  220   +
          *
    +  221   +
          * @param files a set of paths to files or directories to be analyzed
    +  222  
          * @return the list of dependencies scanned
    +  223   +
          *
    +  224   +
          * @since v0.3.2.5
    +  225   +
          */
    +  226   +
         public List<Dependency> scan(Set<File> files) {
    +  227  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    +  228  0
             for (File file : files) {
    +  229  0
                 final List<Dependency> d = scan(file);
    +  230  0
                 if (d != null) {
    +  231  0
                     deps.addAll(d);
    +  232   +
                 }
    +  233  0
             }
    +  234  0
             return deps;
    +  235   +
         }
    +  236   +
     
    +  237   +
         /**
    +  238   +
          * Scans a list of files or directories. If a directory is specified, it will be scanned recursively. Any dependencies
    +  239   +
          * identified are added to the dependency collection.
    +  240   +
          *
    +  241   +
          * @param files a set of paths to files or directories to be analyzed
    +  242   +
          * @return the list of dependencies scanned
    +  243   +
          *
    +  244   +
          * @since v0.3.2.5
    +  245   +
          */
    +  246   +
         public List<Dependency> scan(List<File> files) {
    +  247  0
             final List<Dependency> deps = new ArrayList<Dependency>();
    +  248  0
             for (File file : files) {
    +  249  0
                 final List<Dependency> d = scan(file);
    +  250  0
                 if (d != null) {
    +  251  0
                     deps.addAll(d);
    +  252   +
                 }
    +  253  0
             }
    +  254  0
             return deps;
    +  255   +
         }
    +  256   +
     
    +  257   +
         /**
    +  258   +
          * Scans a given file or directory. If a directory is specified, it will be scanned recursively. Any dependencies identified
    +  259   +
          * are added to the dependency collection.
    +  260   +
          *
    +  261   +
          * @param file the path to a file or directory to be analyzed
    +  262   +
          * @return the list of dependencies scanned
    +  263   +
          *
     264   -
          *
    -  265  
          * @since v0.3.2.4
    +  265   +
          *
     266   -
          *
    +
          */
     267   -
          */
    -  268  
         public List<Dependency> scan(File file) {
    -  269  4
             if (file.exists()) {
    -  270  4
                 if (file.isDirectory()) {
    -  271  2
                     return scanDirectory(file);
    -  272   +  268  4
             if (file.exists()) {
    +  269  4
                 if (file.isDirectory()) {
    +  270  2
                     return scanDirectory(file);
    +  271  
                 } else {
    -  273  2
                     final Dependency d = scanFile(file);
    -  274  2
                     if (d != null) {
    -  275  2
                         final List<Dependency> deps = new ArrayList<Dependency>();
    -  276  2
                         deps.add(d);
    -  277  2
                         return deps;
    +  272  2
                     final Dependency d = scanFile(file);
    +  273  2
                     if (d != null) {
    +  274  2
                         final List<Dependency> deps = new ArrayList<Dependency>();
    +  275  2
                         deps.add(d);
    +  276  2
                         return deps;
    +  277   +
                     }
     278   -
                     }
    +
                 }
     279   -
                 }
    -  280  
             }
    -  281  0
             return null;
    +  280  0
             return null;
    +  281   +
         }
     282   -
         }
    +
     
     283   -
     
    +
         /**
     284   -
         /**
    -  285  
          * Recursively scans files and directories. Any dependencies identified are added to the dependency collection.
    +  285   +
          *
     286   -
          *
    -  287  
          * @param dir the directory to scan
    -  288   +  287  
          * @return the list of Dependency objects scanned
    +  288   +
          */
     289   -
          */
    -  290  
         protected List<Dependency> scanDirectory(File dir) {
    -  291  38
             final File[] files = dir.listFiles();
    -  292  38
             final List<Dependency> deps = new ArrayList<Dependency>();
    -  293  38
             if (files != null) {
    -  294  74
                 for (File f : files) {
    -  295  36
                     if (f.isDirectory()) {
    -  296  36
                         final List<Dependency> d = scanDirectory(f);
    -  297  36
                         if (d != null) {
    -  298  36
                             deps.addAll(d);
    -  299   +  290  38
             final File[] files = dir.listFiles();
    +  291  38
             final List<Dependency> deps = new ArrayList<Dependency>();
    +  292  38
             if (files != null) {
    +  293  74
                 for (File f : files) {
    +  294  36
                     if (f.isDirectory()) {
    +  295  36
                         final List<Dependency> d = scanDirectory(f);
    +  296  36
                         if (d != null) {
    +  297  36
                             deps.addAll(d);
    +  298  
                         }
    -  300  36
                     } else {
    -  301  0
                         final Dependency d = scanFile(f);
    -  302  0
                         deps.add(d);
    -  303   +  299  36
                     } else {
    +  300  0
                         final Dependency d = scanFile(f);
    +  301  0
                         deps.add(d);
    +  302  
                     }
    +  303   +
                 }
     304   -
                 }
    -  305  
             }
    -  306  38
             return deps;
    +  305  38
             return deps;
    +  306   +
         }
     307   -
         }
    +
     
     308   -
     
    +
         /**
     309   -
         /**
    -  310  
          * Scans a specified file. If a dependency is identified it is added to the dependency collection.
    +  310   +
          *
     311   -
          *
    -  312  
          * @param file The file to scan
    -  313   +  312  
          * @return the scanned dependency
    +  313   +
          */
     314   -
          */
    -  315  
         protected Dependency scanFile(File file) {
    -  316  2
             if (!file.isFile()) {
    -  317  0
                 final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file.", file.toString());
    -  318  0
                 LOGGER.log(Level.FINE, msg);
    -  319  0
                 return null;
    -  320   +  315  2
             if (!file.isFile()) {
    +  316  0
                 final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file.", file.toString());
    +  317  0
                 LOGGER.log(Level.FINE, msg);
    +  318  0
                 return null;
    +  319  
             }
    -  321  2
             final String fileName = file.getName();
    -  322  2
             final String extension = FileUtils.getFileExtension(fileName);
    -  323  2
             Dependency dependency = null;
    -  324  2
             if (extension != null) {
    -  325  2
                 if (supportsExtension(extension)) {
    -  326  2
                     dependency = new Dependency(file);
    -  327  2
                     dependencies.add(dependency);
    +  320  2
             final String fileName = file.getName();
    +  321  2
             final String extension = FileUtils.getFileExtension(fileName);
    +  322  2
             Dependency dependency = null;
    +  323  2
             if (extension != null) {
    +  324  2
                 if (supportsExtension(extension)) {
    +  325  2
                     dependency = new Dependency(file);
    +  326  2
                     dependencies.add(dependency);
    +  327   +
                 }
     328   -
                 }
    -  329  
             } else {
    -  330  0
                 final String msg = String.format("No file extension found on file '%s'. The file was not analyzed.", file.toString());
    -  331  0
                 LOGGER.log(Level.FINE, msg);
    -  332   +  329  0
                 final String msg = String.format("No file extension found on file '%s'. The file was not analyzed.", file.toString());
    +  330  0
                 LOGGER.log(Level.FINE, msg);
    +  331  
             }
    -  333  2
             return dependency;
    +  332  2
             return dependency;
    +  333   +
         }
     334   -
         }
    +
     
     335   -
     
    +
         /**
     336   -
         /**
    -  337  
          * Runs the analyzers against all of the dependencies.
    +  337   +
          */
     338   -
          */
    -  339  
         public void analyzeDependencies() {
    -  340  1
             boolean autoUpdate = true;
    -  341   +  339  1
             boolean autoUpdate = true;
    +  340  
             try {
    -  342  1
                 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
    -  343  0
             } catch (InvalidSettingException ex) {
    -  344  0
                 LOGGER.log(Level.FINE, "Invalid setting for auto-update; using true.");
    -  345  1
             }
    -  346  1
             if (autoUpdate) {
    -  347  0
                 doUpdates();
    +  341  1
                 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
    +  342  0
             } catch (InvalidSettingException ex) {
    +  343  0
                 LOGGER.log(Level.FINE, "Invalid setting for auto-update; using true.");
    +  344  1
             }
    +  345  1
             if (autoUpdate) {
    +  346  0
                 doUpdates();
    +  347   +
             }
     348   -
             }
    +
     
     349   -
     
    -  350  
             //need to ensure that data exists
    -  351   +  350  
             try {
    -  352  1
                 ensureDataExists();
    -  353  0
             } catch (NoDataException ex) {
    -  354  0
                 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis.", ex.getMessage());
    -  355  0
                 LOGGER.log(Level.SEVERE, msg);
    -  356  0
                 LOGGER.log(Level.FINE, null, ex);
    -  357  0
                 return;
    -  358  0
             } catch (DatabaseException ex) {
    -  359  0
                 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis.", ex.getMessage());
    -  360  0
                 LOGGER.log(Level.SEVERE, msg);
    -  361  0
                 LOGGER.log(Level.FINE, null, ex);
    -  362  0
                 return;
    -  363   +  351  1
                 ensureDataExists();
    +  352  0
             } catch (NoDataException ex) {
    +  353  0
                 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis.", ex.getMessage());
    +  354  0
                 LOGGER.log(Level.SEVERE, msg);
    +  355  0
                 LOGGER.log(Level.FINE, null, ex);
    +  356  0
                 return;
    +  357  0
             } catch (DatabaseException ex) {
    +  358  0
                 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis.", ex.getMessage());
    +  359  0
                 LOGGER.log(Level.SEVERE, msg);
    +  360  0
                 LOGGER.log(Level.FINE, null, ex);
    +  361  0
                 return;
    +  362  
     
    -  364  1
             }
    -  365   +  363  1
             }
    +  364  
     
    -  366  1
             final String logHeader = String.format("%n"
    +  365  1
             final String logHeader = String.format("%n"
    +  366   +
                     + "----------------------------------------------------%n"
     367   -
                     + "----------------------------------------------------%n"
    -  368  
                     + "BEGIN ANALYSIS%n"
    -  369   +  368  
                     + "----------------------------------------------------");
    -  370  1
             LOGGER.log(Level.FINE, logHeader);
    -  371  1
             LOGGER.log(Level.INFO, "Analysis Starting");
    +  369  1
             LOGGER.log(Level.FINE, logHeader);
    +  370  1
             LOGGER.log(Level.INFO, "Analysis Starting");
    +  371   +
     
     372   -
     
    -  373  
             // analysis phases
    -  374  10
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    -  375  9
                 final List<Analyzer> analyzerList = analyzers.get(phase);
    -  376   +  373  10
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    +  374  9
                 final List<Analyzer> analyzerList = analyzers.get(phase);
    +  375   +
     
    +  376  9
                 for (Analyzer a : analyzerList) {
    +  377  14
                     a = initializeAnalyzer(a);
    +  378  
     
    -  377  9
                 for (Analyzer a : analyzerList) {
    -  378  14
                     a = initializeAnalyzer(a);
     379   -
     
    -  380  
                     /* need to create a copy of the collection because some of the
    -  381   +  380  
                      * analyzers may modify it. This prevents ConcurrentModificationExceptions.
    -  382   +  381  
                      * This is okay for adds/deletes because it happens per analyzer.
    -  383   +  382  
                      */
    -  384  14
                     final String msg = String.format("Begin Analyzer '%s'", a.getName());
    -  385  14
                     LOGGER.log(Level.FINE, msg);
    -  386  14
                     final Set<Dependency> dependencySet = new HashSet<Dependency>();
    -  387  14
                     dependencySet.addAll(dependencies);
    -  388  14
                     for (Dependency d : dependencySet) {
    -  389  28
                         boolean shouldAnalyze = true;
    -  390  28
                         if (a instanceof FileTypeAnalyzer) {
    -  391  12
                             final FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;
    -  392  12
                             shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());
    -  393   +  383  14
                     final String msg = String.format("Begin Analyzer '%s'", a.getName());
    +  384  14
                     LOGGER.log(Level.FINE, msg);
    +  385  14
                     final Set<Dependency> dependencySet = new HashSet<Dependency>();
    +  386  14
                     dependencySet.addAll(dependencies);
    +  387  14
                     for (Dependency d : dependencySet) {
    +  388  28
                         boolean shouldAnalyze = true;
    +  389  28
                         if (a instanceof FileTypeAnalyzer) {
    +  390  12
                             final FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;
    +  391  12
                             shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());
    +  392  
                         }
    -  394  28
                         if (shouldAnalyze) {
    -  395  20
                             final String msgFile = String.format("Begin Analysis of '%s'", d.getActualFilePath());
    -  396  20
                             LOGGER.log(Level.FINE, msgFile);
    -  397   +  393  28
                         if (shouldAnalyze) {
    +  394  20
                             final String msgFile = String.format("Begin Analysis of '%s'", d.getActualFilePath());
    +  395  20
                             LOGGER.log(Level.FINE, msgFile);
    +  396  
                             try {
    -  398  20
                                 a.analyze(d, this);
    -  399  0
                             } catch (AnalysisException ex) {
    -  400  0
                                 final String exMsg = String.format("An error occurred while analyzing '%s'.", d.getActualFilePath());
    -  401  0
                                 LOGGER.log(Level.WARNING, exMsg);
    -  402  0
                                 LOGGER.log(Level.FINE, "", ex);
    -  403  0
                             } catch (Throwable ex) {
    -  404  0
                                 final String axMsg = String.format("An unexpected error occurred during analysis of '%s'", d.getActualFilePath());
    -  405   +  397  20
                                 a.analyze(d, this);
    +  398  0
                             } catch (AnalysisException ex) {
    +  399  0
                                 final String exMsg = String.format("An error occurred while analyzing '%s'.", d.getActualFilePath());
    +  400  0
                                 LOGGER.log(Level.WARNING, exMsg);
    +  401  0
                                 LOGGER.log(Level.FINE, "", ex);
    +  402  0
                             } catch (Throwable ex) {
    +  403  0
                                 final String axMsg = String.format("An unexpected error occurred during analysis of '%s'", d.getActualFilePath());
    +  404  
                                 //final AnalysisException ax = new AnalysisException(axMsg, ex);
    -  406  0
                                 LOGGER.log(Level.WARNING, axMsg);
    -  407  0
                                 LOGGER.log(Level.FINE, "", ex);
    -  408  20
                             }
    -  409   +  405  0
                                 LOGGER.log(Level.WARNING, axMsg);
    +  406  0
                                 LOGGER.log(Level.FINE, "", ex);
    +  407  20
                             }
    +  408  
                         }
    -  410  28
                     }
    -  411  14
                 }
    -  412   +  409  28
                     }
    +  410  14
                 }
    +  411  
             }
    -  413  10
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    -  414  9
                 final List<Analyzer> analyzerList = analyzers.get(phase);
    -  415   +  412  10
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    +  413  9
                 final List<Analyzer> analyzerList = analyzers.get(phase);
    +  414  
     
    -  416  9
                 for (Analyzer a : analyzerList) {
    -  417  14
                     closeAnalyzer(a);
    -  418  14
                 }
    +  415  9
                 for (Analyzer a : analyzerList) {
    +  416  14
                     closeAnalyzer(a);
    +  417  14
                 }
    +  418   +
             }
     419   -
             }
    -  420  
     
    -  421  1
             final String logFooter = String.format("%n"
    -  422   +  420  1
             final String logFooter = String.format("%n"
    +  421  
                     + "----------------------------------------------------%n"
    -  423   +  422  
                     + "END ANALYSIS%n"
    -  424   +  423  
                     + "----------------------------------------------------");
    -  425  1
             LOGGER.log(Level.FINE, logFooter);
    -  426  1
             LOGGER.log(Level.INFO, "Analysis Complete");
    -  427  1
         }
    +  424  1
             LOGGER.log(Level.FINE, logFooter);
    +  425  1
             LOGGER.log(Level.INFO, "Analysis Complete");
    +  426  1
         }
    +  427   +
     
     428   -
     
    +
         /**
     429   -
         /**
    -  430  
          * Initializes the given analyzer.
    +  430   +
          *
     431   -
          *
    -  432  
          * @param analyzer the analyzer to initialize
    -  433   +  432  
          * @return the initialized analyzer
    +  433   +
          */
     434   -
          */
    -  435  
         protected Analyzer initializeAnalyzer(Analyzer analyzer) {
    -  436   +  435  
             try {
    -  437  14
                 final String msg = String.format("Initializing %s", analyzer.getName());
    -  438  14
                 LOGGER.log(Level.FINE, msg);
    -  439  14
                 analyzer.initialize();
    -  440  0
             } catch (Throwable ex) {
    -  441  0
                 final String msg = String.format("Exception occurred initializing %s.", analyzer.getName());
    -  442  0
                 LOGGER.log(Level.SEVERE, msg);
    -  443  0
                 LOGGER.log(Level.FINE, null, ex);
    -  444   +  436  14
                 final String msg = String.format("Initializing %s", analyzer.getName());
    +  437  14
                 LOGGER.log(Level.FINE, msg);
    +  438  14
                 analyzer.initialize();
    +  439  0
             } catch (Throwable ex) {
    +  440  0
                 final String msg = String.format("Exception occurred initializing %s.", analyzer.getName());
    +  441  0
                 LOGGER.log(Level.SEVERE, msg);
    +  442  0
                 LOGGER.log(Level.FINE, null, ex);
    +  443  
                 try {
    -  445  0
                     analyzer.close();
    -  446  0
                 } catch (Throwable ex1) {
    -  447  0
                     LOGGER.log(Level.FINEST, null, ex1);
    -  448  0
                 }
    -  449  14
             }
    -  450  14
             return analyzer;
    +  444  0
                     analyzer.close();
    +  445  0
                 } catch (Throwable ex1) {
    +  446  0
                     LOGGER.log(Level.FINEST, null, ex1);
    +  447  0
                 }
    +  448  14
             }
    +  449  14
             return analyzer;
    +  450   +
         }
     451   -
         }
    +
     
     452   -
     
    +
         /**
     453   -
         /**
    -  454  
          * Closes the given analyzer.
    +  454   +
          *
     455   -
          *
    -  456  
          * @param analyzer the analyzer to close
    +  456   +
          */
     457   -
          */
    -  458  
         protected void closeAnalyzer(Analyzer analyzer) {
    -  459  14
             final String msg = String.format("Closing Analyzer '%s'", analyzer.getName());
    -  460  14
             LOGGER.log(Level.FINE, msg);
    -  461   +  458  14
             final String msg = String.format("Closing Analyzer '%s'", analyzer.getName());
    +  459  14
             LOGGER.log(Level.FINE, msg);
    +  460  
             try {
    -  462  14
                 analyzer.close();
    -  463  0
             } catch (Throwable ex) {
    -  464  0
                 LOGGER.log(Level.FINEST, null, ex);
    -  465  14
             }
    -  466  14
         }
    +  461  14
                 analyzer.close();
    +  462  0
             } catch (Throwable ex) {
    +  463  0
                 LOGGER.log(Level.FINEST, null, ex);
    +  464  14
             }
    +  465  14
         }
    +  466   +
     
     467   -
     
    +
         /**
     468   -
         /**
    -  469  
          * Cycles through the cached web data sources and calls update on all of them.
    +  469   +
          */
     470   -
          */
    -  471   -
         private void doUpdates() {
    -  472  0
             LOGGER.info("Checking for updates");
    -  473  0
             final UpdateService service = new UpdateService(serviceClassLoader);
    -  474  0
             final Iterator<CachedWebDataSource> iterator = service.getDataSources();
    -  475  0
             while (iterator.hasNext()) {
    -  476  0
                 final CachedWebDataSource source = iterator.next();
    -  477   +
         public void doUpdates() {
    +  471  0
             LOGGER.info("Checking for updates");
    +  472  0
             final UpdateService service = new UpdateService(serviceClassLoader);
    +  473  0
             final Iterator<CachedWebDataSource> iterator = service.getDataSources();
    +  474  0
             while (iterator.hasNext()) {
    +  475  0
                 final CachedWebDataSource source = iterator.next();
    +  476  
                 try {
    -  478  0
                     source.update();
    -  479  0
                 } catch (UpdateException ex) {
    -  480  0
                     LOGGER.log(Level.WARNING,
    -  481   +  477  0
                     source.update();
    +  478  0
                 } catch (UpdateException ex) {
    +  479  0
                     LOGGER.log(Level.WARNING,
    +  480  
                             "Unable to update Cached Web DataSource, using local data instead. Results may not include recent vulnerabilities.");
    -  482  0
                     LOGGER.log(Level.FINE, String.format("Unable to update details for %s", source.getClass().getName()), ex);
    -  483  0
                 }
    -  484  0
             }
    -  485  0
             LOGGER.info("Check for updates complete");
    -  486  0
         }
    +  481  0
                     LOGGER.log(Level.FINE, String.format("Unable to update details for %s", source.getClass().getName()), ex);
    +  482  0
                 }
    +  483  0
             }
    +  484  0
             LOGGER.info("Check for updates complete");
    +  485  0
         }
    +  486   +
     
     487   -
     
    +
         /**
     488   -
         /**
    -  489  
          * Returns a full list of all of the analyzers. This is useful for reporting which analyzers where used.
    +  489   +
          *
     490   -
          *
    -  491  
          * @return a list of Analyzers
    +  491   +
          */
     492   -
          */
    -  493  
         public List<Analyzer> getAnalyzers() {
    -  494  0
             final List<Analyzer> ret = new ArrayList<Analyzer>();
    -  495  0
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    -  496  0
                 final List<Analyzer> analyzerList = analyzers.get(phase);
    -  497  0
                 ret.addAll(analyzerList);
    -  498   +  493  0
             final List<Analyzer> ret = new ArrayList<Analyzer>();
    +  494  0
             for (AnalysisPhase phase : AnalysisPhase.values()) {
    +  495  0
                 final List<Analyzer> analyzerList = analyzers.get(phase);
    +  496  0
                 ret.addAll(analyzerList);
    +  497  
             }
    -  499  0
             return ret;
    +  498  0
             return ret;
    +  499   +
         }
     500   -
         }
    +
     
     501   -
     
    +
         /**
     502   -
         /**
    -  503  
          * Checks all analyzers to see if an extension is supported.
    +  503   +
          *
     504   -
          *
    -  505  
          * @param ext a file extension
    -  506   +  505  
          * @return true or false depending on whether or not the file extension is supported
    +  506   +
          */
     507   -
          */
    -  508  
         public boolean supportsExtension(String ext) {
    -  509  851
             if (ext == null) {
    -  510  3
                 return false;
    -  511   +  508  851
             if (ext == null) {
    +  509  3
                 return false;
    +  510  
             }
    -  512  848
             boolean scan = false;
    -  513  848
             for (FileTypeAnalyzer a : this.fileTypeAnalyzers) {
    -  514   +  511  848
             boolean scan = false;
    +  512  848
             for (FileTypeAnalyzer a : this.fileTypeAnalyzers) {
    +  513  
                 /* note, we can't break early on this loop as the analyzers need to know if
    -  515   +  514  
                  they have files to work on prior to initialization */
    -  516  5088
                 scan |= a.supportsExtension(ext);
    -  517  5088
             }
    -  518  848
             return scan;
    +  515  5088
                 scan |= a.supportsExtension(ext);
    +  516  5088
             }
    +  517  848
             return scan;
    +  518   +
         }
     519   -
         }
    +
     
     520   -
     
    +
         /**
     521   -
         /**
    -  522  
          * Returns the set of file type analyzers.
    +  522   +
          *
     523   -
          *
    -  524  
          * @return the set of file type analyzers
    +  524   +
          */
     525   -
          */
    -  526  
         public Set<FileTypeAnalyzer> getFileTypeAnalyzers() {
    -  527  0
             return this.fileTypeAnalyzers;
    -  528   +  526  0
             return this.fileTypeAnalyzers;
    +  527  
         }
    -  529   +  528  
     
    -  530   +  529  
         /**
    -  531   +  530  
          * Checks the CPE Index to ensure documents exists. If none exist a NoDataException is thrown.
    -  532   +  531  
          *
    -  533   +  532  
          * @throws NoDataException thrown if no data exists in the CPE Index
    -  534   +  533  
          * @throws DatabaseException thrown if there is an exception opening the database
    -  535   +  534  
          */
    -  536   +  535  
         private void ensureDataExists() throws NoDataException, DatabaseException {
    -  537  1
             final CveDB cve = new CveDB();
    -  538   +  536  1
             final CveDB cve = new CveDB();
    +  537  
             try {
    -  539  1
                 cve.open();
    -  540  1
                 if (!cve.dataExists()) {
    -  541  0
                     throw new NoDataException("No documents exist");
    -  542   +  538  1
                 cve.open();
    +  539  1
                 if (!cve.dataExists()) {
    +  540  0
                     throw new NoDataException("No documents exist");
    +  541  
                 }
    -  543  0
             } catch (DatabaseException ex) {
    -  544  0
                 throw new NoDataException(ex.getMessage(), ex);
    -  545   +  542  0
             } catch (DatabaseException ex) {
    +  543  0
                 throw new NoDataException(ex.getMessage(), ex);
    +  544  
             } finally {
    -  546  1
                 cve.close();
    -  547  1
             }
    -  548  1
         }
    -  549   +  545  1
                 cve.close();
    +  546  1
             }
    +  547  1
         }
    +  548  
     }
    - + 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 c0c9d67c1..24def3549 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 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    DependencyCheckScanAgent
    0%
    0/240
    0%
    0/110
    1.857
    DependencyCheckScanAgent
    0%
    0/245
    0%
    0/112
    1.847
     
    @@ -417,70 +417,69 @@  212  
         /**
     213   -
          * The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this
    +
          * flag indicating whether or not to generate a report of findings.
     214   -
          * within the Site plugin unless the externalReport is set to true. Default is HTML.
    -  215  
          */
    -  216  0
         private ReportGenerator.Format reportFormat = ReportGenerator.Format.HTML;
    +  215  0
         private boolean generateReport = true;
    +  216   +
     
     217   -
     
    +
         /**
     218   -
         /**
    +
          * Get the value of generateReport.
     219   -
          * Get the value of reportFormat.
    +
          *
     220   -
          *
    +
          * @return the value of generateReport
     221   -
          * @return the value of reportFormat
    +
          */
     222   -
          */
    -  223   -
         public ReportGenerator.Format getReportFormat() {
    -  224  0
             return reportFormat;
    -  225   +
         public boolean isGenerateReport() {
    +  223  0
             return generateReport;
    +  224  
         }
    +  225   +
     
     226   -
     
    +
         /**
     227   -
         /**
    +
          * Set the value of generateReport.
     228   -
          * Set the value of reportFormat.
    -  229  
          *
    +  229   +
          * @param generateReport new value of generateReport
     230   -
          * @param reportFormat new value of reportFormat
    -  231  
          */
    -  232   -
         public void setReportFormat(ReportGenerator.Format reportFormat) {
    -  233  0
             this.reportFormat = reportFormat;
    -  234  0
         }
    -  235   +  231   +
         public void setGenerateReport(boolean generateReport) {
    +  232  0
             this.generateReport = generateReport;
    +  233  0
         }
    +  234  
     
    -  236   +  235  
         /**
    +  236   +
          * The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this
     237   -
          * The Proxy Server.
    +
          * within the Site plugin unless the externalReport is set to true. Default is HTML.
     238  
          */
    -  239   -
         private String proxyServer;
    +  239  0
         private ReportGenerator.Format reportFormat = ReportGenerator.Format.HTML;
     240  
     
     241  
         /**
     242   -
          * Get the value of proxyServer.
    +
          * Get the value of reportFormat.
     243  
          *
     244   -
          * @return the value of proxyServer
    +
          * @return the value of reportFormat
     245  
          */
     246   -
         public String getProxyServer() {
    -  247  0
             return proxyServer;
    +
         public ReportGenerator.Format getReportFormat() {
    +  247  0
             return reportFormat;
     248  
         }
     249   @@ -488,128 +487,128 @@  250  
         /**
     251   -
          * Set the value of proxyServer.
    +
          * Set the value of reportFormat.
     252  
          *
     253   -
          * @param proxyServer new value of proxyServer
    +
          * @param reportFormat new value of reportFormat
     254  
          */
     255   -
         public void setProxyServer(String proxyServer) {
    -  256  0
             this.proxyServer = proxyServer;
    +
         public void setReportFormat(ReportGenerator.Format reportFormat) {
    +  256  0
             this.reportFormat = reportFormat;
     257  0
         }
     258  
     
     259  
         /**
     260   -
          * Get the value of proxyServer.
    +
          * The Proxy Server.
     261   -
          *
    +
          */
     262   -
          * @return the value of proxyServer
    +
         private String proxyServer;
     263   -
          * @deprecated use {@link org.owasp.dependencycheck.agent.DependencyCheckScanAgent#getProxyServer()} instead
    -  264   -
          */
    -  265   -
         @Deprecated
    -  266   -
         public String getProxyUrl() {
    -  267  0
             return proxyServer;
    -  268   -
         }
    -  269  
     
    -  270   +  264  
         /**
    -  271   -
          * Set the value of proxyServer.
    -  272   +  265   +
          * Get the value of proxyServer.
    +  266  
          *
    -  273   -
          * @param proxyUrl new value of proxyServer
    -  274   -
          * @deprecated use {@link org.owasp.dependencycheck.agent.DependencyCheckScanAgent#setProxyServer(java.lang.String)
    -  275   -
          * } instead
    -  276   +  267   +
          * @return the value of proxyServer
    +  268  
          */
    +  269   +
         public String getProxyServer() {
    +  270  0
             return proxyServer;
    +  271   +
         }
    +  272   +
     
    +  273   +
         /**
    +  274   +
          * Set the value of proxyServer.
    +  275   +
          *
    +  276   +
          * @param proxyServer new value of proxyServer
     277   -
         @Deprecated
    +
          */
     278   -
         public void setProxyUrl(String proxyUrl) {
    -  279  0
             this.proxyServer = proxyUrl;
    +
         public void setProxyServer(String proxyServer) {
    +  279  0
             this.proxyServer = proxyServer;
     280  0
         }
     281  
     
     282  
         /**
     283   -
          * The Proxy Port.
    +
          * Get the value of proxyServer.
     284   -
          */
    +
          *
     285   -
         private String proxyPort;
    +
          * @return the value of proxyServer
     286   -
     
    +
          * @deprecated use {@link org.owasp.dependencycheck.agent.DependencyCheckScanAgent#getProxyServer()} instead
     287   -
         /**
    +
          */
     288   -
          * Get the value of proxyPort.
    +
         @Deprecated
     289   -
          *
    -  290   -
          * @return the value of proxyPort
    +
         public String getProxyUrl() {
    +  290  0
             return proxyServer;
     291   -
          */
    -  292   -
         public String getProxyPort() {
    -  293  0
             return proxyPort;
    -  294  
         }
    -  295   +  292  
     
    -  296   +  293  
         /**
    -  297   -
          * Set the value of proxyPort.
    -  298   +  294   +
          * Set the value of proxyServer.
    +  295  
          *
    +  296   +
          * @param proxyUrl new value of proxyServer
    +  297   +
          * @deprecated use {@link org.owasp.dependencycheck.agent.DependencyCheckScanAgent#setProxyServer(java.lang.String)
    +  298   +
          * } instead
     299   -
          * @param proxyPort new value of proxyPort
    -  300  
          */
    +  300   +
         @Deprecated
     301   -
         public void setProxyPort(String proxyPort) {
    -  302  0
             this.proxyPort = proxyPort;
    +
         public void setProxyUrl(String proxyUrl) {
    +  302  0
             this.proxyServer = proxyUrl;
     303  0
         }
     304  
     
     305  
         /**
     306   -
          * The Proxy username.
    +
          * The Proxy Port.
     307  
          */
     308   -
         private String proxyUsername;
    +
         private String proxyPort;
     309  
     
     310  
         /**
     311   -
          * Get the value of proxyUsername.
    +
          * Get the value of proxyPort.
     312  
          *
     313   -
          * @return the value of proxyUsername
    +
          * @return the value of proxyPort
     314  
          */
     315   -
         public String getProxyUsername() {
    -  316  0
             return proxyUsername;
    +
         public String getProxyPort() {
    +  316  0
             return proxyPort;
     317  
         }
     318   @@ -617,42 +616,42 @@  319  
         /**
     320   -
          * Set the value of proxyUsername.
    +
          * Set the value of proxyPort.
     321  
          *
     322   -
          * @param proxyUsername new value of proxyUsername
    +
          * @param proxyPort new value of proxyPort
     323  
          */
     324   -
         public void setProxyUsername(String proxyUsername) {
    -  325  0
             this.proxyUsername = proxyUsername;
    +
         public void setProxyPort(String proxyPort) {
    +  325  0
             this.proxyPort = proxyPort;
     326  0
         }
     327  
     
     328  
         /**
     329   -
          * The Proxy password.
    +
          * The Proxy username.
     330  
          */
     331   -
         private String proxyPassword;
    +
         private String proxyUsername;
     332  
     
     333  
         /**
     334   -
          * Get the value of proxyPassword.
    +
          * Get the value of proxyUsername.
     335  
          *
     336   -
          * @return the value of proxyPassword
    +
          * @return the value of proxyUsername
     337  
          */
     338   -
         public String getProxyPassword() {
    -  339  0
             return proxyPassword;
    +
         public String getProxyUsername() {
    +  339  0
             return proxyUsername;
     340  
         }
     341   @@ -660,42 +659,42 @@  342  
         /**
     343   -
          * Set the value of proxyPassword.
    +
          * Set the value of proxyUsername.
     344  
          *
     345   -
          * @param proxyPassword new value of proxyPassword
    +
          * @param proxyUsername new value of proxyUsername
     346  
          */
     347   -
         public void setProxyPassword(String proxyPassword) {
    -  348  0
             this.proxyPassword = proxyPassword;
    +
         public void setProxyUsername(String proxyUsername) {
    +  348  0
             this.proxyUsername = proxyUsername;
     349  0
         }
     350  
     
     351  
         /**
     352   -
          * The Connection Timeout.
    +
          * The Proxy password.
     353  
          */
     354   -
         private String connectionTimeout;
    +
         private String proxyPassword;
     355  
     
     356  
         /**
     357   -
          * Get the value of connectionTimeout.
    +
          * Get the value of proxyPassword.
     358  
          *
     359   -
          * @return the value of connectionTimeout
    +
          * @return the value of proxyPassword
     360  
          */
     361   -
         public String getConnectionTimeout() {
    -  362  0
             return connectionTimeout;
    +
         public String getProxyPassword() {
    +  362  0
             return proxyPassword;
     363  
         }
     364   @@ -703,41 +702,42 @@  365  
         /**
     366   -
          * Set the value of connectionTimeout.
    +
          * Set the value of proxyPassword.
     367  
          *
     368   -
          * @param connectionTimeout new value of connectionTimeout
    +
          * @param proxyPassword new value of proxyPassword
     369  
          */
     370   -
         public void setConnectionTimeout(String connectionTimeout) {
    -  371  0
             this.connectionTimeout = connectionTimeout;
    +
         public void setProxyPassword(String proxyPassword) {
    +  371  0
             this.proxyPassword = proxyPassword;
     372  0
         }
     373  
     
     374  
         /**
     375   -
          * The file path used for verbose logging.
    +
          * The Connection Timeout.
     376  
          */
    -  377  0
         private String logFile = null;
    +  377   +
         private String connectionTimeout;
     378  
     
     379  
         /**
     380   -
          * Get the value of logFile.
    +
          * Get the value of connectionTimeout.
     381  
          *
     382   -
          * @return the value of logFile
    +
          * @return the value of connectionTimeout
     383  
          */
     384   -
         public String getLogFile() {
    -  385  0
             return logFile;
    +
         public String getConnectionTimeout() {
    +  385  0
             return connectionTimeout;
     386  
         }
     387   @@ -745,42 +745,41 @@  388  
         /**
     389   -
          * Set the value of logFile.
    +
          * Set the value of connectionTimeout.
     390  
          *
     391   -
          * @param logFile new value of logFile
    +
          * @param connectionTimeout new value of connectionTimeout
     392  
          */
     393   -
         public void setLogFile(String logFile) {
    -  394  0
             this.logFile = logFile;
    +
         public void setConnectionTimeout(String connectionTimeout) {
    +  394  0
             this.connectionTimeout = connectionTimeout;
     395  0
         }
     396  
     
     397  
         /**
     398   -
          * The path to the suppression file.
    +
          * The file path used for verbose logging.
     399  
          */
    -  400   -
         private String suppressionFile;
    +  400  0
         private String logFile = null;
     401  
     
     402  
         /**
     403   -
          * Get the value of suppressionFile.
    +
          * Get the value of logFile.
     404  
          *
     405   -
          * @return the value of suppressionFile
    +
          * @return the value of logFile
     406  
          */
     407   -
         public String getSuppressionFile() {
    -  408  0
             return suppressionFile;
    +
         public String getLogFile() {
    +  408  0
             return logFile;
     409  
         }
     410   @@ -788,41 +787,42 @@  411  
         /**
     412   -
          * Set the value of suppressionFile.
    +
          * Set the value of logFile.
     413  
          *
     414   -
          * @param suppressionFile new value of suppressionFile
    +
          * @param logFile new value of logFile
     415  
          */
     416   -
         public void setSuppressionFile(String suppressionFile) {
    -  417  0
             this.suppressionFile = suppressionFile;
    +
         public void setLogFile(String logFile) {
    +  417  0
             this.logFile = logFile;
     418  0
         }
     419  
     
     420  
         /**
     421   -
          * flag indicating whether or not to show a summary of findings.
    +
          * The path to the suppression file.
     422  
          */
    -  423  0
         private boolean showSummary = true;
    +  423   +
         private String suppressionFile;
     424  
     
     425  
         /**
     426   -
          * Get the value of showSummary.
    +
          * Get the value of suppressionFile.
     427  
          *
     428   -
          * @return the value of showSummary
    +
          * @return the value of suppressionFile
     429  
          */
     430   -
         public boolean isShowSummary() {
    -  431  0
             return showSummary;
    +
         public String getSuppressionFile() {
    +  431  0
             return suppressionFile;
     432  
         }
     433   @@ -830,41 +830,41 @@  434  
         /**
     435   -
          * Set the value of showSummary.
    +
          * Set the value of suppressionFile.
     436  
          *
     437   -
          * @param showSummary new value of showSummary
    +
          * @param suppressionFile new value of suppressionFile
     438  
          */
     439   -
         public void setShowSummary(boolean showSummary) {
    -  440  0
             this.showSummary = showSummary;
    +
         public void setSuppressionFile(String suppressionFile) {
    +  440  0
             this.suppressionFile = suppressionFile;
     441  0
         }
     442  
     
     443  
         /**
     444   -
          * Whether or not the Maven Central analyzer is enabled.
    +
          * flag indicating whether or not to show a summary of findings.
     445  
          */
    -  446  0
         private boolean centralAnalyzerEnabled = true;
    +  446  0
         private boolean showSummary = true;
     447  
     
     448  
         /**
     449   -
          * Get the value of centralAnalyzerEnabled.
    +
          * Get the value of showSummary.
     450  
          *
     451   -
          * @return the value of centralAnalyzerEnabled
    +
          * @return the value of showSummary
     452  
          */
     453   -
         public boolean isCentralAnalyzerEnabled() {
    -  454  0
             return centralAnalyzerEnabled;
    +
         public boolean isShowSummary() {
    +  454  0
             return showSummary;
     455  
         }
     456   @@ -872,42 +872,41 @@  457  
         /**
     458   -
          * Set the value of centralAnalyzerEnabled.
    +
          * Set the value of showSummary.
     459  
          *
     460   -
          * @param centralAnalyzerEnabled new value of centralAnalyzerEnabled
    +
          * @param showSummary new value of showSummary
     461  
          */
     462   -
         public void setCentralAnalyzerEnabled(boolean centralAnalyzerEnabled) {
    -  463  0
             this.centralAnalyzerEnabled = centralAnalyzerEnabled;
    +
         public void setShowSummary(boolean showSummary) {
    +  463  0
             this.showSummary = showSummary;
     464  0
         }
     465  
     
     466  
         /**
     467   -
          * The URL of Maven Central.
    +
          * Whether or not the Maven Central analyzer is enabled.
     468  
          */
    -  469   -
         private String centralUrl;
    +  469  0
         private boolean centralAnalyzerEnabled = true;
     470  
     
     471  
         /**
     472   -
          * Get the value of centralUrl.
    +
          * Get the value of centralAnalyzerEnabled.
     473  
          *
     474   -
          * @return the value of centralUrl
    +
          * @return the value of centralAnalyzerEnabled
     475  
          */
     476   -
         public String getCentralUrl() {
    -  477  0
             return centralUrl;
    +
         public boolean isCentralAnalyzerEnabled() {
    +  477  0
             return centralAnalyzerEnabled;
     478  
         }
     479   @@ -915,41 +914,42 @@  480  
         /**
     481   -
          * Set the value of centralUrl.
    +
          * Set the value of centralAnalyzerEnabled.
     482  
          *
     483   -
          * @param centralUrl new value of centralUrl
    +
          * @param centralAnalyzerEnabled new value of centralAnalyzerEnabled
     484  
          */
     485   -
         public void setCentralUrl(String centralUrl) {
    -  486  0
             this.centralUrl = centralUrl;
    +
         public void setCentralAnalyzerEnabled(boolean centralAnalyzerEnabled) {
    +  486  0
             this.centralAnalyzerEnabled = centralAnalyzerEnabled;
     487  0
         }
     488  
     
     489  
         /**
     490   -
          * Whether or not the nexus analyzer is enabled.
    +
          * The URL of Maven Central.
     491  
          */
    -  492  0
         private boolean nexusAnalyzerEnabled = true;
    +  492   +
         private String centralUrl;
     493  
     
     494  
         /**
     495   -
          * Get the value of nexusAnalyzerEnabled.
    +
          * Get the value of centralUrl.
     496  
          *
     497   -
          * @return the value of nexusAnalyzerEnabled
    +
          * @return the value of centralUrl
     498  
          */
     499   -
         public boolean isNexusAnalyzerEnabled() {
    -  500  0
             return nexusAnalyzerEnabled;
    +
         public String getCentralUrl() {
    +  500  0
             return centralUrl;
     501  
         }
     502   @@ -957,42 +957,41 @@  503  
         /**
     504   -
          * Set the value of nexusAnalyzerEnabled.
    +
          * Set the value of centralUrl.
     505  
          *
     506   -
          * @param nexusAnalyzerEnabled new value of nexusAnalyzerEnabled
    +
          * @param centralUrl new value of centralUrl
     507  
          */
     508   -
         public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
    -  509  0
             this.nexusAnalyzerEnabled = nexusAnalyzerEnabled;
    +
         public void setCentralUrl(String centralUrl) {
    +  509  0
             this.centralUrl = centralUrl;
     510  0
         }
     511  
     
     512  
         /**
     513   -
          * The URL of the Nexus server.
    +
          * Whether or not the nexus analyzer is enabled.
     514  
          */
    -  515   -
         private String nexusUrl;
    +  515  0
         private boolean nexusAnalyzerEnabled = true;
     516  
     
     517  
         /**
     518   -
          * Get the value of nexusUrl.
    +
          * Get the value of nexusAnalyzerEnabled.
     519  
          *
     520   -
          * @return the value of nexusUrl
    +
          * @return the value of nexusAnalyzerEnabled
     521  
          */
     522   -
         public String getNexusUrl() {
    -  523  0
             return nexusUrl;
    +
         public boolean isNexusAnalyzerEnabled() {
    +  523  0
             return nexusAnalyzerEnabled;
     524  
         }
     525   @@ -1000,41 +999,42 @@  526  
         /**
     527   -
          * Set the value of nexusUrl.
    +
          * Set the value of nexusAnalyzerEnabled.
     528  
          *
     529   -
          * @param nexusUrl new value of nexusUrl
    +
          * @param nexusAnalyzerEnabled new value of nexusAnalyzerEnabled
     530  
          */
     531   -
         public void setNexusUrl(String nexusUrl) {
    -  532  0
             this.nexusUrl = nexusUrl;
    +
         public void setNexusAnalyzerEnabled(boolean nexusAnalyzerEnabled) {
    +  532  0
             this.nexusAnalyzerEnabled = nexusAnalyzerEnabled;
     533  0
         }
     534  
     
     535  
         /**
     536   -
          * Whether or not the defined proxy should be used when connecting to Nexus.
    +
          * The URL of the Nexus server.
     537  
          */
    -  538  0
         private boolean nexusUsesProxy = true;
    +  538   +
         private String nexusUrl;
     539  
     
     540  
         /**
     541   -
          * Get the value of nexusUsesProxy.
    +
          * Get the value of nexusUrl.
     542  
          *
     543   -
          * @return the value of nexusUsesProxy
    +
          * @return the value of nexusUrl
     544  
          */
     545   -
         public boolean isNexusUsesProxy() {
    -  546  0
             return nexusUsesProxy;
    +
         public String getNexusUrl() {
    +  546  0
             return nexusUrl;
     547  
         }
     548   @@ -1042,42 +1042,41 @@  549  
         /**
     550   -
          * Set the value of nexusUsesProxy.
    +
          * Set the value of nexusUrl.
     551  
          *
     552   -
          * @param nexusUsesProxy new value of nexusUsesProxy
    +
          * @param nexusUrl new value of nexusUrl
     553  
          */
     554   -
         public void setNexusUsesProxy(boolean nexusUsesProxy) {
    -  555  0
             this.nexusUsesProxy = nexusUsesProxy;
    +
         public void setNexusUrl(String nexusUrl) {
    +  555  0
             this.nexusUrl = nexusUrl;
     556  0
         }
     557  
     
     558  
         /**
     559   -
          * The database driver name; such as org.h2.Driver.
    +
          * Whether or not the defined proxy should be used when connecting to Nexus.
     560  
          */
    -  561   -
         private String databaseDriverName;
    +  561  0
         private boolean nexusUsesProxy = true;
     562  
     
     563  
         /**
     564   -
          * Get the value of databaseDriverName.
    +
          * Get the value of nexusUsesProxy.
     565  
          *
     566   -
          * @return the value of databaseDriverName
    +
          * @return the value of nexusUsesProxy
     567  
          */
     568   -
         public String getDatabaseDriverName() {
    -  569  0
             return databaseDriverName;
    +
         public boolean isNexusUsesProxy() {
    +  569  0
             return nexusUsesProxy;
     570  
         }
     571   @@ -1085,42 +1084,42 @@  572  
         /**
     573   -
          * Set the value of databaseDriverName.
    +
          * Set the value of nexusUsesProxy.
     574  
          *
     575   -
          * @param databaseDriverName new value of databaseDriverName
    +
          * @param nexusUsesProxy new value of nexusUsesProxy
     576  
          */
     577   -
         public void setDatabaseDriverName(String databaseDriverName) {
    -  578  0
             this.databaseDriverName = databaseDriverName;
    +
         public void setNexusUsesProxy(boolean nexusUsesProxy) {
    +  578  0
             this.nexusUsesProxy = nexusUsesProxy;
     579  0
         }
     580  
     
     581  
         /**
     582   -
          * The path to the database driver JAR file if it is not on the class path.
    +
          * The database driver name; such as org.h2.Driver.
     583  
          */
     584   -
         private String databaseDriverPath;
    +
         private String databaseDriverName;
     585  
     
     586  
         /**
     587   -
          * Get the value of databaseDriverPath.
    +
          * Get the value of databaseDriverName.
     588  
          *
     589   -
          * @return the value of databaseDriverPath
    +
          * @return the value of databaseDriverName
     590  
          */
     591   -
         public String getDatabaseDriverPath() {
    -  592  0
             return databaseDriverPath;
    +
         public String getDatabaseDriverName() {
    +  592  0
             return databaseDriverName;
     593  
         }
     594   @@ -1128,42 +1127,42 @@  595  
         /**
     596   -
          * Set the value of databaseDriverPath.
    +
          * Set the value of databaseDriverName.
     597  
          *
     598   -
          * @param databaseDriverPath new value of databaseDriverPath
    +
          * @param databaseDriverName new value of databaseDriverName
     599  
          */
     600   -
         public void setDatabaseDriverPath(String databaseDriverPath) {
    -  601  0
             this.databaseDriverPath = databaseDriverPath;
    +
         public void setDatabaseDriverName(String databaseDriverName) {
    +  601  0
             this.databaseDriverName = databaseDriverName;
     602  0
         }
     603  
     
     604  
         /**
     605   -
          * The database connection string.
    +
          * The path to the database driver JAR file if it is not on the class path.
     606  
          */
     607   -
         private String connectionString;
    +
         private String databaseDriverPath;
     608  
     
     609  
         /**
     610   -
          * Get the value of connectionString.
    +
          * Get the value of databaseDriverPath.
     611  
          *
     612   -
          * @return the value of connectionString
    +
          * @return the value of databaseDriverPath
     613  
          */
     614   -
         public String getConnectionString() {
    -  615  0
             return connectionString;
    +
         public String getDatabaseDriverPath() {
    +  615  0
             return databaseDriverPath;
     616  
         }
     617   @@ -1171,42 +1170,42 @@  618  
         /**
     619   -
          * Set the value of connectionString.
    +
          * Set the value of databaseDriverPath.
     620  
          *
     621   -
          * @param connectionString new value of connectionString
    +
          * @param databaseDriverPath new value of databaseDriverPath
     622  
          */
     623   -
         public void setConnectionString(String connectionString) {
    -  624  0
             this.connectionString = connectionString;
    +
         public void setDatabaseDriverPath(String databaseDriverPath) {
    +  624  0
             this.databaseDriverPath = databaseDriverPath;
     625  0
         }
     626  
     
     627  
         /**
     628   -
          * The user name for connecting to the database.
    +
          * The database connection string.
     629  
          */
     630   -
         private String databaseUser;
    +
         private String connectionString;
     631  
     
     632  
         /**
     633   -
          * Get the value of databaseUser.
    +
          * Get the value of connectionString.
     634  
          *
     635   -
          * @return the value of databaseUser
    +
          * @return the value of connectionString
     636  
          */
     637   -
         public String getDatabaseUser() {
    -  638  0
             return databaseUser;
    +
         public String getConnectionString() {
    +  638  0
             return connectionString;
     639  
         }
     640   @@ -1214,42 +1213,42 @@  641  
         /**
     642   -
          * Set the value of databaseUser.
    +
          * Set the value of connectionString.
     643  
          *
     644   -
          * @param databaseUser new value of databaseUser
    +
          * @param connectionString new value of connectionString
     645  
          */
     646   -
         public void setDatabaseUser(String databaseUser) {
    -  647  0
             this.databaseUser = databaseUser;
    +
         public void setConnectionString(String connectionString) {
    +  647  0
             this.connectionString = connectionString;
     648  0
         }
     649  
     
     650  
         /**
     651   -
          * The password to use when connecting to the database.
    +
          * The user name for connecting to the database.
     652  
          */
     653   -
         private String databasePassword;
    +
         private String databaseUser;
     654  
     
     655  
         /**
     656   -
          * Get the value of databasePassword.
    +
          * Get the value of databaseUser.
     657  
          *
     658   -
          * @return the value of databasePassword
    +
          * @return the value of databaseUser
     659  
          */
     660   -
         public String getDatabasePassword() {
    -  661  0
             return databasePassword;
    +
         public String getDatabaseUser() {
    +  661  0
             return databaseUser;
     662  
         }
     663   @@ -1257,87 +1256,87 @@  664  
         /**
     665   -
          * Set the value of databasePassword.
    +
          * Set the value of databaseUser.
     666  
          *
     667   -
          * @param databasePassword new value of databasePassword
    +
          * @param databaseUser new value of databaseUser
     668  
          */
     669   -
         public void setDatabasePassword(String databasePassword) {
    -  670  0
             this.databasePassword = databasePassword;
    +
         public void setDatabaseUser(String databaseUser) {
    +  670  0
             this.databaseUser = databaseUser;
     671  0
         }
     672  
     
     673  
         /**
     674   -
          * Additional ZIP File extensions to add analyze. This should be a comma-separated list of file extensions to treat
    +
          * The password to use when connecting to the database.
     675   -
          * like ZIP files.
    +
          */
     676   -
          */
    +
         private String databasePassword;
     677   -
         private String zipExtensions;
    +
     
     678   -
     
    +
         /**
     679   -
         /**
    +
          * Get the value of databasePassword.
     680   -
          * Get the value of zipExtensions.
    +
          *
     681   -
          *
    +
          * @return the value of databasePassword
     682   -
          * @return the value of zipExtensions
    +
          */
     683   -
          */
    -  684   -
         public String getZipExtensions() {
    -  685  0
             return zipExtensions;
    -  686   +
         public String getDatabasePassword() {
    +  684  0
             return databasePassword;
    +  685  
         }
    +  686   +
     
     687   -
     
    +
         /**
     688   -
         /**
    +
          * Set the value of databasePassword.
     689   -
          * Set the value of zipExtensions.
    -  690  
          *
    +  690   +
          * @param databasePassword new value of databasePassword
     691   -
          * @param zipExtensions new value of zipExtensions
    -  692  
          */
    -  693   -
         public void setZipExtensions(String zipExtensions) {
    -  694  0
             this.zipExtensions = zipExtensions;
    -  695  0
         }
    -  696   +  692   +
         public void setDatabasePassword(String databasePassword) {
    +  693  0
             this.databasePassword = databasePassword;
    +  694  0
         }
    +  695  
     
    -  697   +  696  
         /**
    +  697   +
          * Additional ZIP File extensions to add analyze. This should be a comma-separated list of file extensions to treat
     698   -
          * The url for the modified NVD CVE (1.2 schema).
    +
          * like ZIP files.
     699  
          */
     700   -
         private String cveUrl12Modified;
    +
         private String zipExtensions;
     701  
     
     702  
         /**
     703   -
          * Get the value of cveUrl12Modified.
    +
          * Get the value of zipExtensions.
     704  
          *
     705   -
          * @return the value of cveUrl12Modified
    +
          * @return the value of zipExtensions
     706  
          */
     707   -
         public String getCveUrl12Modified() {
    -  708  0
             return cveUrl12Modified;
    +
         public String getZipExtensions() {
    +  708  0
             return zipExtensions;
     709  
         }
     710   @@ -1345,42 +1344,42 @@  711  
         /**
     712   -
          * Set the value of cveUrl12Modified.
    +
          * Set the value of zipExtensions.
     713  
          *
     714   -
          * @param cveUrl12Modified new value of cveUrl12Modified
    +
          * @param zipExtensions new value of zipExtensions
     715  
          */
     716   -
         public void setCveUrl12Modified(String cveUrl12Modified) {
    -  717  0
             this.cveUrl12Modified = cveUrl12Modified;
    +
         public void setZipExtensions(String zipExtensions) {
    +  717  0
             this.zipExtensions = zipExtensions;
     718  0
         }
     719  
     
     720  
         /**
     721   -
          * The url for the modified NVD CVE (2.0 schema).
    +
          * The url for the modified NVD CVE (1.2 schema).
     722  
          */
     723   -
         private String cveUrl20Modified;
    +
         private String cveUrl12Modified;
     724  
     
     725  
         /**
     726   -
          * Get the value of cveUrl20Modified.
    +
          * Get the value of cveUrl12Modified.
     727  
          *
     728   -
          * @return the value of cveUrl20Modified
    +
          * @return the value of cveUrl12Modified
     729  
          */
     730   -
         public String getCveUrl20Modified() {
    -  731  0
             return cveUrl20Modified;
    +
         public String getCveUrl12Modified() {
    +  731  0
             return cveUrl12Modified;
     732  
         }
     733   @@ -1388,42 +1387,42 @@  734  
         /**
     735   -
          * Set the value of cveUrl20Modified.
    +
          * Set the value of cveUrl12Modified.
     736  
          *
     737   -
          * @param cveUrl20Modified new value of cveUrl20Modified
    +
          * @param cveUrl12Modified new value of cveUrl12Modified
     738  
          */
     739   -
         public void setCveUrl20Modified(String cveUrl20Modified) {
    -  740  0
             this.cveUrl20Modified = cveUrl20Modified;
    +
         public void setCveUrl12Modified(String cveUrl12Modified) {
    +  740  0
             this.cveUrl12Modified = cveUrl12Modified;
     741  0
         }
     742  
     
     743  
         /**
     744   -
          * Base Data Mirror URL for CVE 1.2.
    +
          * The url for the modified NVD CVE (2.0 schema).
     745  
          */
     746   -
         private String cveUrl12Base;
    +
         private String cveUrl20Modified;
     747  
     
     748  
         /**
     749   -
          * Get the value of cveUrl12Base.
    +
          * Get the value of cveUrl20Modified.
     750  
          *
     751   -
          * @return the value of cveUrl12Base
    +
          * @return the value of cveUrl20Modified
     752  
          */
     753   -
         public String getCveUrl12Base() {
    -  754  0
             return cveUrl12Base;
    +
         public String getCveUrl20Modified() {
    +  754  0
             return cveUrl20Modified;
     755  
         }
     756   @@ -1431,42 +1430,42 @@  757  
         /**
     758   -
          * Set the value of cveUrl12Base.
    +
          * Set the value of cveUrl20Modified.
     759  
          *
     760   -
          * @param cveUrl12Base new value of cveUrl12Base
    +
          * @param cveUrl20Modified new value of cveUrl20Modified
     761  
          */
     762   -
         public void setCveUrl12Base(String cveUrl12Base) {
    -  763  0
             this.cveUrl12Base = cveUrl12Base;
    +
         public void setCveUrl20Modified(String cveUrl20Modified) {
    +  763  0
             this.cveUrl20Modified = cveUrl20Modified;
     764  0
         }
     765  
     
     766  
         /**
     767   -
          * Data Mirror URL for CVE 2.0.
    +
          * Base Data Mirror URL for CVE 1.2.
     768  
          */
     769   -
         private String cveUrl20Base;
    +
         private String cveUrl12Base;
     770  
     
     771  
         /**
     772   -
          * Get the value of cveUrl20Base.
    +
          * Get the value of cveUrl12Base.
     773  
          *
     774   -
          * @return the value of cveUrl20Base
    +
          * @return the value of cveUrl12Base
     775  
          */
     776   -
         public String getCveUrl20Base() {
    -  777  0
             return cveUrl20Base;
    +
         public String getCveUrl12Base() {
    +  777  0
             return cveUrl12Base;
     778  
         }
     779   @@ -1474,42 +1473,42 @@  780  
         /**
     781   -
          * Set the value of cveUrl20Base.
    +
          * Set the value of cveUrl12Base.
     782  
          *
     783   -
          * @param cveUrl20Base new value of cveUrl20Base
    +
          * @param cveUrl12Base new value of cveUrl12Base
     784  
          */
     785   -
         public void setCveUrl20Base(String cveUrl20Base) {
    -  786  0
             this.cveUrl20Base = cveUrl20Base;
    +
         public void setCveUrl12Base(String cveUrl12Base) {
    +  786  0
             this.cveUrl12Base = cveUrl12Base;
     787  0
         }
     788  
     
     789  
         /**
     790   -
          * The path to Mono for .NET assembly analysis on non-windows systems.
    +
          * Data Mirror URL for CVE 2.0.
     791  
          */
     792   -
         private String pathToMono;
    +
         private String cveUrl20Base;
     793  
     
     794  
         /**
     795   -
          * Get the value of pathToMono.
    +
          * Get the value of cveUrl20Base.
     796  
          *
     797   -
          * @return the value of pathToMono
    +
          * @return the value of cveUrl20Base
     798  
          */
     799   -
         public String getPathToMono() {
    -  800  0
             return pathToMono;
    +
         public String getCveUrl20Base() {
    +  800  0
             return cveUrl20Base;
     801  
         }
     802   @@ -1517,356 +1516,404 @@  803  
         /**
     804   -
          * Set the value of pathToMono.
    +
          * Set the value of cveUrl20Base.
     805  
          *
     806   -
          * @param pathToMono new value of pathToMono
    +
          * @param cveUrl20Base new value of cveUrl20Base
     807  
          */
     808   -
         public void setPathToMono(String pathToMono) {
    -  809  0
             this.pathToMono = pathToMono;
    +
         public void setCveUrl20Base(String cveUrl20Base) {
    +  809  0
             this.cveUrl20Base = cveUrl20Base;
     810  0
         }
     811  
     
     812  
         /**
     813   -
          * Executes the Dependency-Check on the dependent libraries.
    +
          * The path to Mono for .NET assembly analysis on non-windows systems.
     814   -
          *
    +
          */
     815   -
          * @return the Engine used to scan the dependencies.
    +
         private String pathToMono;
     816   -
          * @throws org.owasp.dependencycheck.data.nvdcve.DatabaseException thrown if there is an exception connecting to the
    +
     
     817   -
          * database
    +
         /**
     818   -
          */
    +
          * Get the value of pathToMono.
     819   -
         private Engine executeDependencyCheck() throws DatabaseException {
    -  820  0
             populateSettings();
    -  821  0
             Engine engine = null;
    -  822  0
             engine = new Engine();
    -  823  0
             engine.setDependencies(this.dependencies);
    -  824  0
             engine.analyzeDependencies();
    -  825  0
             return engine;
    -  826   -
         }
    -  827   -
     
    -  828   -
         /**
    -  829   -
          * Generates the reports for a given dependency-check engine.
    -  830  
          *
    -  831   -
          * @param engine a dependency-check engine
    -  832   -
          * @param outDirectory the directory to write the reports to
    -  833   +  820   +
          * @return the value of pathToMono
    +  821  
          */
    -  834   -
         private void generateExternalReports(Engine engine, File outDirectory) {
    -  835  0
             DatabaseProperties prop = null;
    -  836  0
             CveDB cve = null;
    -  837   -
             try {
    -  838  0
                 cve = new CveDB();
    -  839  0
                 cve.open();
    -  840  0
                 prop = cve.getDatabaseProperties();
    -  841  0
             } catch (DatabaseException ex) {
    -  842  0
                 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties", ex);
    -  843   -
             } finally {
    -  844  0
                 if (cve != null) {
    -  845  0
                     cve.close();
    -  846   -
                 }
    -  847   -
             }
    -  848  0
             final ReportGenerator r = new ReportGenerator(this.applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
    -  849   -
             try {
    -  850  0
                 r.generateReports(outDirectory.getCanonicalPath(), this.reportFormat.name());
    -  851  0
             } catch (IOException ex) {
    -  852  0
                 LOGGER.log(Level.SEVERE,
    -  853   -
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    -  854  0
                 LOGGER.log(Level.FINE, null, ex);
    -  855  0
             } catch (Throwable ex) {
    -  856  0
                 LOGGER.log(Level.SEVERE,
    -  857   -
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    -  858  0
                 LOGGER.log(Level.FINE, null, ex);
    -  859  0
             }
    -  860  0
         }
    -  861   +  822   +
         public String getPathToMono() {
    +  823  0
             return pathToMono;
    +  824   +
         }
    +  825  
     
    -  862   +  826  
         /**
    -  863   -
          * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system
    -  864   -
          * properties required to change the proxy server, port, and connection timeout.
    -  865   +  827   +
          * Set the value of pathToMono.
    +  828   +
          *
    +  829   +
          * @param pathToMono new value of pathToMono
    +  830  
          */
    +  831   +
         public void setPathToMono(String pathToMono) {
    +  832  0
             this.pathToMono = pathToMono;
    +  833  0
         }
    +  834   +
     
    +  835   +
         /**
    +  836   +
          * Executes the Dependency-Check on the dependent libraries.
    +  837   +
          *
    +  838   +
          * @return the Engine used to scan the dependencies.
    +  839   +
          * @throws org.owasp.dependencycheck.data.nvdcve.DatabaseException thrown if there is an exception connecting to the
    +  840   +
          * database
    +  841   +
          */
    +  842   +
         private Engine executeDependencyCheck() throws DatabaseException {
    +  843  0
             populateSettings();
    +  844  0
             Engine engine = null;
    +  845  0
             engine = new Engine();
    +  846  0
             engine.setDependencies(this.dependencies);
    +  847  0
             engine.analyzeDependencies();
    +  848  0
             return engine;
    +  849   +
         }
    +  850   +
     
    +  851   +
         /**
    +  852   +
          * Generates the reports for a given dependency-check engine.
    +  853   +
          *
    +  854   +
          * @param engine a dependency-check engine
    +  855   +
          * @param outDirectory the directory to write the reports to
    +  856   +
          */
    +  857   +
         private void generateExternalReports(Engine engine, File outDirectory) {
    +  858  0
             DatabaseProperties prop = null;
    +  859  0
             CveDB cve = null;
    +  860   +
             try {
    +  861  0
                 cve = new CveDB();
    +  862  0
                 cve.open();
    +  863  0
                 prop = cve.getDatabaseProperties();
    +  864  0
             } catch (DatabaseException ex) {
    +  865  0
                 LOGGER.log(Level.FINE, "Unable to retrieve DB Properties", ex);
     866   -
         private void populateSettings() {
    -  867  0
             Settings.initialize();
    -  868  0
             if (dataDirectory != null) {
    -  869  0
                 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
    +
             } finally {
    +  867  0
                 if (cve != null) {
    +  868  0
                     cve.close();
    +  869   +
                 }
     870   -
             } else {
    -  871  0
                 final File jarPath = new File(DependencyCheckScanAgent.class.getProtectionDomain().getCodeSource().getLocation().getPath());
    -  872  0
                 final File base = jarPath.getParentFile();
    -  873  0
                 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
    -  874  0
                 final File dataDir = new File(base, sub);
    -  875  0
                 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
    +
             }
    +  871  0
             final ReportGenerator r = new ReportGenerator(this.applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
    +  872   +
             try {
    +  873  0
                 r.generateReports(outDirectory.getCanonicalPath(), this.reportFormat.name());
    +  874  0
             } catch (IOException ex) {
    +  875  0
                 LOGGER.log(Level.SEVERE,
     876   -
             }
    -  877   +
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    +  877  0
                 LOGGER.log(Level.FINE, null, ex);
    +  878  0
             } catch (Throwable ex) {
    +  879  0
                 LOGGER.log(Level.SEVERE,
    +  880   +
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    +  881  0
                 LOGGER.log(Level.FINE, null, ex);
    +  882  0
             }
    +  883  0
         }
    +  884  
     
    -  878  0
             Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
    -  879   -
     
    -  880  0
             if (proxyServer != null && !proxyServer.isEmpty()) {
    -  881  0
                 Settings.setString(Settings.KEYS.PROXY_SERVER, proxyServer);
    -  882   -
             }
    -  883  0
             if (proxyPort != null && !proxyPort.isEmpty()) {
    -  884  0
                 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
     885   -
             }
    -  886  0
             if (proxyUsername != null && !proxyUsername.isEmpty()) {
    -  887  0
                 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
    +
         /**
    +  886   +
          * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system
    +  887   +
          * properties required to change the proxy server, port, and connection timeout.
     888   +
          */
    +  889   +
         private void populateSettings() {
    +  890  0
             Settings.initialize();
    +  891  0
             if (dataDirectory != null) {
    +  892  0
                 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
    +  893   +
             } else {
    +  894  0
                 final File jarPath = new File(DependencyCheckScanAgent.class.getProtectionDomain().getCodeSource().getLocation().getPath());
    +  895  0
                 final File base = jarPath.getParentFile();
    +  896  0
                 final String sub = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
    +  897  0
                 final File dataDir = new File(base, sub);
    +  898  0
                 Settings.setString(Settings.KEYS.DATA_DIRECTORY, dataDir.getAbsolutePath());
    +  899  
             }
    -  889  0
             if (proxyPassword != null && !proxyPassword.isEmpty()) {
    -  890  0
                 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
    -  891   -
             }
    -  892  0
             if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
    -  893  0
                 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
    -  894   -
             }
    -  895  0
             if (suppressionFile != null && !suppressionFile.isEmpty()) {
    -  896  0
                 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
    -  897   -
             }
    -  898  0
             Settings.setBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled);
    -  899  0
             if (centralUrl != null && !centralUrl.isEmpty()) {
    -  900  0
                 Settings.setString(Settings.KEYS.ANALYZER_CENTRAL_URL, centralUrl);
    -  901   -
             }
    -  902  0
             Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
    -  903  0
             if (nexusUrl != null && !nexusUrl.isEmpty()) {
    -  904  0
                 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
    +  900   +
     
    +  901  0
             Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
    +  902   +
     
    +  903  0
             if (proxyServer != null && !proxyServer.isEmpty()) {
    +  904  0
                 Settings.setString(Settings.KEYS.PROXY_SERVER, proxyServer);
     905  
             }
    -  906  0
             Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
    -  907  0
             if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
    -  908  0
                 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
    -  909   +  906  0
             if (proxyPort != null && !proxyPort.isEmpty()) {
    +  907  0
                 Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);
    +  908  
             }
    -  910  0
             if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
    -  911  0
                 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
    -  912   +  909  0
             if (proxyUsername != null && !proxyUsername.isEmpty()) {
    +  910  0
                 Settings.setString(Settings.KEYS.PROXY_USERNAME, proxyUsername);
    +  911  
             }
    -  913  0
             if (connectionString != null && !connectionString.isEmpty()) {
    -  914  0
                 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
    -  915   +  912  0
             if (proxyPassword != null && !proxyPassword.isEmpty()) {
    +  913  0
                 Settings.setString(Settings.KEYS.PROXY_PASSWORD, proxyPassword);
    +  914  
             }
    -  916  0
             if (databaseUser != null && !databaseUser.isEmpty()) {
    -  917  0
                 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
    -  918   +  915  0
             if (connectionTimeout != null && !connectionTimeout.isEmpty()) {
    +  916  0
                 Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
    +  917  
             }
    -  919  0
             if (databasePassword != null && !databasePassword.isEmpty()) {
    -  920  0
                 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
    -  921   +  918  0
             if (suppressionFile != null && !suppressionFile.isEmpty()) {
    +  919  0
                 Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
    +  920  
             }
    -  922  0
             if (zipExtensions != null && !zipExtensions.isEmpty()) {
    -  923  0
                 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
    +  921  0
             Settings.setBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled);
    +  922  0
             if (centralUrl != null && !centralUrl.isEmpty()) {
    +  923  0
                 Settings.setString(Settings.KEYS.ANALYZER_CENTRAL_URL, centralUrl);
     924  
             }
    -  925  0
             if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
    -  926  0
                 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
    -  927   +  925  0
             Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
    +  926  0
             if (nexusUrl != null && !nexusUrl.isEmpty()) {
    +  927  0
                 Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
    +  928  
             }
    -  928  0
             if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
    -  929  0
                 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
    -  930   +  929  0
             Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY, nexusUsesProxy);
    +  930  0
             if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
    +  931  0
                 Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
    +  932  
             }
    -  931  0
             if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
    -  932  0
                 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
    -  933   +  933  0
             if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
    +  934  0
                 Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
    +  935  
             }
    -  934  0
             if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
    -  935  0
                 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
    -  936   +  936  0
             if (connectionString != null && !connectionString.isEmpty()) {
    +  937  0
                 Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
    +  938  
             }
    -  937  0
             if (pathToMono != null && !pathToMono.isEmpty()) {
    -  938  0
                 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
    -  939   -
             }
    -  940  0
         }
    +  939  0
             if (databaseUser != null && !databaseUser.isEmpty()) {
    +  940  0
                 Settings.setString(Settings.KEYS.DB_USER, databaseUser);
     941   -
     
    -  942   -
         /**
    -  943   -
          * Executes the dependency-check and generates the report.
    +
             }
    +  942  0
             if (databasePassword != null && !databasePassword.isEmpty()) {
    +  943  0
                 Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
     944   -
          *
    -  945   -
          * @throws org.owasp.dependencycheck.exception.ScanAgentException thrown if there is an exception executing the
    -  946   -
          * scan.
    +
             }
    +  945  0
             if (zipExtensions != null && !zipExtensions.isEmpty()) {
    +  946  0
                 Settings.setString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
     947   -
          */
    -  948   -
         public void execute() throws ScanAgentException {
    -  949  0
             Engine engine = null;
    +
             }
    +  948  0
             if (cveUrl12Modified != null && !cveUrl12Modified.isEmpty()) {
    +  949  0
                 Settings.setString(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
     950   -
             try {
    -  951  0
                 engine = executeDependencyCheck();
    -  952  0
                 generateExternalReports(engine, new File(this.reportOutputDirectory));
    -  953  0
                 if (this.showSummary) {
    -  954  0
                     showSummary(engine.getDependencies());
    -  955   -
                 }
    -  956  0
                 if (this.failBuildOnCVSS <= 10) {
    -  957  0
                     checkForFailure(engine.getDependencies());
    -  958   -
                 }
    -  959  0
             } catch (DatabaseException ex) {
    -  960  0
                 LOGGER.log(Level.SEVERE,
    -  961   -
                         "Unable to connect to the dependency-check database; analysis has stopped");
    -  962  0
                 LOGGER.log(Level.FINE, "", ex);
    -  963   -
             } finally {
    -  964  0
                 Settings.cleanup(true);
    -  965  0
                 if (engine != null) {
    -  966  0
                     engine.cleanup();
    +
             }
    +  951  0
             if (cveUrl20Modified != null && !cveUrl20Modified.isEmpty()) {
    +  952  0
                 Settings.setString(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
    +  953   +
             }
    +  954  0
             if (cveUrl12Base != null && !cveUrl12Base.isEmpty()) {
    +  955  0
                 Settings.setString(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
    +  956   +
             }
    +  957  0
             if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) {
    +  958  0
                 Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
    +  959   +
             }
    +  960  0
             if (pathToMono != null && !pathToMono.isEmpty()) {
    +  961  0
                 Settings.setString(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
    +  962   +
             }
    +  963  0
         }
    +  964   +
     
    +  965   +
         /**
    +  966   +
          * Executes the dependency-check and generates the report.
     967   -
                 }
    +
          *
     968   -
             }
    -  969  0
         }
    -  970   -
     
    -  971   -
         /**
    -  972   -
          * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the
    -  973   -
          * configuration.
    -  974   -
          *
    -  975   -
          * @param dependencies the list of dependency objects
    -  976  
          * @throws org.owasp.dependencycheck.exception.ScanAgentException thrown if there is an exception executing the
    -  977   +  969  
          * scan.
    -  978   +  970  
          */
    -  979   -
         private void checkForFailure(List<Dependency> dependencies) throws ScanAgentException {
    -  980  0
             final StringBuilder ids = new StringBuilder();
    -  981  0
             for (Dependency d : dependencies) {
    -  982  0
                 boolean addName = true;
    -  983  0
                 for (Vulnerability v : d.getVulnerabilities()) {
    -  984  0
                     if (v.getCvssScore() >= failBuildOnCVSS) {
    -  985  0
                         if (addName) {
    -  986  0
                             addName = false;
    -  987  0
                             ids.append(NEW_LINE).append(d.getFileName()).append(": ");
    -  988  0
                             ids.append(v.getName());
    -  989   -
                         } else {
    -  990  0
                             ids.append(", ").append(v.getName());
    -  991   -
                         }
    -  992   -
                     }
    -  993  0
                 }
    -  994  0
             }
    -  995  0
             if (ids.length() > 0) {
    -  996  0
                 final String msg = String.format("%n%nDependency-Check Failure:%n"
    -  997   -
                         + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
    -  998   -
                         + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString());
    -  999   -
     
    -  1000  0
                 throw new ScanAgentException(msg);
    -  1001   -
             }
    -  1002  0
         }
    -  1003   -
     
    -  1004   -
         /**
    -  1005   -
          * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries.
    -  1006   -
          *
    -  1007   -
          * @param dependencies a list of dependency objects
    -  1008   -
          */
    -  1009   -
         private void showSummary(List<Dependency> dependencies) {
    -  1010  0
             final StringBuilder summary = new StringBuilder();
    -  1011  0
             for (Dependency d : dependencies) {
    -  1012  0
                 boolean firstEntry = true;
    -  1013  0
                 final StringBuilder ids = new StringBuilder();
    -  1014  0
                 for (Vulnerability v : d.getVulnerabilities()) {
    -  1015  0
                     if (firstEntry) {
    -  1016  0
                         firstEntry = false;
    -  1017   -
                     } else {
    -  1018  0
                         ids.append(", ");
    -  1019   -
                     }
    -  1020  0
                     ids.append(v.getName());
    -  1021  0
                 }
    -  1022  0
                 if (ids.length() > 0) {
    -  1023  0
                     summary.append(d.getFileName()).append(" (");
    -  1024  0
                     firstEntry = true;
    -  1025  0
                     for (Identifier id : d.getIdentifiers()) {
    -  1026  0
                         if (firstEntry) {
    -  1027  0
                             firstEntry = false;
    -  1028   -
                         } else {
    -  1029  0
                             summary.append(", ");
    -  1030   -
                         }
    -  1031  0
                         summary.append(id.getValue());
    -  1032  0
                     }
    -  1033  0
                     summary.append(") : ").append(ids).append(NEW_LINE);
    -  1034   +  971   +
         public Engine execute() throws ScanAgentException {
    +  972  0
             Engine engine = null;
    +  973   +
             try {
    +  974  0
                 engine = executeDependencyCheck();
    +  975  0
                 if (this.generateReport) {
    +  976  0
                     generateExternalReports(engine, new File(this.reportOutputDirectory));
    +  977  
                 }
    -  1035  0
             }
    -  1036  0
             if (summary.length() > 0) {
    -  1037  0
                 final String msg = String.format("%n%n"
    -  1038   -
                         + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
    -  1039   -
                         + "%n%nSee the dependency-check report for more details.%n%n", summary.toString());
    -  1040  0
                 LOGGER.log(Level.WARNING, msg);
    -  1041   +  978  0
                 if (this.showSummary) {
    +  979  0
                     showSummary(engine.getDependencies());
    +  980   +
                 }
    +  981  0
                 if (this.failBuildOnCVSS <= 10) {
    +  982  0
                     checkForFailure(engine.getDependencies());
    +  983   +
                 }
    +  984  0
             } catch (DatabaseException ex) {
    +  985  0
                 LOGGER.log(Level.SEVERE,
    +  986   +
                         "Unable to connect to the dependency-check database; analysis has stopped");
    +  987  0
                 LOGGER.log(Level.FINE, "", ex);
    +  988   +
             } finally {
    +  989  0
                 Settings.cleanup(true);
    +  990  0
                 if (engine != null) {
    +  991  0
                     engine.cleanup();
    +  992   +
                 }
    +  993  
             }
    -  1042  0
         }
    -  1043   +  994  0
             return engine;
    +  995   +
         }
    +  996  
     
    -  1044   +  997   +
         /**
    +  998   +
          * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the
    +  999   +
          * configuration.
    +  1000   +
          *
    +  1001   +
          * @param dependencies the list of dependency objects
    +  1002   +
          * @throws org.owasp.dependencycheck.exception.ScanAgentException thrown if there is an exception executing the
    +  1003   +
          * scan.
    +  1004   +
          */
    +  1005   +
         private void checkForFailure(List<Dependency> dependencies) throws ScanAgentException {
    +  1006  0
             final StringBuilder ids = new StringBuilder();
    +  1007  0
             for (Dependency d : dependencies) {
    +  1008  0
                 boolean addName = true;
    +  1009  0
                 for (Vulnerability v : d.getVulnerabilities()) {
    +  1010  0
                     if (v.getCvssScore() >= failBuildOnCVSS) {
    +  1011  0
                         if (addName) {
    +  1012  0
                             addName = false;
    +  1013  0
                             ids.append(NEW_LINE).append(d.getFileName()).append(": ");
    +  1014  0
                             ids.append(v.getName());
    +  1015   +
                         } else {
    +  1016  0
                             ids.append(", ").append(v.getName());
    +  1017   +
                         }
    +  1018   +
                     }
    +  1019  0
                 }
    +  1020  0
             }
    +  1021  0
             if (ids.length() > 0) {
    +  1022  0
                 final String msg = String.format("%n%nDependency-Check Failure:%n"
    +  1023   +
                         + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
    +  1024   +
                         + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString());
    +  1025   +
     
    +  1026  0
                 throw new ScanAgentException(msg);
    +  1027   +
             }
    +  1028  0
         }
    +  1029   +
     
    +  1030   +
         /**
    +  1031   +
          * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries.
    +  1032   +
          *
    +  1033   +
          * @param dependencies a list of dependency objects
    +  1034   +
          */
    +  1035   +
         private void showSummary(List<Dependency> dependencies) {
    +  1036  0
             final StringBuilder summary = new StringBuilder();
    +  1037  0
             for (Dependency d : dependencies) {
    +  1038  0
                 boolean firstEntry = true;
    +  1039  0
                 final StringBuilder ids = new StringBuilder();
    +  1040  0
                 for (Vulnerability v : d.getVulnerabilities()) {
    +  1041  0
                     if (firstEntry) {
    +  1042  0
                         firstEntry = false;
    +  1043   +
                     } else {
    +  1044  0
                         ids.append(", ");
    +  1045   +
                     }
    +  1046  0
                     ids.append(v.getName());
    +  1047  0
                 }
    +  1048  0
                 if (ids.length() > 0) {
    +  1049  0
                     summary.append(d.getFileName()).append(" (");
    +  1050  0
                     firstEntry = true;
    +  1051  0
                     for (Identifier id : d.getIdentifiers()) {
    +  1052  0
                         if (firstEntry) {
    +  1053  0
                             firstEntry = false;
    +  1054   +
                         } else {
    +  1055  0
                             summary.append(", ");
    +  1056   +
                         }
    +  1057  0
                         summary.append(id.getValue());
    +  1058  0
                     }
    +  1059  0
                     summary.append(") : ").append(ids).append(NEW_LINE);
    +  1060   +
                 }
    +  1061  0
             }
    +  1062  0
             if (summary.length() > 0) {
    +  1063  0
                 final String msg = String.format("%n%n"
    +  1064   +
                         + "One or more dependencies were identified with known vulnerabilities:%n%n%s"
    +  1065   +
                         + "%n%nSee the dependency-check report for more details.%n%n", summary.toString());
    +  1066  0
                 LOGGER.log(Level.WARNING, msg);
    +  1067   +
             }
    +  1068  0
         }
    +  1069   +
     
    +  1070  
     }
    - + 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 727375ce9..803aed169 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html @@ -60,7 +60,7 @@  21  
      *
     22   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     23  
      */
     24  62
     public abstract class AbstractAnalyzer implements Analyzer {
    @@ -106,6 +106,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html index c22a5a380..2f7e1a478 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html @@ -84,7 +84,7 @@  33  
      *
     34   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     35  
      */
     36   @@ -450,6 +450,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html index ff85fd6a2..00a803ce2 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html @@ -98,7 +98,7 @@  40  
      *
     41   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     42  
      */
     43  8
     public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer {
    @@ -314,6 +314,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html index 155e986d1..9ae6a47a3 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25  14
     public enum AnalysisPhase {
    @@ -135,6 +135,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html index 6c38de2e3..8b46fdc06 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html @@ -72,7 +72,7 @@  27  
      *
     28   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     29  
      */
     30   @@ -161,6 +161,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html index 83d26268f..575f0b6b3 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html @@ -70,7 +70,7 @@  26  
      *
     27   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     28  
      */
     29   @@ -121,6 +121,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html index 0ddd2496c..71abcf3c4 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html @@ -130,7 +130,7 @@  56  
      *
     57   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     58  
      */
     59  2
     public class ArchiveAnalyzer extends AbstractFileTypeAnalyzer {
    @@ -803,6 +803,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html index e38382ef1..bd34a5b7e 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html @@ -544,6 +544,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html index 7ea1b3398..37589715c 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html @@ -132,7 +132,7 @@  56  
      *
     57   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     58  
      */
     59  2
     public class CPEAnalyzer implements Analyzer {
    @@ -366,15 +366,15 @@
                     }
     191  6
                     boolean identifierAdded = false;
     192  6
                     for (IndexEntry e : entries) {
    -  193  43
                         LOGGER.fine(String.format("Verifying entry: %s", e.toString()));
    -  194  43
                         if (verifyEntry(e, dependency)) {
    +  193  47
                         LOGGER.fine(String.format("Verifying entry: %s", e.toString()));
    +  194  47
                         if (verifyEntry(e, dependency)) {
     195  2
                             final String vendor = e.getVendor();
     196  2
                             final String product = e.getProduct();
     197  2
                             LOGGER.fine(String.format("identified vendor/product: %s/%s", vendor, product));
     198  2
                             identifierAdded |= determineIdentifiers(dependency, vendor, product, confidence);
     199  
                         }
    -  200  43
                     }
    +  200  47
                     }
     201  6
                     if (identifierAdded) {
     202  1
                         break;
     203   @@ -412,26 +412,26 @@  220  11
             final StringBuilder sb = new StringBuilder(txt.length() + (20 * ec.size()));
     221  11
             sb.append(' ').append(txt).append(' ');
     222  11
             for (Evidence e : ec.iterator(confidenceFilter)) {
    -  223  40
                 String value = e.getValue();
    +  223  42
                 String value = e.getValue();
     224  
     
     225  
                 //hack to get around the fact that lucene does a really good job of recognizing domains and not
     226  
                 // splitting them. TODO - put together a better lucene analyzer specific to the domain.
    -  227  40
                 if (value.startsWith("http://")) {
    +  227  42
                 if (value.startsWith("http://")) {
     228  2
                     value = value.substring(7).replaceAll("\\.", " ");
     229  
                 }
    -  230  40
                 if (value.startsWith("https://")) {
    +  230  42
                 if (value.startsWith("https://")) {
     231  0
                     value = value.substring(8).replaceAll("\\.", " ");
     232  
                 }
    -  233  40
                 if (sb.indexOf(" " + value + " ") < 0) {
    -  234  35
                     sb.append(value).append(' ');
    +  233  42
                 if (sb.indexOf(" " + value + " ") < 0) {
    +  234  37
                     sb.append(value).append(' ');
     235  
                 }
    -  236  40
             }
    +  236  42
             }
     237  11
             return sb.toString().trim();
     238  
         }
    @@ -486,13 +486,13 @@  265  6
                 final TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);
     266  156
                 for (ScoreDoc d : docs.scoreDocs) {
     267  150
                     if (d.score >= 0.08) {
    -  268  43
                         final Document doc = cpe.getDocument(d.doc);
    -  269  43
                         final IndexEntry entry = new IndexEntry();
    -  270  43
                         entry.setVendor(doc.get(Fields.VENDOR));
    -  271  43
                         entry.setProduct(doc.get(Fields.PRODUCT));
    -  272  43
                         entry.setSearchScore(d.score);
    -  273  43
                         if (!ret.contains(entry)) {
    -  274  43
                             ret.add(entry);
    +  268  47
                         final Document doc = cpe.getDocument(d.doc);
    +  269  47
                         final IndexEntry entry = new IndexEntry();
    +  270  47
                         entry.setVendor(doc.get(Fields.VENDOR));
    +  271  47
                         entry.setProduct(doc.get(Fields.PRODUCT));
    +  272  47
                         entry.setSearchScore(d.score);
    +  273  47
                         if (!ret.contains(entry)) {
    +  274  47
                             ret.add(entry);
     275  
                         }
     276   @@ -606,12 +606,12 @@  343  
             } else {
     344  12
                 final StringTokenizer tokens = new StringTokenizer(cleanText);
    -  345  111
                 while (tokens.hasMoreElements()) {
    -  346  99
                     final String word = tokens.nextToken();
    -  347  99
                     String temp = null;
    -  348  99
                     for (String weighted : weightedText) {
    -  349  221
                         final String weightedStr = cleanseText(weighted);
    -  350  221
                         if (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {
    +  345  159
                 while (tokens.hasMoreElements()) {
    +  346  147
                     final String word = tokens.nextToken();
    +  347  147
                     String temp = null;
    +  348  147
                     for (String weighted : weightedText) {
    +  349  341
                         final String weightedStr = cleanseText(weighted);
    +  350  341
                         if (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {
     351  22
                             temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;
     352  22
                             if (!word.equalsIgnoreCase(weightedStr)) {
     353  0
                                 temp += " " + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;
    @@ -619,13 +619,13 @@
                             }
     355  
                         }
    -  356  221
                     }
    -  357  99
                     if (temp == null) {
    -  358  77
                         temp = LuceneUtils.escapeLuceneQuery(word);
    +  356  341
                     }
    +  357  147
                     if (temp == null) {
    +  358  125
                         temp = LuceneUtils.escapeLuceneQuery(word);
     359  
                     }
    -  360  99
                     sb.append(" ").append(temp);
    -  361  99
                 }
    +  360  147
                     sb.append(" ").append(temp);
    +  361  147
                 }
     362  
             }
     363  12
             sb.append(" ) ");
    @@ -648,7 +648,7 @@
          */
     373  
         private String cleanseText(String text) {
    -  374  233
             return text.replaceAll(CLEANSE_CHARACTER_RX, " ");
    +  374  353
             return text.replaceAll(CLEANSE_CHARACTER_RX, " ");
     375  
         }
     376   @@ -669,15 +669,15 @@
          */
     384  
         private boolean equalsIgnoreCaseAndNonAlpha(String l, String r) {
    -  385  221
             if (l == null || r == null) {
    +  385  341
             if (l == null || r == null) {
     386  0
                 return false;
     387  
             }
     388  
     
    -  389  221
             final String left = l.replaceAll(CLEANSE_NONALPHA_RX, "");
    -  390  221
             final String right = r.replaceAll(CLEANSE_NONALPHA_RX, "");
    -  391  221
             return left.equalsIgnoreCase(right);
    +  389  341
             final String left = l.replaceAll(CLEANSE_NONALPHA_RX, "");
    +  390  341
             final String right = r.replaceAll(CLEANSE_NONALPHA_RX, "");
    +  391  341
             return left.equalsIgnoreCase(right);
     392  
         }
     393   @@ -700,10 +700,10 @@
          */
     402  
         private boolean verifyEntry(final IndexEntry entry, final Dependency dependency) {
    -  403  43
             boolean isValid = false;
    +  403  47
             boolean isValid = false;
     404  
     
    -  405  43
             if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
    +  405  47
             if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
     406  
                     && collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {
     407   @@ -711,7 +711,7 @@  408  2
                 isValid = true;
     409  
             }
    -  410  43
             return isValid;
    +  410  47
             return isValid;
     411  
         }
     412   @@ -756,14 +756,14 @@
             //</editor-fold>
     432  
             //TODO - likely need to change the split... not sure if this will work for CPE with special chars
    -  433  45
             if (text == null) {
    +  433  49
             if (text == null) {
     434  0
                 return false;
     435  
             }
    -  436  45
             final String[] words = text.split("[\\s_-]");
    -  437  45
             final List<String> list = new ArrayList<String>();
    -  438  45
             String tempWord = null;
    -  439  167
             for (String word : words) {
    +  436  49
             final String[] words = text.split("[\\s_-]");
    +  437  49
             final List<String> list = new ArrayList<String>();
    +  438  49
             String tempWord = null;
    +  439  187
             for (String word : words) {
     440  
                 /*
     441   @@ -772,28 +772,28 @@
                  so { "m", "core", "sample" } -> { "mcore", "sample" }
     443  
                  */
    -  444  122
                 if (tempWord != null) {
    -  445  2
                     list.add(tempWord + word);
    -  446  2
                     tempWord = null;
    -  447  120
                 } else if (word.length() <= 2) {
    -  448  2
                     tempWord = word;
    +  444  138
                 if (tempWord != null) {
    +  445  6
                     list.add(tempWord + word);
    +  446  6
                     tempWord = null;
    +  447  132
                 } else if (word.length() <= 2) {
    +  448  6
                     tempWord = word;
     449  
                 } else {
    -  450  118
                     list.add(word);
    +  450  126
                     list.add(word);
     451  
                 }
     452  
             }
    -  453  45
             if (tempWord != null && !list.isEmpty()) {
    +  453  49
             if (tempWord != null && !list.isEmpty()) {
     454  0
                 final String tmp = list.get(list.size() - 1) + tempWord;
     455  0
                 list.add(tmp);
     456  
             }
    -  457  45
             boolean contains = true;
    -  458  45
             for (String word : list) {
    -  459  120
                 contains &= ec.containsUsedString(word);
    -  460  120
             }
    -  461  45
             return contains;
    +  457  49
             boolean contains = true;
    +  458  49
             for (String word : list) {
    +  459  132
                 contains &= ec.containsUsedString(word);
    +  460  132
             }
    +  461  49
             return contains;
     462  
         }
     463   @@ -1286,6 +1286,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html index 195702b54..f14e365c7 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html @@ -12,7 +12,7 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    CentralAnalyzer
    26%
    18/69
    13%
    4/30
    3.625
    CentralAnalyzer
    25%
    17/68
    13%
    4/30
    3.625
     
    @@ -88,7 +88,7 @@  35  
     import org.owasp.dependencycheck.dependency.Evidence;
     36   -
     import org.owasp.dependencycheck.jaxb.pom.PomUtils;
    +
     import org.owasp.dependencycheck.xml.pom.PomUtils;
     37  
     import org.owasp.dependencycheck.utils.DownloadFailedException;
     38   @@ -171,271 +171,264 @@  79  
         /**
     80   -
          * Utility to read POM files.
    +
          * Field indicating if the analyzer is enabled.
     81  
          */
    -  82  2
         private PomUtils pomUtil = new PomUtils();
    +  82  2
         private final boolean enabled = checkEnabled();
     83   -
         /**
    +
     
     84   -
          * Field indicating if the analyzer is enabled.
    +
         /**
     85   -
          */
    -  86  2
         private final boolean enabled = checkEnabled();
    -  87   -
     
    -  88   -
         /**
    -  89  
          * Determine whether to enable this analyzer or not.
    -  90   +  86  
          *
    -  91   +  87  
          * @return whether the analyzer should be enabled
    -  92   +  88  
          */
    -  93   +  89  
         @Override
    -  94   +  90  
         public boolean isEnabled() {
    -  95  0
             return enabled;
    -  96   +  91  0
             return enabled;
    +  92  
         }
    -  97   +  93  
     
    -  98   +  94  
         /**
    -  99   +  95  
          * Determines if this analyzer is enabled.
    -  100   +  96  
          *
    -  101   +  97  
          * @return <code>true</code> if the analyzer is enabled; otherwise <code>false</code>
    -  102   +  98  
          */
    -  103   +  99  
         private boolean checkEnabled() {
    -  104  2
             boolean retval = false;
    +  100  2
             boolean retval = false;
    +  101   +
     
    +  102   +
             try {
    +  103  2
                 if (Settings.getBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED)) {
    +  104  1
                     if (!Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED)
     105   -
     
    -  106   -
             try {
    -  107  2
                 if (Settings.getBoolean(Settings.KEYS.ANALYZER_CENTRAL_ENABLED)) {
    -  108  1
                     if (!Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED)
    -  109  
                             || NexusAnalyzer.DEFAULT_URL.equals(Settings.getString(Settings.KEYS.ANALYZER_NEXUS_URL))) {
    -  110  1
                         LOGGER.fine("Enabling the Central analyzer");
    -  111  1
                         retval = true;
    -  112   +  106  1
                         LOGGER.fine("Enabling the Central analyzer");
    +  107  1
                         retval = true;
    +  108  
                     } else {
    -  113  0
                         LOGGER.info("Nexus analyzer is enabled, disabling the Central Analyzer");
    -  114   +  109  0
                         LOGGER.info("Nexus analyzer is enabled, disabling the Central Analyzer");
    +  110  
                     }
    -  115   +  111  
                 } else {
    -  116  1
                     LOGGER.info("Central analyzer disabled");
    -  117   +  112  1
                     LOGGER.info("Central analyzer disabled");
    +  113  
                 }
    -  118  0
             } catch (InvalidSettingException ise) {
    -  119  0
                 LOGGER.warning("Invalid setting. Disabling the Central analyzer");
    -  120  2
             }
    -  121  2
             return retval;
    -  122   +  114  0
             } catch (InvalidSettingException ise) {
    +  115  0
                 LOGGER.warning("Invalid setting. Disabling the Central analyzer");
    +  116  2
             }
    +  117  2
             return retval;
    +  118  
         }
    -  123   +  119  
     
    -  124   +  120  
         /**
    -  125   +  121  
          * Initializes the analyzer once before any analysis is performed.
    -  126   +  122  
          *
    -  127   +  123  
          * @throws Exception if there's an error during initialization
    -  128   +  124  
          */
    -  129   +  125  
         @Override
    -  130   +  126  
         public void initializeFileTypeAnalyzer() throws Exception {
    -  131  0
             LOGGER.fine("Initializing Central analyzer");
    -  132  0
             LOGGER.fine(String.format("Central analyzer enabled: %s", isEnabled()));
    -  133  0
             if (isEnabled()) {
    -  134  0
                 final String searchUrl = Settings.getString(Settings.KEYS.ANALYZER_CENTRAL_URL);
    -  135  0
                 LOGGER.fine(String.format("Central Analyzer URL: %s", searchUrl));
    -  136  0
                 searcher = new CentralSearch(new URL(searchUrl));
    +  127  0
             LOGGER.fine("Initializing Central analyzer");
    +  128  0
             LOGGER.fine(String.format("Central analyzer enabled: %s", isEnabled()));
    +  129  0
             if (isEnabled()) {
    +  130  0
                 final String searchUrl = Settings.getString(Settings.KEYS.ANALYZER_CENTRAL_URL);
    +  131  0
                 LOGGER.fine(String.format("Central Analyzer URL: %s", searchUrl));
    +  132  0
                 searcher = new CentralSearch(new URL(searchUrl));
    +  133   +
             }
    +  134  0
         }
    +  135   +
     
    +  136   +
         /**
     137   -
             }
    -  138  0
         }
    -  139   -
     
    -  140   -
         /**
    -  141  
          * Returns the analyzer's name.
    -  142   +  138  
          *
    -  143   +  139  
          * @return the name of the analyzer
    -  144   +  140  
          */
    -  145   +  141  
         @Override
    -  146   +  142  
         public String getName() {
    -  147  4
             return ANALYZER_NAME;
    -  148   +  143  4
             return ANALYZER_NAME;
    +  144  
         }
    -  149   +  145  
     
    -  150   +  146  
         /**
    -  151   +  147  
          * Returns the key used in the properties file to to reference the analyzer's enabled property.
    -  152   +  148  
          *
    -  153   +  149  
          * @return the analyzer's enabled property setting key.
    -  154   +  150  
          */
    -  155   +  151  
         @Override
    -  156   +  152  
         protected String getAnalyzerEnabledSettingKey() {
    -  157  2
             return Settings.KEYS.ANALYZER_CENTRAL_ENABLED;
    -  158   +  153  2
             return Settings.KEYS.ANALYZER_CENTRAL_ENABLED;
    +  154  
         }
    -  159   +  155  
     
    -  160   +  156  
         /**
    -  161   +  157  
          * Returns the analysis phase under which the analyzer runs.
    -  162   +  158  
          *
    -  163   +  159  
          * @return the phase under which the analyzer runs
    -  164   +  160  
          */
    -  165   +  161  
         @Override
    -  166   +  162  
         public AnalysisPhase getAnalysisPhase() {
    -  167  1
             return ANALYSIS_PHASE;
    -  168   +  163  1
             return ANALYSIS_PHASE;
    +  164  
         }
    -  169   +  165  
     
    -  170   +  166  
         /**
    -  171   +  167  
          * Returns the extensions for which this Analyzer runs.
    -  172   +  168  
          *
    -  173   +  169  
          * @return the extensions for which this Analyzer runs
    -  174   +  170  
          */
    -  175   +  171  
         @Override
    -  176   +  172  
         public Set<String> getSupportedExtensions() {
    -  177  0
             return SUPPORTED_EXTENSIONS;
    -  178   +  173  0
             return SUPPORTED_EXTENSIONS;
    +  174  
         }
    -  179   +  175  
     
    -  180   +  176  
         /**
    -  181   +  177  
          * Performs the analysis.
    -  182   +  178  
          *
    -  183   +  179  
          * @param dependency the dependency to analyze
    -  184   +  180  
          * @param engine the engine
    -  185   +  181  
          * @throws AnalysisException when there's an exception during analysis
    -  186   +  182  
          */
    -  187   +  183  
         @Override
    -  188   +  184  
         public void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException {
    -  189  0
             if (errorFlag || !isEnabled()) {
    -  190  0
                 return;
    -  191   +  185  0
             if (errorFlag || !isEnabled()) {
    +  186  0
                 return;
    +  187  
             }
    -  192   +  188  
     
    -  193   +  189  
             try {
    -  194  0
                 final List<MavenArtifact> mas = searcher.searchSha1(dependency.getSha1sum());
    -  195  0
                 final Confidence confidence = mas.size() > 1 ? Confidence.HIGH : Confidence.HIGHEST;
    -  196  0
                 for (MavenArtifact ma : mas) {
    -  197  0
                     LOGGER.fine(String.format("Central analyzer found artifact (%s) for dependency (%s)", ma.toString(), dependency.getFileName()));
    -  198  0
                     dependency.addAsEvidence("central", ma, confidence);
    -  199  0
                     boolean pomAnalyzed = false;
    -  200  0
                     for (Evidence e : dependency.getVendorEvidence()) {
    -  201  0
                         if ("pom".equals(e.getSource())) {
    -  202  0
                             pomAnalyzed = true;
    -  203  0
                             break;
    +  190  0
                 final List<MavenArtifact> mas = searcher.searchSha1(dependency.getSha1sum());
    +  191  0
                 final Confidence confidence = mas.size() > 1 ? Confidence.HIGH : Confidence.HIGHEST;
    +  192  0
                 for (MavenArtifact ma : mas) {
    +  193  0
                     LOGGER.fine(String.format("Central analyzer found artifact (%s) for dependency (%s)", ma.toString(), dependency.getFileName()));
    +  194  0
                     dependency.addAsEvidence("central", ma, confidence);
    +  195  0
                     boolean pomAnalyzed = false;
    +  196  0
                     for (Evidence e : dependency.getVendorEvidence()) {
    +  197  0
                         if ("pom".equals(e.getSource())) {
    +  198  0
                             pomAnalyzed = true;
    +  199  0
                             break;
    +  200   +
                         }
    +  201  0
                     }
    +  202  0
                     if (!pomAnalyzed && ma.getPomUrl() != null) {
    +  203  0
                         File pomFile = null;
     204   -
                         }
    -  205  0
                     }
    -  206  0
                     if (!pomAnalyzed && ma.getPomUrl() != null) {
    -  207  0
                         File pomFile = null;
    -  208  
                         try {
    -  209  0
                             final File baseDir = Settings.getTempDirectory();
    -  210  0
                             pomFile = File.createTempFile("pom", ".xml", baseDir);
    -  211  0
                             if (!pomFile.delete()) {
    -  212  0
                                 final String msg = String.format("Unable to fetch pom.xml for %s from Central; "
    -  213   +  205  0
                             final File baseDir = Settings.getTempDirectory();
    +  206  0
                             pomFile = File.createTempFile("pom", ".xml", baseDir);
    +  207  0
                             if (!pomFile.delete()) {
    +  208  0
                                 final String msg = String.format("Unable to fetch pom.xml for %s from Central; "
    +  209  
                                         + "this could result in undetected CPE/CVEs.", dependency.getFileName());
    -  214  0
                                 LOGGER.warning(msg);
    -  215  0
                                 LOGGER.fine("Unable to delete temp file");
    +  210  0
                                 LOGGER.warning(msg);
    +  211  0
                                 LOGGER.fine("Unable to delete temp file");
    +  212   +
                             }
    +  213  0
                             LOGGER.fine(String.format("Downloading %s", ma.getPomUrl()));
    +  214  0
                             Downloader.fetchFile(new URL(ma.getPomUrl()), pomFile);
    +  215  0
                             PomUtils.analyzePOM(dependency, pomFile);
     216   -
                             }
    -  217  0
                             LOGGER.fine(String.format("Downloading %s", ma.getPomUrl()));
    -  218  0
                             Downloader.fetchFile(new URL(ma.getPomUrl()), pomFile);
    -  219  0
                             pomUtil.analyzePOM(dependency, pomFile);
    -  220  
     
    -  221  0
                         } catch (DownloadFailedException ex) {
    -  222  0
                             final String msg = String.format("Unable to download pom.xml for %s from Central; "
    -  223   +  217  0
                         } catch (DownloadFailedException ex) {
    +  218  0
                             final String msg = String.format("Unable to download pom.xml for %s from Central; "
    +  219  
                                     + "this could result in undetected CPE/CVEs.", dependency.getFileName());
    -  224  0
                             LOGGER.warning(msg);
    -  225   +  220  0
                             LOGGER.warning(msg);
    +  221  
                         } finally {
    -  226  0
                             if (pomFile != null && !FileUtils.deleteQuietly(pomFile)) {
    -  227  0
                                 pomFile.deleteOnExit();
    -  228   +  222  0
                             if (pomFile != null && !FileUtils.deleteQuietly(pomFile)) {
    +  223  0
                                 pomFile.deleteOnExit();
    +  224  
                             }
    -  229   +  225  
                         }
    -  230   +  226  
                     }
    -  231   +  227  
     
    -  232  0
                 }
    -  233  0
             } catch (IllegalArgumentException iae) {
    -  234  0
                 LOGGER.info(String.format("invalid sha1-hash on %s", dependency.getFileName()));
    -  235  0
             } catch (FileNotFoundException fnfe) {
    -  236  0
                 LOGGER.fine(String.format("Artifact not found in repository: '%s", dependency.getFileName()));
    -  237  0
             } catch (IOException ioe) {
    -  238  0
                 LOGGER.log(Level.FINE, "Could not connect to Central search", ioe);
    -  239  0
                 errorFlag = true;
    -  240  0
             }
    -  241  0
         }
    -  242   +  228  0
                 }
    +  229  0
             } catch (IllegalArgumentException iae) {
    +  230  0
                 LOGGER.info(String.format("invalid sha1-hash on %s", dependency.getFileName()));
    +  231  0
             } catch (FileNotFoundException fnfe) {
    +  232  0
                 LOGGER.fine(String.format("Artifact not found in repository: '%s", dependency.getFileName()));
    +  233  0
             } catch (IOException ioe) {
    +  234  0
                 LOGGER.log(Level.FINE, "Could not connect to Central search", ioe);
    +  235  0
                 errorFlag = true;
    +  236  0
             }
    +  237  0
         }
    +  238  
     
    -  243   +  239  
     }
    - + 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 04ef95b4c..173e956f0 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html @@ -74,7 +74,7 @@  28  
      *
     29   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     30  
      */
     31  2
     public class CpeSuppressionAnalyzer extends AbstractSuppressionAnalyzer {
    @@ -159,6 +159,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html index 671523be4..4fd98ef38 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html @@ -106,7 +106,7 @@  44  
      *
     45   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     46  
      */
     47  6
     public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Analyzer {
    @@ -716,6 +716,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html index 8728397ac..34865c449 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html @@ -98,7 +98,7 @@  40  
      *
     41   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     42  
      */
     43  5
     public class FalsePositiveAnalyzer extends AbstractAnalyzer {
    @@ -779,6 +779,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html index b1b406b14..8f20ca98b 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html @@ -80,7 +80,7 @@  31  
      *
     32   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     33  
      */
     34  7
     public class FileNameAnalyzer extends AbstractAnalyzer implements Analyzer {
    @@ -228,6 +228,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html index 286a2aabd..1d02d8a4f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -97,6 +97,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html index 09d576f2f..e68be751d 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html @@ -80,7 +80,7 @@  31  
      *
     32   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     33  
      */
     34  5
     public class HintAnalyzer extends AbstractAnalyzer implements Analyzer {
    @@ -237,9 +237,9 @@
             //sun/oracle problem
     119  2
             final Iterator<Evidence> itr = dependency.getVendorEvidence().iterator();
     120  2
             final List<Evidence> newEntries = new ArrayList<Evidence>();
    -  121  27
             while (itr.hasNext()) {
    -  122  25
                 final Evidence e = itr.next();
    -  123  25
                 if ("sun".equalsIgnoreCase(e.getValue(false))) {
    +  121  28
             while (itr.hasNext()) {
    +  122  26
                 final Evidence e = itr.next();
    +  123  26
                 if ("sun".equalsIgnoreCase(e.getValue(false))) {
     124  0
                     final Evidence newEvidence = new Evidence(e.getSource() + " (hint)", e.getName(), "oracle", e.getConfidence());
     125  0
                     newEntries.add(newEvidence);
     126  0
                 } else if ("oracle".equalsIgnoreCase(e.getValue(false))) {
    @@ -247,7 +247,7 @@  128  0
                     newEntries.add(newEvidence);
     129  
                 }
    -  130  25
             }
    +  130  26
             }
     131  2
             for (Evidence e : newEntries) {
     132  0
                 dependency.getVendorEvidence().addEvidence(e);
     133  0
             }
    @@ -258,6 +258,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html index 3595b7f40..19e6a5a27 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 @@
     
    - - + +
    Classes in this File Line Coverage Branch Coverage Complexity
    JarAnalyzer
    58%
    321/549
    50%
    171/342
    7.394
    JarAnalyzer$ClassNameInformation
    80%
    17/21
    80%
    8/10
    7.394
    JarAnalyzer
    62%
    314/502
    50%
    172/338
    7.156
    JarAnalyzer$ClassNameInformation
    80%
    17/21
    80%
    8/10
    7.156
     
    @@ -129,19 +129,19 @@  55  
     import org.owasp.dependencycheck.dependency.EvidenceCollection;
     56   -
     import org.owasp.dependencycheck.jaxb.pom.PomUtils;
    +
     import org.owasp.dependencycheck.xml.pom.License;
     57   -
     import org.owasp.dependencycheck.jaxb.pom.generated.License;
    +
     import org.owasp.dependencycheck.xml.pom.PomUtils;
     58   -
     import org.owasp.dependencycheck.jaxb.pom.generated.Model;
    +
     import org.owasp.dependencycheck.xml.pom.Model;
     59   -
     import org.owasp.dependencycheck.jaxb.pom.generated.Organization;
    -  60  
     import org.owasp.dependencycheck.utils.FileUtils;
    -  61   +  60  
     import org.owasp.dependencycheck.utils.NonClosingStream;
    -  62   +  61  
     import org.owasp.dependencycheck.utils.Settings;
    +  62   +
     import org.owasp.dependencycheck.xml.pom.PomParser;
     63  
     import org.xml.sax.InputSource;
     64   @@ -153,7 +153,7 @@  67  
      *
     68   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     69  
      */
     70   @@ -315,1761 +315,1674 @@  151  
     
     152   -
         /**
    +
         //</editor-fold>
     153   -
          * The POM Utility for parsing POM files.
    +
         /**
     154   -
          */
    -  155  7
         private PomUtils pomUtils = null;
    -  156   -
         //</editor-fold>
    -  157   -
     
    -  158   -
         /**
    -  159  
          * Constructs a new JarAnalyzer.
    -  160   +  155  
          */
    -  161  7
         public JarAnalyzer() {
    -  162  7
             pomUtils = new PomUtils();
    -  163  7
         }
    -  164   +  156  7
         public JarAnalyzer() {
    +  157  7
         }
    +  158  
     
    -  165   +  159  
         //<editor-fold defaultstate="collapsed" desc="All standard implmentation details of Analyzer">
    -  166   +  160  
         /**
    -  167   +  161  
          * The name of the analyzer.
    -  168   +  162  
          */
    -  169   +  163  
         private static final String ANALYZER_NAME = "Jar Analyzer";
    -  170   +  164  
         /**
    -  171   +  165  
          * The phase that this analyzer is intended to run in.
    -  172   +  166  
          */
    -  173  1
         private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;
    -  174   +  167  1
         private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;
    +  168  
         /**
    -  175   +  169  
          * The set of file extensions supported by this analyzer.
    -  176   +  170  
          */
    -  177  1
         private static final Set<String> EXTENSIONS = newHashSet("jar", "war");
    -  178   +  171  1
         private static final Set<String> EXTENSIONS = newHashSet("jar", "war");
    +  172  
     
    -  179   +  173  
         /**
    -  180   +  174  
          * Returns a list of file EXTENSIONS supported by this analyzer.
    -  181   +  175  
          *
    -  182   +  176  
          * @return a list of file EXTENSIONS supported by this analyzer.
    -  183   +  177  
          */
    -  184   +  178  
         @Override
    -  185   +  179  
         public Set<String> getSupportedExtensions() {
    -  186  852
             return EXTENSIONS;
    -  187   +  180  852
             return EXTENSIONS;
    +  181  
         }
    -  188   +  182  
     
    -  189   +  183  
         /**
    -  190   +  184  
          * Returns the name of the analyzer.
    -  191   +  185  
          *
    -  192   +  186  
          * @return the name of the analyzer.
    -  193   +  187  
          */
    -  194   +  188  
         @Override
    -  195   +  189  
         public String getName() {
    -  196  5
             return ANALYZER_NAME;
    -  197   +  190  5
             return ANALYZER_NAME;
    +  191  
         }
    -  198   +  192  
     
    -  199   +  193  
         /**
    -  200   +  194  
          * Returns the phase that the analyzer is intended to run in.
    -  201   +  195  
          *
    -  202   +  196  
          * @return the phase that the analyzer is intended to run in.
    -  203   +  197  
          */
    -  204   +  198  
         public AnalysisPhase getAnalysisPhase() {
    -  205  1
             return ANALYSIS_PHASE;
    -  206   +  199  1
             return ANALYSIS_PHASE;
    +  200  
         }
    -  207   +  201  
         //</editor-fold>
    -  208   +  202  
     
    -  209   +  203  
         /**
    -  210   +  204  
          * Returns the key used in the properties file to reference the analyzer's enabled property.
    -  211   +  205  
          *
    -  212   +  206  
          * @return the analyzer's enabled property setting key
    -  213   +  207  
          */
    -  214   +  208  
         @Override
    -  215   +  209  
         protected String getAnalyzerEnabledSettingKey() {
    -  216  7
             return Settings.KEYS.ANALYZER_JAR_ENABLED;
    -  217   +  210  7
             return Settings.KEYS.ANALYZER_JAR_ENABLED;
    +  211  
         }
    -  218   +  212  
     
    -  219   +  213  
         /**
    -  220   +  214  
          * Loads a specified JAR file and collects information from the manifest and checksums to identify the correct CPE
    -  221   +  215  
          * information.
    -  222   +  216  
          *
    -  223   +  217  
          * @param dependency the dependency to analyze.
    -  224   +  218  
          * @param engine the engine that is scanning the dependencies
    -  225   +  219  
          * @throws AnalysisException is thrown if there is an error reading the JAR file.
    -  226   +  220  
          */
    -  227   +  221  
         @Override
    -  228   +  222  
         public void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException {
    -  229   +  223  
             try {
    -  230  5
                 final List<ClassNameInformation> classNames = collectClassNames(dependency);
    -  231  5
                 final String fileName = dependency.getFileName().toLowerCase();
    -  232  5
                 if (classNames.isEmpty()
    -  233   +  224  5
                 final List<ClassNameInformation> classNames = collectClassNames(dependency);
    +  225  5
                 final String fileName = dependency.getFileName().toLowerCase();
    +  226  5
                 if (classNames.isEmpty()
    +  227  
                         && (fileName.endsWith("-sources.jar")
    -  234   +  228  
                         || fileName.endsWith("-javadoc.jar")
    -  235   +  229  
                         || fileName.endsWith("-src.jar")
    -  236   +  230  
                         || fileName.endsWith("-doc.jar"))) {
    -  237  0
                     engine.getDependencies().remove(dependency);
    -  238   +  231  0
                     engine.getDependencies().remove(dependency);
    +  232  
                 }
    -  239  5
                 final boolean hasManifest = parseManifest(dependency, classNames);
    -  240  5
                 final boolean hasPOM = analyzePOM(dependency, classNames, engine);
    -  241  5
                 final boolean addPackagesAsEvidence = !(hasManifest && hasPOM);
    -  242  5
                 analyzePackageNames(classNames, dependency, addPackagesAsEvidence);
    -  243  0
             } catch (IOException ex) {
    -  244  0
                 throw new AnalysisException("Exception occurred reading the JAR file.", ex);
    -  245  5
             }
    -  246  5
         }
    -  247   +  233  5
                 final boolean hasManifest = parseManifest(dependency, classNames);
    +  234  5
                 final boolean hasPOM = analyzePOM(dependency, classNames, engine);
    +  235  5
                 final boolean addPackagesAsEvidence = !(hasManifest && hasPOM);
    +  236  5
                 analyzePackageNames(classNames, dependency, addPackagesAsEvidence);
    +  237  0
             } catch (IOException ex) {
    +  238  0
                 throw new AnalysisException("Exception occurred reading the JAR file.", ex);
    +  239  5
             }
    +  240  5
         }
    +  241  
     
    -  248   +  242  
         /**
    -  249   +  243  
          * Attempts to find a pom.xml within the JAR file. If found it extracts information and adds it to the evidence. This will
    -  250   +  244  
          * attempt to interpolate the strings contained within the pom.properties if one exists.
    -  251   +  245  
          *
    -  252   +  246  
          * @param dependency the dependency being analyzed
    -  253   +  247  
          * @param classes a collection of class name information
    -  254   +  248  
          * @param engine the analysis engine, used to add additional dependencies
    -  255   +  249  
          * @throws AnalysisException is thrown if there is an exception parsing the pom
    -  256   +  250  
          * @return whether or not evidence was added to the dependency
    -  257   +  251  
          */
    -  258   +  252  
         protected boolean analyzePOM(Dependency dependency, List<ClassNameInformation> classes, Engine engine) throws AnalysisException {
    -  259  5
             boolean foundSomething = false;
    -  260   +  253  5
             boolean foundSomething = false;
    +  254  
             final JarFile jar;
    -  261   +  255  
             try {
    -  262  5
                 jar = new JarFile(dependency.getActualFilePath());
    -  263  0
             } catch (IOException ex) {
    -  264  0
                 final String msg = String.format("Unable to read JarFile '%s'.", dependency.getActualFilePath());
    -  265   +  256  5
                 jar = new JarFile(dependency.getActualFilePath());
    +  257  0
             } catch (IOException ex) {
    +  258  0
                 final String msg = String.format("Unable to read JarFile '%s'.", dependency.getActualFilePath());
    +  259  
                 //final AnalysisException ax = new AnalysisException(msg, ex);
    -  266  0
                 LOGGER.log(Level.WARNING, msg);
    -  267  0
                 LOGGER.log(Level.FINE, "", ex);
    -  268  0
                 return false;
    -  269  5
             }
    -  270   +  260  0
                 LOGGER.log(Level.WARNING, msg);
    +  261  0
                 LOGGER.log(Level.FINE, "", ex);
    +  262  0
                 return false;
    +  263  5
             }
    +  264  
             List<String> pomEntries;
    -  271   +  265  
             try {
    -  272  5
                 pomEntries = retrievePomListing(jar);
    -  273  0
             } catch (IOException ex) {
    -  274  0
                 final String msg = String.format("Unable to read Jar file entries in '%s'.", dependency.getActualFilePath());
    -  275   +  266  5
                 pomEntries = retrievePomListing(jar);
    +  267  0
             } catch (IOException ex) {
    +  268  0
                 final String msg = String.format("Unable to read Jar file entries in '%s'.", dependency.getActualFilePath());
    +  269  
                 //final AnalysisException ax = new AnalysisException(msg, ex);
    -  276  0
                 LOGGER.log(Level.WARNING, msg);
    -  277  0
                 LOGGER.log(Level.FINE, msg, ex);
    -  278  0
                 return false;
    -  279  5
             }
    -  280  5
             File externalPom = null;
    -  281  5
             if (pomEntries.isEmpty()) {
    -  282  4
                 String pomPath = dependency.getActualFilePath();
    -  283  4
                 pomPath = pomPath.substring(0, pomPath.lastIndexOf('.')) + ".pom";
    -  284  4
                 externalPom = new File(pomPath);
    -  285  4
                 if (externalPom.isFile()) {
    -  286  0
                     pomEntries.add(pomPath);
    -  287   +  270  0
                 LOGGER.log(Level.WARNING, msg);
    +  271  0
                 LOGGER.log(Level.FINE, msg, ex);
    +  272  0
                 return false;
    +  273  5
             }
    +  274  5
             File externalPom = null;
    +  275  5
             if (pomEntries.isEmpty()) {
    +  276  4
                 String pomPath = dependency.getActualFilePath();
    +  277  4
                 pomPath = pomPath.substring(0, pomPath.lastIndexOf('.')) + ".pom";
    +  278  4
                 externalPom = new File(pomPath);
    +  279  4
                 if (externalPom.isFile()) {
    +  280  0
                     pomEntries.add(pomPath);
    +  281  
                 } else {
    -  288  4
                     return false;
    -  289   +  282  4
                     return false;
    +  283  
                 }
    -  290   +  284  
             }
    -  291  1
             for (String path : pomEntries) {
    -  292  1
                 Properties pomProperties = null;
    -  293   +  285  1
             for (String path : pomEntries) {
    +  286  1
                 LOGGER.fine(String.format("Reading pom entry: %s", path));
    +  287  1
                 Properties pomProperties = null;
    +  288  
                 try {
    -  294  1
                     if (externalPom == null) {
    -  295  1
                         pomProperties = retrievePomProperties(path, jar);
    +  289  1
                     if (externalPom == null) {
    +  290  1
                         pomProperties = retrievePomProperties(path, jar);
    +  291   +
                     }
    +  292  0
                 } catch (IOException ex) {
    +  293  0
                     LOGGER.log(Level.FINEST, "ignore this, failed reading a non-existent pom.properties", ex);
    +  294  1
                 }
    +  295  1
                 Model pom = null;
     296   -
                     }
    -  297  0
                 } catch (IOException ex) {
    -  298  0
                     LOGGER.log(Level.FINEST, "ignore this, failed reading a non-existent pom.properties", ex);
    -  299  1
                 }
    -  300  1
                 Model pom = null;
    -  301  
                 try {
    -  302  1
                     if (pomEntries.size() > 1) {
    -  303   +  297  1
                     if (pomEntries.size() > 1) {
    +  298  
                         //extract POM to its own directory and add it as its own dependency
    -  304  0
                         final Dependency newDependency = new Dependency();
    -  305  0
                         pom = extractPom(path, jar, newDependency);
    -  306   +  299  0
                         final Dependency newDependency = new Dependency();
    +  300  0
                         pom = extractPom(path, jar, newDependency);
    +  301  
     
    -  307  0
                         final String displayPath = String.format("%s%s%s",
    -  308   +  302  0
                         final String displayPath = String.format("%s%s%s",
    +  303  
                                 dependency.getFilePath(),
    -  309   +  304  
                                 File.separator,
    -  310   +  305  
                                 path);
    -  311  0
                         final String displayName = String.format("%s%s%s",
    -  312   +  306  0
                         final String displayName = String.format("%s%s%s",
    +  307  
                                 dependency.getFileName(),
    -  313   +  308  
                                 File.separator,
    -  314   +  309  
                                 path);
    -  315   +  310  
     
    -  316  0
                         newDependency.setFileName(displayName);
    -  317  0
                         newDependency.setFilePath(displayPath);
    -  318  0
                         setPomEvidence(newDependency, pom, pomProperties, null);
    -  319  0
                         engine.getDependencies().add(newDependency);
    -  320  0
                         Collections.sort(engine.getDependencies());
    -  321  0
                     } else {
    -  322  1
                         if (externalPom == null) {
    -  323  1
                             pom = retrievePom(path, jar);
    -  324   +  311  0
                         newDependency.setFileName(displayName);
    +  312  0
                         newDependency.setFilePath(displayPath);
    +  313  0
                         setPomEvidence(newDependency, pom, pomProperties, null);
    +  314  0
                         engine.getDependencies().add(newDependency);
    +  315  0
                         Collections.sort(engine.getDependencies());
    +  316  0
                     } else {
    +  317  1
                         if (externalPom == null) {
    +  318  1
                             pom = PomUtils.readPom(path, jar);
    +  319  
                         } else {
    -  325  0
                             pom = pomUtils.readPom(externalPom);
    -  326   +  320  0
                             pom = PomUtils.readPom(externalPom);
    +  321  
                         }
    -  327  1
                         foundSomething |= setPomEvidence(dependency, pom, pomProperties, classes);
    -  328   +  322  1
                         foundSomething |= setPomEvidence(dependency, pom, pomProperties, classes);
    +  323  
                     }
    -  329  0
                 } catch (AnalysisException ex) {
    -  330  0
                     final String msg = String.format("An error occured while analyzing '%s'.", dependency.getActualFilePath());
    -  331  0
                     LOGGER.log(Level.WARNING, msg);
    -  332  0
                     LOGGER.log(Level.FINE, "", ex);
    -  333  1
                 }
    -  334  1
             }
    -  335  1
             return foundSomething;
    -  336   +  324  0
                 } catch (AnalysisException ex) {
    +  325  0
                     final String msg = String.format("An error occured while analyzing '%s'.", dependency.getActualFilePath());
    +  326  0
                     LOGGER.log(Level.WARNING, msg);
    +  327  0
                     LOGGER.log(Level.FINE, "", ex);
    +  328  1
                 }
    +  329  1
             }
    +  330  1
             return foundSomething;
    +  331  
         }
    -  337   +  332  
     
    -  338   +  333  
         /**
    -  339   +  334  
          * Given a path to a pom.xml within a JarFile, this method attempts to load a sibling pom.properties if one exists.
    -  340   +  335  
          *
    -  341   +  336  
          * @param path the path to the pom.xml within the JarFile
    -  342   +  337  
          * @param jar the JarFile to load the pom.properties from
    -  343   +  338  
          * @return a Properties object or null if no pom.properties was found
    -  344   +  339  
          * @throws IOException thrown if there is an exception reading the pom.properties
    -  345   +  340  
          */
    -  346   +  341  
         private Properties retrievePomProperties(String path, final JarFile jar) throws IOException {
    -  347  1
             Properties pomProperties = null;
    -  348  1
             final String propPath = path.substring(0, path.length() - 7) + "pom.properies";
    -  349  1
             final ZipEntry propEntry = jar.getEntry(propPath);
    -  350  1
             if (propEntry != null) {
    -  351  0
                 Reader reader = null;
    +  342  1
             Properties pomProperties = null;
    +  343  1
             final String propPath = path.substring(0, path.length() - 7) + "pom.properies";
    +  344  1
             final ZipEntry propEntry = jar.getEntry(propPath);
    +  345  1
             if (propEntry != null) {
    +  346  0
                 Reader reader = null;
    +  347   +
                 try {
    +  348  0
                     reader = new InputStreamReader(jar.getInputStream(propEntry), "UTF-8");
    +  349  0
                     pomProperties = new Properties();
    +  350  0
                     pomProperties.load(reader);
    +  351  0
                     LOGGER.fine(String.format("Read pom.properties: %s", propPath));
     352   -
                 try {
    -  353  0
                     reader = new InputStreamReader(jar.getInputStream(propEntry), "UTF-8");
    -  354  0
                     pomProperties = new Properties();
    -  355  0
                     pomProperties.load(reader);
    -  356  
                 } finally {
    -  357  0
                     if (reader != null) {
    -  358   +  353  0
                     if (reader != null) {
    +  354  
                         try {
    -  359  0
                             reader.close();
    -  360  0
                         } catch (IOException ex) {
    -  361  0
                             LOGGER.log(Level.FINEST, "close error", ex);
    -  362  0
                         }
    -  363   +  355  0
                             reader.close();
    +  356  0
                         } catch (IOException ex) {
    +  357  0
                             LOGGER.log(Level.FINEST, "close error", ex);
    +  358  0
                         }
    +  359  
                     }
    +  360   +
                 }
    +  361   +
             }
    +  362  1
             return pomProperties;
    +  363   +
         }
     364   -
                 }
    +
     
     365   -
             }
    -  366  1
             return pomProperties;
    -  367   -
         }
    -  368   -
     
    -  369  
         /**
    -  370   +  366  
          * Searches a JarFile for pom.xml entries and returns a listing of these entries.
    -  371   +  367  
          *
    -  372   +  368  
          * @param jar the JarFile to search
    -  373   +  369  
          * @return a list of pom.xml entries
    -  374   +  370  
          * @throws IOException thrown if there is an exception reading a JarEntry
    -  375   +  371  
          */
    -  376   +  372  
         private List<String> retrievePomListing(final JarFile jar) throws IOException {
    -  377  5
             final List<String> pomEntries = new ArrayList<String>();
    -  378  5
             final Enumeration<JarEntry> entries = jar.entries();
    -  379  1848
             while (entries.hasMoreElements()) {
    -  380  1843
                 final JarEntry entry = entries.nextElement();
    -  381  1843
                 final String entryName = (new File(entry.getName())).getName().toLowerCase();
    -  382  1843
                 if (!entry.isDirectory() && "pom.xml".equals(entryName)) {
    -  383  1
                     pomEntries.add(entry.getName());
    +  373  5
             final List<String> pomEntries = new ArrayList<String>();
    +  374  5
             final Enumeration<JarEntry> entries = jar.entries();
    +  375  1848
             while (entries.hasMoreElements()) {
    +  376  1843
                 final JarEntry entry = entries.nextElement();
    +  377  1843
                 final String entryName = (new File(entry.getName())).getName().toLowerCase();
    +  378  1843
                 if (!entry.isDirectory() && "pom.xml".equals(entryName)) {
    +  379  1
                     LOGGER.fine(String.format("POM Entry found: %s", entry.getName()));
    +  380  1
                     pomEntries.add(entry.getName());
    +  381   +
                 }
    +  382  1843
             }
    +  383  5
             return pomEntries;
     384   -
                 }
    -  385  1843
             }
    -  386  5
             return pomEntries;
    +
         }
    +  385   +
     
    +  386   +
         /**
     387   -
         }
    +
          * Retrieves the specified POM from a jar file and converts it to a Model.
     388   -
     
    +
          *
     389   -
         /**
    +
          * @param path the path to the pom.xml file within the jar file
     390   -
          * Retrieves the specified POM from a jar file and converts it to a Model.
    +
          * @param jar the jar file to extract the pom from
     391   -
          *
    -  392   -
          * @param path the path to the pom.xml file within the jar file
    -  393   -
          * @param jar the jar file to extract the pom from
    -  394  
          * @param dependency the dependency being analyzed
    -  395   +  392  
          * @return returns the POM object
    +  393   +
          * @throws AnalysisException is thrown if there is an exception extracting or parsing the POM
    +  394   +
          * {@link org.owasp.dependencycheck.jaxb.pom.generated.Model} object
    +  395   +
          */
     396   -
          * @throws AnalysisException is thrown if there is an exception extracting or parsing the POM
    -  397   -
          * {@link org.owasp.dependencycheck.jaxb.pom.generated.Model} object
    -  398   -
          */
    -  399  
         private Model extractPom(String path, JarFile jar, Dependency dependency) throws AnalysisException {
    -  400  0
             InputStream input = null;
    -  401  0
             FileOutputStream fos = null;
    -  402  0
             BufferedOutputStream bos = null;
    -  403  0
             final File tmpDir = getNextTempDirectory();
    -  404  0
             final File file = new File(tmpDir, "pom.xml");
    -  405   +  397  0
             InputStream input = null;
    +  398  0
             FileOutputStream fos = null;
    +  399  0
             BufferedOutputStream bos = null;
    +  400  0
             final File tmpDir = getNextTempDirectory();
    +  401  0
             final File file = new File(tmpDir, "pom.xml");
    +  402  
             try {
    -  406  0
                 final ZipEntry entry = jar.getEntry(path);
    -  407  0
                 input = jar.getInputStream(entry);
    -  408  0
                 fos = new FileOutputStream(file);
    -  409  0
                 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
    -  410   +  403  0
                 final ZipEntry entry = jar.getEntry(path);
    +  404  0
                 input = jar.getInputStream(entry);
    +  405  0
                 fos = new FileOutputStream(file);
    +  406  0
                 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
    +  407  
                 int count;
    -  411  0
                 final byte[] data = new byte[BUFFER_SIZE];
    -  412  0
                 while ((count = input.read(data, 0, BUFFER_SIZE)) != -1) {
    -  413  0
                     bos.write(data, 0, count);
    -  414   +  408  0
                 final byte[] data = new byte[BUFFER_SIZE];
    +  409  0
                 while ((count = input.read(data, 0, BUFFER_SIZE)) != -1) {
    +  410  0
                     bos.write(data, 0, count);
    +  411  
                 }
    -  415  0
                 bos.flush();
    -  416  0
                 dependency.setActualFilePath(file.getAbsolutePath());
    -  417  0
             } catch (IOException ex) {
    -  418  0
                 final String msg = String.format("An error occurred reading '%s' from '%s'.", path, dependency.getFilePath());
    -  419  0
                 LOGGER.warning(msg);
    -  420  0
                 LOGGER.log(Level.SEVERE, "", ex);
    -  421   +  412  0
                 bos.flush();
    +  413  0
                 dependency.setActualFilePath(file.getAbsolutePath());
    +  414  0
             } catch (IOException ex) {
    +  415  0
                 final String msg = String.format("An error occurred reading '%s' from '%s'.", path, dependency.getFilePath());
    +  416  0
                 LOGGER.warning(msg);
    +  417  0
                 LOGGER.log(Level.SEVERE, "", ex);
    +  418  
             } finally {
    -  422  0
                 closeStream(bos);
    -  423  0
                 closeStream(fos);
    -  424  0
                 closeStream(input);
    -  425  0
             }
    -  426  0
             Model model = null;
    -  427  0
             FileInputStream fis = null;
    +  419  0
                 closeStream(bos);
    +  420  0
                 closeStream(fos);
    +  421  0
                 closeStream(input);
    +  422  0
             }
    +  423  0
             Model model = PomUtils.readPom(file);
    +  424  0
             return model;
    +  425   +
         }
    +  426   +
     
    +  427   +
         /**
     428   -
             try {
    -  429  0
                 fis = new FileInputStream(file);
    -  430  0
                 final InputStreamReader reader = new InputStreamReader(fis, "UTF-8");
    -  431  0
                 final InputSource xml = new InputSource(reader);
    -  432  0
                 final SAXSource source = new SAXSource(xml);
    -  433  0
                 model = pomUtils.readPom(source);
    -  434  0
             } catch (FileNotFoundException ex) {
    -  435  0
                 final String msg = String.format("Unable to parse pom '%s' in jar '%s' (File Not Found)", path, jar.getName());
    -  436  0
                 LOGGER.log(Level.WARNING, msg);
    -  437  0
                 LOGGER.log(Level.FINE, "", ex);
    -  438  0
                 throw new AnalysisException(ex);
    -  439  0
             } catch (UnsupportedEncodingException ex) {
    -  440  0
                 final String msg = String.format("Unable to parse pom '%s' in jar '%s' (IO Exception)", path, jar.getName());
    -  441  0
                 LOGGER.log(Level.WARNING, msg);
    -  442  0
                 LOGGER.log(Level.FINE, "", ex);
    -  443  0
                 throw new AnalysisException(ex);
    -  444  0
             } catch (AnalysisException ex) {
    -  445  0
                 final String msg = String.format("Unable to parse pom '%s' in jar '%s'", path, jar.getName());
    -  446  0
                 LOGGER.log(Level.WARNING, msg);
    -  447  0
                 LOGGER.log(Level.FINE, "", ex);
    -  448  0
                 throw ex;
    -  449   -
             } finally {
    -  450  0
                 closeStream(fis);
    -  451  0
             }
    -  452  0
             return model;
    -  453   -
         }
    -  454   -
     
    -  455   -
         /**
    -  456  
          * Silently closes an input stream ignoring errors.
    -  457   +  429  
          *
    -  458   +  430  
          * @param stream an input stream to close
    -  459   +  431  
          */
    -  460   +  432  
         private void closeStream(InputStream stream) {
    -  461  0
             if (stream != null) {
    -  462   +  433  0
             if (stream != null) {
    +  434  
                 try {
    -  463  0
                     stream.close();
    -  464  0
                 } catch (IOException ex) {
    -  465  0
                     LOGGER.log(Level.FINEST, null, ex);
    -  466  0
                 }
    -  467   +  435  0
                     stream.close();
    +  436  0
                 } catch (IOException ex) {
    +  437  0
                     LOGGER.log(Level.FINEST, null, ex);
    +  438  0
                 }
    +  439  
             }
    -  468  0
         }
    -  469   +  440  0
         }
    +  441  
     
    -  470   +  442  
         /**
    -  471   +  443  
          * Silently closes an output stream ignoring errors.
    -  472   +  444  
          *
    -  473   +  445  
          * @param stream an output stream to close
    -  474   +  446  
          */
    -  475   +  447  
         private void closeStream(OutputStream stream) {
    -  476  0
             if (stream != null) {
    -  477   +  448  0
             if (stream != null) {
    +  449  
                 try {
    -  478  0
                     stream.close();
    -  479  0
                 } catch (IOException ex) {
    -  480  0
                     LOGGER.log(Level.FINEST, null, ex);
    -  481  0
                 }
    -  482   +  450  0
                     stream.close();
    +  451  0
                 } catch (IOException ex) {
    +  452  0
                     LOGGER.log(Level.FINEST, null, ex);
    +  453  0
                 }
    +  454  
             }
    -  483  0
         }
    -  484   +  455  0
         }
    +  456  
     
    -  485   +  457  
         /**
    -  486   -
          * Retrieves the specified POM from a jar file and converts it to a Model.
    -  487   -
          *
    -  488   -
          * @param path the path to the pom.xml file within the jar file
    -  489   -
          * @param jar the jar file to extract the pom from
    -  490   -
          * @return returns a
    -  491   -
          * @throws AnalysisException is thrown if there is an exception extracting or parsing the POM
    -  492   -
          * {@link org.owasp.dependencycheck.jaxb.pom.generated.Model} object
    -  493   -
          */
    -  494   -
         private Model retrievePom(String path, JarFile jar) throws AnalysisException {
    -  495  1
             final ZipEntry entry = jar.getEntry(path);
    -  496  1
             Model model = null;
    -  497  1
             if (entry != null) { //should never be null
    -  498   -
                 try {
    -  499  1
                     final NonClosingStream stream = new NonClosingStream(jar.getInputStream(entry));
    -  500  1
                     final InputStreamReader reader = new InputStreamReader(stream, "UTF-8");
    -  501  1
                     final InputSource xml = new InputSource(reader);
    -  502  1
                     final SAXSource source = new SAXSource(xml);
    -  503  1
                     model = pomUtils.readPom(source);
    -  504  0
                 } catch (SecurityException ex) {
    -  505  0
                     final String msg = String.format("Unable to parse pom '%s' in jar '%s'; invalid signature", path, jar.getName());
    -  506  0
                     LOGGER.log(Level.WARNING, msg);
    -  507  0
                     LOGGER.log(Level.FINE, null, ex);
    -  508  0
                     throw new AnalysisException(ex);
    -  509  0
                 } catch (IOException ex) {
    -  510  0
                     final String msg = String.format("Unable to parse pom '%s' in jar '%s' (IO Exception)", path, jar.getName());
    -  511  0
                     LOGGER.log(Level.WARNING, msg);
    -  512  0
                     LOGGER.log(Level.FINE, "", ex);
    -  513  0
                     throw new AnalysisException(ex);
    -  514  0
                 } catch (Throwable ex) {
    -  515  0
                     final String msg = String.format("Unexpected error during parsing of the pom '%s' in jar '%s'", path, jar.getName());
    -  516  0
                     LOGGER.log(Level.WARNING, msg);
    -  517  0
                     LOGGER.log(Level.FINE, "", ex);
    -  518  0
                     throw new AnalysisException(ex);
    -  519  1
                 }
    -  520   -
             }
    -  521  1
             return model;
    -  522   -
         }
    -  523   -
     
    -  524   -
         /**
    -  525   +  458  
          * Sets evidence from the pom on the supplied dependency.
    -  526   +  459  
          *
    -  527   +  460  
          * @param dependency the dependency to set data on
    -  528   +  461  
          * @param pom the information from the pom
    -  529   +  462  
          * @param pomProperties the pom properties file (null if none exists)
    -  530   +  463  
          * @param classes a collection of ClassNameInformation - containing data about the fully qualified class names within the JAR
    -  531   +  464  
          * file being analyzed
    -  532   +  465  
          * @return true if there was evidence within the pom that we could use; otherwise false
    -  533   +  466  
          */
    -  534   +  467  
         private boolean setPomEvidence(Dependency dependency, Model pom, Properties pomProperties, List<ClassNameInformation> classes) {
    -  535  1
             boolean foundSomething = false;
    -  536  1
             boolean addAsIdentifier = true;
    -  537  1
             if (pom == null) {
    -  538  0
                 return foundSomething;
    -  539   +  468  1
             boolean foundSomething = false;
    +  469  1
             boolean addAsIdentifier = true;
    +  470  1
             if (pom == null) {
    +  471  0
                 return foundSomething;
    +  472  
             }
    -  540  1
             String groupid = interpolateString(pom.getGroupId(), pomProperties);
    -  541  1
             String parentGroupId = null;
    -  542   +  473  1
             String groupid = interpolateString(pom.getGroupId(), pomProperties);
    +  474  1
             String parentGroupId = null;
    +  475  
     
    -  543  1
             if (pom.getParent() != null) {
    -  544  1
                 parentGroupId = interpolateString(pom.getParent().getGroupId(), pomProperties);
    -  545  1
                 if ((groupid == null || groupid.isEmpty()) && parentGroupId != null && !parentGroupId.isEmpty()) {
    -  546  0
                     groupid = parentGroupId;
    -  547   +  476  1
             if (pom.getParentGroupId() != null) {
    +  477  1
                 parentGroupId = interpolateString(pom.getParentGroupId(), pomProperties);
    +  478  1
                 if ((groupid == null || groupid.isEmpty()) && parentGroupId != null && !parentGroupId.isEmpty()) {
    +  479  0
                     groupid = parentGroupId;
    +  480  
                 }
    -  548   +  481  
             }
    -  549  1
             final String originalGroupID = groupid;
    -  550   +  482  1
             final String originalGroupID = groupid;
    +  483  
     
    -  551  1
             if (groupid != null && !groupid.isEmpty()) {
    -  552  1
                 foundSomething = true;
    -  553  1
                 dependency.getVendorEvidence().addEvidence("pom", "groupid", groupid, Confidence.HIGHEST);
    -  554  1
                 dependency.getProductEvidence().addEvidence("pom", "groupid", groupid, Confidence.LOW);
    -  555  1
                 addMatchingValues(classes, groupid, dependency.getVendorEvidence());
    -  556  1
                 addMatchingValues(classes, groupid, dependency.getProductEvidence());
    -  557  1
                 if (parentGroupId != null && !parentGroupId.isEmpty() && !parentGroupId.equals(groupid)) {
    -  558  0
                     dependency.getVendorEvidence().addEvidence("pom", "parent-groupid", parentGroupId, Confidence.MEDIUM);
    -  559  0
                     dependency.getProductEvidence().addEvidence("pom", "parent-groupid", parentGroupId, Confidence.LOW);
    -  560  0
                     addMatchingValues(classes, parentGroupId, dependency.getVendorEvidence());
    -  561  0
                     addMatchingValues(classes, parentGroupId, dependency.getProductEvidence());
    -  562   +  484  1
             if (groupid != null && !groupid.isEmpty()) {
    +  485  1
                 foundSomething = true;
    +  486  1
                 dependency.getVendorEvidence().addEvidence("pom", "groupid", groupid, Confidence.HIGHEST);
    +  487  1
                 dependency.getProductEvidence().addEvidence("pom", "groupid", groupid, Confidence.LOW);
    +  488  1
                 addMatchingValues(classes, groupid, dependency.getVendorEvidence());
    +  489  1
                 addMatchingValues(classes, groupid, dependency.getProductEvidence());
    +  490  1
                 if (parentGroupId != null && !parentGroupId.isEmpty() && !parentGroupId.equals(groupid)) {
    +  491  0
                     dependency.getVendorEvidence().addEvidence("pom", "parent-groupid", parentGroupId, Confidence.MEDIUM);
    +  492  0
                     dependency.getProductEvidence().addEvidence("pom", "parent-groupid", parentGroupId, Confidence.LOW);
    +  493  0
                     addMatchingValues(classes, parentGroupId, dependency.getVendorEvidence());
    +  494  0
                     addMatchingValues(classes, parentGroupId, dependency.getProductEvidence());
    +  495  
                 }
    -  563   +  496  
             } else {
    -  564  0
                 addAsIdentifier = false;
    -  565   +  497  0
                 addAsIdentifier = false;
    +  498  
             }
    -  566   +  499  
     
    -  567  1
             String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
    -  568  1
             String parentArtifactId = null;
    -  569   +  500  1
             String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
    +  501  1
             String parentArtifactId = null;
    +  502  
     
    -  570  1
             if (pom.getParent() != null) {
    -  571  1
                 parentArtifactId = interpolateString(pom.getParent().getArtifactId(), pomProperties);
    -  572  1
                 if ((artifactid == null || artifactid.isEmpty()) && parentArtifactId != null && !parentArtifactId.isEmpty()) {
    -  573  0
                     artifactid = parentArtifactId;
    -  574   +  503  1
             if (pom.getParentArtifactId() != null) {
    +  504  1
                 parentArtifactId = interpolateString(pom.getParentArtifactId(), pomProperties);
    +  505  1
                 if ((artifactid == null || artifactid.isEmpty()) && parentArtifactId != null && !parentArtifactId.isEmpty()) {
    +  506  0
                     artifactid = parentArtifactId;
    +  507  
                 }
    -  575   +  508  
             }
    -  576  1
             final String originalArtifactID = artifactid;
    -  577  1
             if (artifactid != null && !artifactid.isEmpty()) {
    -  578  1
                 if (artifactid.startsWith("org.") || artifactid.startsWith("com.")) {
    -  579  0
                     artifactid = artifactid.substring(4);
    -  580   +  509  1
             final String originalArtifactID = artifactid;
    +  510  1
             if (artifactid != null && !artifactid.isEmpty()) {
    +  511  1
                 if (artifactid.startsWith("org.") || artifactid.startsWith("com.")) {
    +  512  0
                     artifactid = artifactid.substring(4);
    +  513  
                 }
    -  581  1
                 foundSomething = true;
    -  582  1
                 dependency.getProductEvidence().addEvidence("pom", "artifactid", artifactid, Confidence.HIGHEST);
    -  583  1
                 dependency.getVendorEvidence().addEvidence("pom", "artifactid", artifactid, Confidence.LOW);
    -  584  1
                 addMatchingValues(classes, artifactid, dependency.getVendorEvidence());
    -  585  1
                 addMatchingValues(classes, artifactid, dependency.getProductEvidence());
    -  586  1
                 if (parentArtifactId != null && !parentArtifactId.isEmpty() && !parentArtifactId.equals(artifactid)) {
    -  587  1
                     dependency.getProductEvidence().addEvidence("pom", "parent-artifactid", parentArtifactId, Confidence.MEDIUM);
    -  588  1
                     dependency.getVendorEvidence().addEvidence("pom", "parent-artifactid", parentArtifactId, Confidence.LOW);
    -  589  1
                     addMatchingValues(classes, parentArtifactId, dependency.getVendorEvidence());
    -  590  1
                     addMatchingValues(classes, parentArtifactId, dependency.getProductEvidence());
    -  591   +  514  1
                 foundSomething = true;
    +  515  1
                 dependency.getProductEvidence().addEvidence("pom", "artifactid", artifactid, Confidence.HIGHEST);
    +  516  1
                 dependency.getVendorEvidence().addEvidence("pom", "artifactid", artifactid, Confidence.LOW);
    +  517  1
                 addMatchingValues(classes, artifactid, dependency.getVendorEvidence());
    +  518  1
                 addMatchingValues(classes, artifactid, dependency.getProductEvidence());
    +  519  1
                 if (parentArtifactId != null && !parentArtifactId.isEmpty() && !parentArtifactId.equals(artifactid)) {
    +  520  1
                     dependency.getProductEvidence().addEvidence("pom", "parent-artifactid", parentArtifactId, Confidence.MEDIUM);
    +  521  1
                     dependency.getVendorEvidence().addEvidence("pom", "parent-artifactid", parentArtifactId, Confidence.LOW);
    +  522  1
                     addMatchingValues(classes, parentArtifactId, dependency.getVendorEvidence());
    +  523  1
                     addMatchingValues(classes, parentArtifactId, dependency.getProductEvidence());
    +  524  
                 }
    -  592   +  525  
             } else {
    -  593  0
                 addAsIdentifier = false;
    -  594   +  526  0
                 addAsIdentifier = false;
    +  527  
             }
    -  595   +  528  
             //version
    -  596  1
             String version = interpolateString(pom.getVersion(), pomProperties);
    -  597  1
             String parentVersion = null;
    -  598   +  529  1
             String version = interpolateString(pom.getVersion(), pomProperties);
    +  530  1
             String parentVersion = null;
    +  531  
     
    -  599  1
             if (pom.getParent() != null) {
    -  600  1
                 parentVersion = interpolateString(pom.getParent().getVersion(), pomProperties);
    -  601  1
                 if ((version == null || version.isEmpty()) && parentVersion != null && !parentVersion.isEmpty()) {
    -  602  1
                     version = parentVersion;
    -  603   +  532  1
             if (pom.getParentVersion() != null) {
    +  533  1
                 parentVersion = interpolateString(pom.getParentVersion(), pomProperties);
    +  534  1
                 if ((version == null || version.isEmpty()) && parentVersion != null && !parentVersion.isEmpty()) {
    +  535  1
                     version = parentVersion;
    +  536  
                 }
    -  604   +  537  
             }
    -  605   +  538  
     
    -  606  1
             if (version != null && !version.isEmpty()) {
    -  607  1
                 foundSomething = true;
    -  608  1
                 dependency.getVersionEvidence().addEvidence("pom", "version", version, Confidence.HIGHEST);
    -  609  1
                 if (parentVersion != null && !parentVersion.isEmpty() && !parentVersion.equals(version)) {
    -  610  0
                     dependency.getVersionEvidence().addEvidence("pom", "parent-version", version, Confidence.LOW);
    -  611   +  539  1
             if (version != null && !version.isEmpty()) {
    +  540  1
                 foundSomething = true;
    +  541  1
                 dependency.getVersionEvidence().addEvidence("pom", "version", version, Confidence.HIGHEST);
    +  542  1
                 if (parentVersion != null && !parentVersion.isEmpty() && !parentVersion.equals(version)) {
    +  543  0
                     dependency.getVersionEvidence().addEvidence("pom", "parent-version", version, Confidence.LOW);
    +  544  
                 }
    -  612   +  545  
             } else {
    -  613  0
                 addAsIdentifier = false;
    -  614   +  546  0
                 addAsIdentifier = false;
    +  547  
             }
    -  615   +  548  
     
    -  616  1
             if (addAsIdentifier) {
    -  617  1
                 dependency.addIdentifier("maven", String.format("%s:%s:%s", originalGroupID, originalArtifactID, version), null, Confidence.LOW);
    -  618   +  549  1
             if (addAsIdentifier) {
    +  550  1
                 dependency.addIdentifier("maven", String.format("%s:%s:%s", originalGroupID, originalArtifactID, version), null, Confidence.LOW);
    +  551  
             }
    -  619   +  552  
     
    -  620   +  553  
             // org name
    -  621  1
             final Organization org = pom.getOrganization();
    -  622  1
             if (org != null && org.getName() != null) {
    -  623  0
                 foundSomething = true;
    -  624  0
                 final String orgName = interpolateString(org.getName(), pomProperties);
    -  625  0
                 if (orgName != null && !orgName.isEmpty()) {
    -  626  0
                     dependency.getVendorEvidence().addEvidence("pom", "organization name", orgName, Confidence.HIGH);
    -  627  0
                     addMatchingValues(classes, orgName, dependency.getVendorEvidence());
    -  628   +  554  1
             final String org = pom.getOrganization();
    +  555  1
             if (org != null) {
    +  556  0
                 foundSomething = true;
    +  557  0
                 final String orgName = interpolateString(org, pomProperties);
    +  558  0
                 if (orgName != null && !orgName.isEmpty()) {
    +  559  0
                     dependency.getVendorEvidence().addEvidence("pom", "organization name", orgName, Confidence.HIGH);
    +  560  0
                     addMatchingValues(classes, orgName, dependency.getVendorEvidence());
    +  561  
                 }
    -  629   +  562  
             }
    -  630   +  563  
             //pom name
    -  631  1
             final String pomName = interpolateString(pom.getName(), pomProperties);
    -  632  1
             if (pomName != null && !pomName.isEmpty()) {
    -  633  1
                 foundSomething = true;
    -  634  1
                 dependency.getProductEvidence().addEvidence("pom", "name", pomName, Confidence.HIGH);
    -  635  1
                 dependency.getVendorEvidence().addEvidence("pom", "name", pomName, Confidence.HIGH);
    -  636  1
                 addMatchingValues(classes, pomName, dependency.getVendorEvidence());
    -  637  1
                 addMatchingValues(classes, pomName, dependency.getProductEvidence());
    -  638   +  564  1
             final String pomName = interpolateString(pom.getName(), pomProperties);
    +  565  1
             if (pomName != null && !pomName.isEmpty()) {
    +  566  1
                 foundSomething = true;
    +  567  1
                 dependency.getProductEvidence().addEvidence("pom", "name", pomName, Confidence.HIGH);
    +  568  1
                 dependency.getVendorEvidence().addEvidence("pom", "name", pomName, Confidence.HIGH);
    +  569  1
                 addMatchingValues(classes, pomName, dependency.getVendorEvidence());
    +  570  1
                 addMatchingValues(classes, pomName, dependency.getProductEvidence());
    +  571  
             }
    -  639   +  572  
     
    -  640   +  573  
             //Description
    -  641  1
             if (pom.getDescription() != null) {
    -  642  0
                 foundSomething = true;
    -  643  0
                 final String description = interpolateString(pom.getDescription(), pomProperties);
    -  644  0
                 if (description != null && !description.isEmpty()) {
    -  645  0
                     final String trimmedDescription = addDescription(dependency, description, "pom", "description");
    -  646  0
                     addMatchingValues(classes, trimmedDescription, dependency.getVendorEvidence());
    -  647  0
                     addMatchingValues(classes, trimmedDescription, dependency.getProductEvidence());
    -  648   +  574  1
             if (pom.getDescription() != null) {
    +  575  0
                 foundSomething = true;
    +  576  0
                 final String description = interpolateString(pom.getDescription(), pomProperties);
    +  577  0
                 if (description != null && !description.isEmpty()) {
    +  578  0
                     final String trimmedDescription = addDescription(dependency, description, "pom", "description");
    +  579  0
                     addMatchingValues(classes, trimmedDescription, dependency.getVendorEvidence());
    +  580  0
                     addMatchingValues(classes, trimmedDescription, dependency.getProductEvidence());
    +  581  
                 }
    -  649   +  582  
             }
    -  650  1
             extractLicense(pom, pomProperties, dependency);
    -  651  1
             return foundSomething;
    -  652   +  583  1
             extractLicense(pom, pomProperties, dependency);
    +  584  1
             return foundSomething;
    +  585  
         }
    -  653   +  586  
     
    -  654   +  587  
         /**
    -  655   +  588  
          * Analyzes the path information of the classes contained within the JarAnalyzer to try and determine possible vendor or
    -  656   +  589  
          * product names. If any are found they are stored in the packageVendor and packageProduct hashSets.
    -  657   +  590  
          *
    -  658   +  591  
          * @param classNames a list of class names
    -  659   +  592  
          * @param dependency a dependency to analyze
    -  660   +  593  
          * @param addPackagesAsEvidence a flag indicating whether or not package names should be added as evidence.
    -  661   +  594  
          */
    -  662   +  595  
         protected void analyzePackageNames(List<ClassNameInformation> classNames,
    -  663   +  596  
                 Dependency dependency, boolean addPackagesAsEvidence) {
    -  664  5
             final Map<String, Integer> vendorIdentifiers = new HashMap<String, Integer>();
    -  665  5
             final Map<String, Integer> productIdentifiers = new HashMap<String, Integer>();
    -  666  5
             analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);
    +  597  5
             final Map<String, Integer> vendorIdentifiers = new HashMap<String, Integer>();
    +  598  5
             final Map<String, Integer> productIdentifiers = new HashMap<String, Integer>();
    +  599  5
             analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);
    +  600   +
     
    +  601  5
             final int classCount = classNames.size();
    +  602  5
             final EvidenceCollection vendor = dependency.getVendorEvidence();
    +  603  5
             final EvidenceCollection product = dependency.getProductEvidence();
    +  604   +
     
    +  605  5
             for (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {
    +  606  48
                 final float ratio = entry.getValue() / (float) classCount;
    +  607  48
                 if (ratio > 0.5) {
    +  608   +
                     //TODO remove weighting
    +  609  10
                     vendor.addWeighting(entry.getKey());
    +  610  10
                     if (addPackagesAsEvidence && entry.getKey().length() > 1) {
    +  611  8
                         vendor.addEvidence("jar", "package name", entry.getKey(), Confidence.LOW);
    +  612   +
                     }
    +  613   +
                 }
    +  614  48
             }
    +  615  5
             for (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {
    +  616  985
                 final float ratio = entry.getValue() / (float) classCount;
    +  617  985
                 if (ratio > 0.5) {
    +  618  5
                     product.addWeighting(entry.getKey());
    +  619  5
                     if (addPackagesAsEvidence && entry.getKey().length() > 1) {
    +  620  4
                         product.addEvidence("jar", "package name", entry.getKey(), Confidence.LOW);
    +  621   +
                     }
    +  622   +
                 }
    +  623  985
             }
    +  624  5
         }
    +  625   +
     
    +  626   +
         /**
    +  627   +
          * <p>
    +  628   +
          * Reads the manifest from the JAR file and collects the entries. Some vendorKey entries are:</p>
    +  629   +
          * <ul><li>Implementation Title</li>
    +  630   +
          * <li>Implementation Version</li> <li>Implementation Vendor</li>
    +  631   +
          * <li>Implementation VendorId</li> <li>Bundle Name</li> <li>Bundle Version</li> <li>Bundle Vendor</li> <li>Bundle
    +  632   +
          * Description</li> <li>Main Class</li> </ul>
    +  633   +
          * However, all but a handful of specific entries are read in.
    +  634   +
          *
    +  635   +
          * @param dependency A reference to the dependency
    +  636   +
          * @param classInformation a collection of class information
    +  637   +
          * @return whether evidence was identified parsing the manifest
    +  638   +
          * @throws IOException if there is an issue reading the JAR file
    +  639   +
          */
    +  640   +
         protected boolean parseManifest(Dependency dependency, List<ClassNameInformation> classInformation) throws IOException {
    +  641  5
             boolean foundSomething = false;
    +  642  5
             JarFile jar = null;
    +  643   +
             try {
    +  644  5
                 jar = new JarFile(dependency.getActualFilePath());
    +  645   +
     
    +  646  5
                 final Manifest manifest = jar.getManifest();
    +  647   +
     
    +  648  5
                 if (manifest == null) {
    +  649   +
                     //don't log this for javadoc or sources jar files
    +  650  0
                     if (!dependency.getFileName().toLowerCase().endsWith("-sources.jar")
    +  651   +
                             && !dependency.getFileName().toLowerCase().endsWith("-javadoc.jar")
    +  652   +
                             && !dependency.getFileName().toLowerCase().endsWith("-src.jar")
    +  653   +
                             && !dependency.getFileName().toLowerCase().endsWith("-doc.jar")) {
    +  654  0
                         LOGGER.log(Level.FINE,
    +  655   +
                                 String.format("Jar file '%s' does not contain a manifest.",
    +  656   +
                                         dependency.getFileName()));
    +  657   +
                     }
    +  658  0
                     return false;
    +  659   +
                 }
    +  660  5
                 final Attributes atts = manifest.getMainAttributes();
    +  661   +
     
    +  662  5
                 final EvidenceCollection vendorEvidence = dependency.getVendorEvidence();
    +  663  5
                 final EvidenceCollection productEvidence = dependency.getProductEvidence();
    +  664  5
                 final EvidenceCollection versionEvidence = dependency.getVersionEvidence();
    +  665   +
     
    +  666  5
                 final String source = "Manifest";
     667  
     
    -  668  5
             final int classCount = classNames.size();
    -  669  5
             final EvidenceCollection vendor = dependency.getVendorEvidence();
    -  670  5
             final EvidenceCollection product = dependency.getProductEvidence();
    -  671   -
     
    -  672  5
             for (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {
    -  673  48
                 final float ratio = entry.getValue() / (float) classCount;
    -  674  48
                 if (ratio > 0.5) {
    -  675   -
                     //TODO remove weighting
    -  676  10
                     vendor.addWeighting(entry.getKey());
    -  677  10
                     if (addPackagesAsEvidence && entry.getKey().length() > 1) {
    -  678  8
                         vendor.addEvidence("jar", "package name", entry.getKey(), Confidence.LOW);
    -  679   +  668  5
                 for (Entry<Object, Object> entry : atts.entrySet()) {
    +  669  65
                     String key = entry.getKey().toString();
    +  670  65
                     String value = atts.getValue(key);
    +  671  65
                     if (HTML_DETECTION_PATTERN.matcher(value).find()) {
    +  672  0
                         value = Jsoup.parse(value).text();
    +  673  
                     }
    -  680   -
                 }
    -  681  48
             }
    -  682  5
             for (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {
    -  683  985
                 final float ratio = entry.getValue() / (float) classCount;
    -  684  985
                 if (ratio > 0.5) {
    -  685  5
                     product.addWeighting(entry.getKey());
    -  686  5
                     if (addPackagesAsEvidence && entry.getKey().length() > 1) {
    -  687  4
                         product.addEvidence("jar", "package name", entry.getKey(), Confidence.LOW);
    -  688   -
                     }
    -  689   -
                 }
    -  690  985
             }
    -  691  5
         }
    -  692   -
     
    -  693   -
         /**
    +  674  65
                     if (IGNORE_VALUES.contains(value)) {
    +  675  0
                         continue;
    +  676  65
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {
    +  677  1
                         foundSomething = true;
    +  678  1
                         productEvidence.addEvidence(source, key, value, Confidence.HIGH);
    +  679  1
                         addMatchingValues(classInformation, value, productEvidence);
    +  680  64
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {
    +  681  2
                         foundSomething = true;
    +  682  2
                         versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
    +  683  62
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {
    +  684  1
                         foundSomething = true;
    +  685  1
                         vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
    +  686  1
                         addMatchingValues(classInformation, value, vendorEvidence);
    +  687  61
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {
    +  688  0
                         foundSomething = true;
    +  689  0
                         vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  690  0
                         addMatchingValues(classInformation, value, vendorEvidence);
    +  691  61
                     } else if (key.equalsIgnoreCase(BUNDLE_DESCRIPTION)) {
    +  692  2
                         foundSomething = true;
    +  693  2
                         addDescription(dependency, value, "manifest", key);
     694   -
          * <p>
    -  695   -
          * Reads the manifest from the JAR file and collects the entries. Some vendorKey entries are:</p>
    -  696   -
          * <ul><li>Implementation Title</li>
    -  697   -
          * <li>Implementation Version</li> <li>Implementation Vendor</li>
    -  698   -
          * <li>Implementation VendorId</li> <li>Bundle Name</li> <li>Bundle Version</li> <li>Bundle Vendor</li> <li>Bundle
    -  699   -
          * Description</li> <li>Main Class</li> </ul>
    -  700   -
          * However, all but a handful of specific entries are read in.
    -  701   -
          *
    -  702   -
          * @param dependency A reference to the dependency
    -  703   -
          * @param classInformation a collection of class information
    -  704   -
          * @return whether evidence was identified parsing the manifest
    -  705   -
          * @throws IOException if there is an issue reading the JAR file
    -  706   -
          */
    -  707   -
         protected boolean parseManifest(Dependency dependency, List<ClassNameInformation> classInformation) throws IOException {
    -  708  5
             boolean foundSomething = false;
    -  709  5
             JarFile jar = null;
    -  710   -
             try {
    -  711  5
                 jar = new JarFile(dependency.getActualFilePath());
    -  712   -
     
    -  713  5
                 final Manifest manifest = jar.getManifest();
    -  714   -
     
    -  715  5
                 if (manifest == null) {
    -  716   -
                     //don't log this for javadoc or sources jar files
    -  717  0
                     if (!dependency.getFileName().toLowerCase().endsWith("-sources.jar")
    -  718   -
                             && !dependency.getFileName().toLowerCase().endsWith("-javadoc.jar")
    -  719   -
                             && !dependency.getFileName().toLowerCase().endsWith("-src.jar")
    -  720   -
                             && !dependency.getFileName().toLowerCase().endsWith("-doc.jar")) {
    -  721  0
                         LOGGER.log(Level.FINE,
    -  722   -
                                 String.format("Jar file '%s' does not contain a manifest.",
    -  723   -
                                         dependency.getFileName()));
    -  724   -
                     }
    -  725  0
                     return false;
    -  726   -
                 }
    -  727  5
                 final Attributes atts = manifest.getMainAttributes();
    -  728   -
     
    -  729  5
                 final EvidenceCollection vendorEvidence = dependency.getVendorEvidence();
    -  730  5
                 final EvidenceCollection productEvidence = dependency.getProductEvidence();
    -  731  5
                 final EvidenceCollection versionEvidence = dependency.getVersionEvidence();
    -  732   -
     
    -  733  5
                 final String source = "Manifest";
    -  734   -
     
    -  735  5
                 for (Entry<Object, Object> entry : atts.entrySet()) {
    -  736  65
                     String key = entry.getKey().toString();
    -  737  65
                     String value = atts.getValue(key);
    -  738  65
                     if (HTML_DETECTION_PATTERN.matcher(value).find()) {
    -  739  0
                         value = Jsoup.parse(value).text();
    -  740   -
                     }
    -  741  65
                     if (IGNORE_VALUES.contains(value)) {
    -  742  0
                         continue;
    -  743  65
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {
    -  744  1
                         foundSomething = true;
    -  745  1
                         productEvidence.addEvidence(source, key, value, Confidence.HIGH);
    -  746  1
                         addMatchingValues(classInformation, value, productEvidence);
    -  747  64
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {
    -  748  2
                         foundSomething = true;
    -  749  2
                         versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
    -  750  62
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {
    -  751  1
                         foundSomething = true;
    -  752  1
                         vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
    -  753  1
                         addMatchingValues(classInformation, value, vendorEvidence);
    -  754  61
                     } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {
    -  755  0
                         foundSomething = true;
    -  756  0
                         vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  757  0
                         addMatchingValues(classInformation, value, vendorEvidence);
    -  758  61
                     } else if (key.equalsIgnoreCase(BUNDLE_DESCRIPTION)) {
    -  759  2
                         foundSomething = true;
    -  760  2
                         addDescription(dependency, value, "manifest", key);
    -  761  
                         //productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  762  2
                         addMatchingValues(classInformation, value, productEvidence);
    -  763  59
                     } else if (key.equalsIgnoreCase(BUNDLE_NAME)) {
    -  764  3
                         foundSomething = true;
    -  765  3
                         productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  766  3
                         addMatchingValues(classInformation, value, productEvidence);
    -  767  56
                     } else if (key.equalsIgnoreCase(BUNDLE_VENDOR)) {
    -  768  3
                         foundSomething = true;
    -  769  3
                         vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
    -  770  3
                         addMatchingValues(classInformation, value, vendorEvidence);
    -  771  53
                     } else if (key.equalsIgnoreCase(BUNDLE_VERSION)) {
    -  772  3
                         foundSomething = true;
    -  773  3
                         versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
    -  774  50
                     } else if (key.equalsIgnoreCase(Attributes.Name.MAIN_CLASS.toString())) {
    -  775  2
                         continue;
    -  776   +  695  2
                         addMatchingValues(classInformation, value, productEvidence);
    +  696  59
                     } else if (key.equalsIgnoreCase(BUNDLE_NAME)) {
    +  697  3
                         foundSomething = true;
    +  698  3
                         productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  699  3
                         addMatchingValues(classInformation, value, productEvidence);
    +  700  56
                     } else if (key.equalsIgnoreCase(BUNDLE_VENDOR)) {
    +  701  3
                         foundSomething = true;
    +  702  3
                         vendorEvidence.addEvidence(source, key, value, Confidence.HIGH);
    +  703  3
                         addMatchingValues(classInformation, value, vendorEvidence);
    +  704  53
                     } else if (key.equalsIgnoreCase(BUNDLE_VERSION)) {
    +  705  3
                         foundSomething = true;
    +  706  3
                         versionEvidence.addEvidence(source, key, value, Confidence.HIGH);
    +  707  50
                     } else if (key.equalsIgnoreCase(Attributes.Name.MAIN_CLASS.toString())) {
    +  708  2
                         continue;
    +  709  
                         //skipping main class as if this has important information to add
    -  777   +  710  
                         // it will be added during class name analysis...  if other fields
    -  778   +  711  
                         // have the information from the class name then they will get added...
    -  779   +  712  
     //                    foundSomething = true;
    -  780   +  713  
     //                    productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  781   +  714  
     //                    vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  782   +  715  
     //                    addMatchingValues(classInformation, value, vendorEvidence);
    -  783   +  716  
     //                    addMatchingValues(classInformation, value, productEvidence);
    -  784   +  717  
                     } else {
    -  785  48
                         key = key.toLowerCase();
    -  786   +  718  48
                         key = key.toLowerCase();
    +  719  
     
    -  787  48
                         if (!IGNORE_KEYS.contains(key)
    -  788   +  720  48
                         if (!IGNORE_KEYS.contains(key)
    +  721  
                                 && !key.endsWith("jdk")
    -  789   +  722  
                                 && !key.contains("lastmodified")
    -  790   +  723  
                                 && !key.endsWith("package")
    -  791   +  724  
                                 && !key.endsWith("classpath")
    -  792   +  725  
                                 && !key.endsWith("class-path")
    -  793   +  726  
                                 && !key.endsWith("-scm") //todo change this to a regex?
    -  794   +  727  
                                 && !key.startsWith("scm-")
    -  795   +  728  
                                 && !value.trim().startsWith("scm:")
    -  796   +  729  
                                 && !isImportPackage(key, value)
    -  797   +  730  
                                 && !isPackage(key, value)) {
    -  798   +  731  
     
    -  799  14
                             foundSomething = true;
    -  800  14
                             if (key.contains("version")) {
    -  801  1
                                 if (key.contains("specification")) {
    -  802  1
                                     versionEvidence.addEvidence(source, key, value, Confidence.LOW);
    -  803   +  732  14
                             foundSomething = true;
    +  733  14
                             if (key.contains("version")) {
    +  734  1
                                 if (key.contains("specification")) {
    +  735  1
                                     versionEvidence.addEvidence(source, key, value, Confidence.LOW);
    +  736  
                                 } else {
    -  804  0
                                     versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  805   +  737  0
                                     versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  738  
                                 }
    -  806  13
                             } else if ("build-id".equals(key)) {
    -  807  0
                                 int pos = value.indexOf('(');
    -  808  0
                                 if (pos >= 0) {
    -  809  0
                                     value = value.substring(0, pos - 1);
    -  810   +  739  13
                             } else if ("build-id".equals(key)) {
    +  740  0
                                 int pos = value.indexOf('(');
    +  741  0
                                 if (pos >= 0) {
    +  742  0
                                     value = value.substring(0, pos - 1);
    +  743  
                                 }
    -  811  0
                                 pos = value.indexOf('[');
    -  812  0
                                 if (pos >= 0) {
    -  813  0
                                     value = value.substring(0, pos - 1);
    -  814   +  744  0
                                 pos = value.indexOf('[');
    +  745  0
                                 if (pos >= 0) {
    +  746  0
                                     value = value.substring(0, pos - 1);
    +  747  
                                 }
    -  815  0
                                 versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  816  0
                             } else if (key.contains("title")) {
    -  817  1
                                 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  818  1
                                 addMatchingValues(classInformation, value, productEvidence);
    -  819  12
                             } else if (key.contains("vendor")) {
    -  820  0
                                 if (key.contains("specification")) {
    -  821  0
                                     vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
    -  822   +  748  0
                                 versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  749  0
                             } else if (key.contains("title")) {
    +  750  1
                                 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  751  1
                                 addMatchingValues(classInformation, value, productEvidence);
    +  752  12
                             } else if (key.contains("vendor")) {
    +  753  0
                                 if (key.contains("specification")) {
    +  754  0
                                     vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
    +  755  
                                 } else {
    -  823  0
                                     vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  824  0
                                     addMatchingValues(classInformation, value, vendorEvidence);
    -  825   +  756  0
                                     vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  757  0
                                     addMatchingValues(classInformation, value, vendorEvidence);
    +  758  
                                 }
    -  826  12
                             } else if (key.contains("name")) {
    -  827  3
                                 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  828  3
                                 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    -  829  3
                                 addMatchingValues(classInformation, value, vendorEvidence);
    -  830  3
                                 addMatchingValues(classInformation, value, productEvidence);
    -  831  9
                             } else if (key.contains("license")) {
    -  832  2
                                 addLicense(dependency, value);
    -  833   +  759  12
                             } else if (key.contains("name")) {
    +  760  3
                                 productEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  761  3
                                 vendorEvidence.addEvidence(source, key, value, Confidence.MEDIUM);
    +  762  3
                                 addMatchingValues(classInformation, value, vendorEvidence);
    +  763  3
                                 addMatchingValues(classInformation, value, productEvidence);
    +  764  9
                             } else if (key.contains("license")) {
    +  765  2
                                 addLicense(dependency, value);
    +  766  
                             } else {
    -  834  7
                                 if (key.contains("description")) {
    -  835  0
                                     addDescription(dependency, value, "manifest", key);
    -  836   +  767  7
                                 if (key.contains("description")) {
    +  768  0
                                     addDescription(dependency, value, "manifest", key);
    +  769  
                                 } else {
    -  837  7
                                     productEvidence.addEvidence(source, key, value, Confidence.LOW);
    -  838  7
                                     vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
    -  839  7
                                     addMatchingValues(classInformation, value, vendorEvidence);
    -  840  7
                                     addMatchingValues(classInformation, value, productEvidence);
    -  841  7
                                     if (value.matches(".*\\d.*")) {
    -  842  3
                                         final StringTokenizer tokenizer = new StringTokenizer(value, " ");
    -  843  15
                                         while (tokenizer.hasMoreElements()) {
    -  844  12
                                             final String s = tokenizer.nextToken();
    -  845  12
                                             if (s.matches("^[0-9.]+$")) {
    -  846  1
                                                 versionEvidence.addEvidence(source, key, s, Confidence.LOW);
    -  847   +  770  7
                                     productEvidence.addEvidence(source, key, value, Confidence.LOW);
    +  771  7
                                     vendorEvidence.addEvidence(source, key, value, Confidence.LOW);
    +  772  7
                                     addMatchingValues(classInformation, value, vendorEvidence);
    +  773  7
                                     addMatchingValues(classInformation, value, productEvidence);
    +  774  7
                                     if (value.matches(".*\\d.*")) {
    +  775  3
                                         final StringTokenizer tokenizer = new StringTokenizer(value, " ");
    +  776  15
                                         while (tokenizer.hasMoreElements()) {
    +  777  12
                                             final String s = tokenizer.nextToken();
    +  778  12
                                             if (s.matches("^[0-9.]+$")) {
    +  779  1
                                                 versionEvidence.addEvidence(source, key, s, Confidence.LOW);
    +  780  
                                             }
    -  848  12
                                         }
    -  849   +  781  12
                                         }
    +  782  
                                     }
    -  850   +  783  
                                 }
    -  851   +  784  
                             }
    -  852   +  785  
                         }
    -  853   +  786  
                     }
    -  854  63
                 }
    -  855   +  787  63
                 }
    +  788  
             } finally {
    -  856  5
                 if (jar != null) {
    -  857  5
                     jar.close();
    -  858   +  789  5
                 if (jar != null) {
    +  790  5
                     jar.close();
    +  791  
                 }
    -  859   +  792  
             }
    -  860  5
             return foundSomething;
    -  861   +  793  5
             return foundSomething;
    +  794  
         }
    -  862   +  795  
     
    -  863   +  796  
         /**
    -  864   +  797  
          * Adds a description to the given dependency. If the description contains one of the following strings beyond 100 characters,
    -  865   +  798  
          * then the description used will be trimmed to that position:
    -  866   +  799  
          * <ul><li>"such as"</li><li>"like "</li><li>"will use "</li><li>"* uses "</li></ul>
    -  867   +  800  
          *
    -  868   +  801  
          * @param dependency a dependency
    -  869   +  802  
          * @param description the description
    -  870   +  803  
          * @param source the source of the evidence
    -  871   +  804  
          * @param key the "name" of the evidence
    -  872   +  805  
          * @return if the description is trimmed, the trimmed version is returned; otherwise the original description is returned
    +  806   +
          */
    +  807   +
         public static String addDescription(Dependency dependency, String description, String source, String key) {
    +  808  2
             if (dependency.getDescription() == null) {
    +  809  2
                 dependency.setDescription(description);
    +  810   +
             }
    +  811   +
             String desc;
    +  812  2
             if (HTML_DETECTION_PATTERN.matcher(description).find()) {
    +  813  0
                 desc = Jsoup.parse(description).text();
    +  814   +
             } else {
    +  815  2
                 desc = description;
    +  816   +
             }
    +  817  2
             dependency.setDescription(desc);
    +  818  2
             if (desc.length() > 100) {
    +  819  0
                 desc = desc.replaceAll("\\s\\s+", " ");
    +  820  0
                 final int posSuchAs = desc.toLowerCase().indexOf("such as ", 100);
    +  821  0
                 final int posLike = desc.toLowerCase().indexOf("like ", 100);
    +  822  0
                 final int posWillUse = desc.toLowerCase().indexOf("will use ", 100);
    +  823  0
                 final int posUses = desc.toLowerCase().indexOf(" uses ", 100);
    +  824  0
                 int pos = -1;
    +  825  0
                 pos = Math.max(pos, posSuchAs);
    +  826  0
                 if (pos >= 0 && posLike >= 0) {
    +  827  0
                     pos = Math.min(pos, posLike);
    +  828   +
                 } else {
    +  829  0
                     pos = Math.max(pos, posLike);
    +  830   +
                 }
    +  831  0
                 if (pos >= 0 && posWillUse >= 0) {
    +  832  0
                     pos = Math.min(pos, posWillUse);
    +  833   +
                 } else {
    +  834  0
                     pos = Math.max(pos, posWillUse);
    +  835   +
                 }
    +  836  0
                 if (pos >= 0 && posUses >= 0) {
    +  837  0
                     pos = Math.min(pos, posUses);
    +  838   +
                 } else {
    +  839  0
                     pos = Math.max(pos, posUses);
    +  840   +
                 }
    +  841   +
     
    +  842  0
                 if (pos > 0) {
    +  843  0
                     final StringBuilder sb = new StringBuilder(pos + 3);
    +  844  0
                     sb.append(desc.substring(0, pos));
    +  845  0
                     sb.append("...");
    +  846  0
                     desc = sb.toString();
    +  847   +
                 }
    +  848  0
                 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.LOW);
    +  849  0
                 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.LOW);
    +  850  0
             } else {
    +  851  2
                 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
    +  852  2
                 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
    +  853   +
             }
    +  854  2
             return desc;
    +  855   +
         }
    +  856   +
     
    +  857   +
         /**
    +  858   +
          * Adds a license to the given dependency.
    +  859   +
          *
    +  860   +
          * @param d a dependency
    +  861   +
          * @param license the license
    +  862   +
          */
    +  863   +
         private void addLicense(Dependency d, String license) {
    +  864  2
             if (d.getLicense() == null) {
    +  865  2
                 d.setLicense(license);
    +  866  0
             } else if (!d.getLicense().contains(license)) {
    +  867  0
                 d.setLicense(d.getLicense() + NEWLINE + license);
    +  868   +
             }
    +  869  2
         }
    +  870   +
     
    +  871   +
         /**
    +  872   +
          * The parent directory for the individual directories per archive.
     873  
          */
    -  874   -
         public static String addDescription(Dependency dependency, String description, String source, String key) {
    -  875  2
             if (dependency.getDescription() == null) {
    -  876  2
                 dependency.setDescription(description);
    +  874  7
         private File tempFileLocation = null;
    +  875   +
     
    +  876   +
         /**
     877   -
             }
    -  878   -
             String desc;
    -  879  2
             if (HTML_DETECTION_PATTERN.matcher(description).find()) {
    -  880  0
                 desc = Jsoup.parse(description).text();
    -  881   -
             } else {
    -  882  2
                 desc = description;
    -  883   -
             }
    -  884  2
             dependency.setDescription(desc);
    -  885  2
             if (desc.length() > 100) {
    -  886  0
                 desc = desc.replaceAll("\\s\\s+", " ");
    -  887  0
                 final int posSuchAs = desc.toLowerCase().indexOf("such as ", 100);
    -  888  0
                 final int posLike = desc.toLowerCase().indexOf("like ", 100);
    -  889  0
                 final int posWillUse = desc.toLowerCase().indexOf("will use ", 100);
    -  890  0
                 final int posUses = desc.toLowerCase().indexOf(" uses ", 100);
    -  891  0
                 int pos = -1;
    -  892  0
                 pos = Math.max(pos, posSuchAs);
    -  893  0
                 if (pos >= 0 && posLike >= 0) {
    -  894  0
                     pos = Math.min(pos, posLike);
    -  895   -
                 } else {
    -  896  0
                     pos = Math.max(pos, posLike);
    -  897   -
                 }
    -  898  0
                 if (pos >= 0 && posWillUse >= 0) {
    -  899  0
                     pos = Math.min(pos, posWillUse);
    -  900   -
                 } else {
    -  901  0
                     pos = Math.max(pos, posWillUse);
    -  902   -
                 }
    -  903  0
                 if (pos >= 0 && posUses >= 0) {
    -  904  0
                     pos = Math.min(pos, posUses);
    -  905   -
                 } else {
    -  906  0
                     pos = Math.max(pos, posUses);
    -  907   -
                 }
    -  908   -
     
    -  909  0
                 if (pos > 0) {
    -  910  0
                     final StringBuilder sb = new StringBuilder(pos + 3);
    -  911  0
                     sb.append(desc.substring(0, pos));
    -  912  0
                     sb.append("...");
    -  913  0
                     desc = sb.toString();
    -  914   -
                 }
    -  915  0
                 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.LOW);
    -  916  0
                 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.LOW);
    -  917  0
             } else {
    -  918  2
                 dependency.getProductEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
    -  919  2
                 dependency.getVendorEvidence().addEvidence(source, key, desc, Confidence.MEDIUM);
    -  920   -
             }
    -  921  2
             return desc;
    -  922   -
         }
    -  923   -
     
    -  924   -
         /**
    -  925   -
          * Adds a license to the given dependency.
    -  926   -
          *
    -  927   -
          * @param d a dependency
    -  928   -
          * @param license the license
    -  929   -
          */
    -  930   -
         private void addLicense(Dependency d, String license) {
    -  931  2
             if (d.getLicense() == null) {
    -  932  2
                 d.setLicense(license);
    -  933  0
             } else if (!d.getLicense().contains(license)) {
    -  934  0
                 d.setLicense(d.getLicense() + NEWLINE + license);
    -  935   -
             }
    -  936  2
         }
    -  937   -
     
    -  938   -
         /**
    -  939   -
          * The parent directory for the individual directories per archive.
    -  940   -
          */
    -  941  7
         private File tempFileLocation = null;
    -  942   -
     
    -  943   -
         /**
    -  944  
          * Initializes the JarAnalyzer.
    -  945   +  878  
          *
    -  946   +  879  
          * @throws Exception is thrown if there is an exception creating a temporary directory
    -  947   +  880  
          */
    -  948   +  881  
         @Override
    -  949   +  882  
         public void initializeFileTypeAnalyzer() throws Exception {
    -  950  1
             final File baseDir = Settings.getTempDirectory();
    -  951  1
             tempFileLocation = File.createTempFile("check", "tmp", baseDir);
    -  952  1
             if (!tempFileLocation.delete()) {
    -  953  0
                 final String msg = String.format("Unable to delete temporary file '%s'.", tempFileLocation.getAbsolutePath());
    -  954  0
                 throw new AnalysisException(msg);
    -  955   +  883  1
             final File baseDir = Settings.getTempDirectory();
    +  884  1
             tempFileLocation = File.createTempFile("check", "tmp", baseDir);
    +  885  1
             if (!tempFileLocation.delete()) {
    +  886  0
                 final String msg = String.format("Unable to delete temporary file '%s'.", tempFileLocation.getAbsolutePath());
    +  887  0
                 throw new AnalysisException(msg);
    +  888  
             }
    -  956  1
             if (!tempFileLocation.mkdirs()) {
    -  957  0
                 final String msg = String.format("Unable to create directory '%s'.", tempFileLocation.getAbsolutePath());
    -  958  0
                 throw new AnalysisException(msg);
    -  959   +  889  1
             if (!tempFileLocation.mkdirs()) {
    +  890  0
                 final String msg = String.format("Unable to create directory '%s'.", tempFileLocation.getAbsolutePath());
    +  891  0
                 throw new AnalysisException(msg);
    +  892  
             }
    -  960  1
         }
    -  961   +  893  1
         }
    +  894  
     
    -  962   +  895  
         /**
    -  963   +  896  
          * Deletes any files extracted from the JAR during analysis.
    -  964   +  897  
          */
    -  965   +  898  
         @Override
    -  966   +  899  
         public void close() {
    -  967  1
             if (tempFileLocation != null && tempFileLocation.exists()) {
    -  968  1
                 LOGGER.log(Level.FINE, "Attempting to delete temporary files");
    -  969  1
                 final boolean success = FileUtils.delete(tempFileLocation);
    -  970  1
                 if (!success) {
    -  971  0
                     LOGGER.log(Level.WARNING,
    -  972   +  900  1
             if (tempFileLocation != null && tempFileLocation.exists()) {
    +  901  1
                 LOGGER.log(Level.FINE, "Attempting to delete temporary files");
    +  902  1
                 final boolean success = FileUtils.delete(tempFileLocation);
    +  903  1
                 if (!success) {
    +  904  0
                     LOGGER.log(Level.WARNING,
    +  905  
                             "Failed to delete some temporary files, see the log for more details");
    -  973   +  906  
                 }
    -  974   +  907  
             }
    -  975  1
         }
    -  976   +  908  1
         }
    +  909  
     
    -  977   +  910  
         /**
    -  978   +  911  
          * <p>
    -  979   +  912  
          * A utility function that will interpolate strings based on values given in the properties file. It will also interpolate the
    -  980   +  913  
          * strings contained within the properties file so that properties can reference other properties.</p>
    -  981   +  914  
          * <p>
    -  982   +  915  
          * <b>Note:</b> if there is no property found the reference will be removed. In other words, if the interpolated string will
    -  983   +  916  
          * be replaced with an empty string.
    -  984   +  917  
          * </p>
    -  985   +  918  
          * <p>
    -  986   +  919  
          * Example:</p>
    -  987   +  920  
          * <code>
    -  988   +  921  
          * Properties p = new Properties();
    -  989   +  922  
          * p.setProperty("key", "value");
    -  990   +  923  
          * String s = interpolateString("'${key}' and '${nothing}'", p);
    -  991   +  924  
          * System.out.println(s);
    -  992   +  925  
          * </code>
    -  993   +  926  
          * <p>
    -  994   +  927  
          * Will result in:</p>
    -  995   +  928  
          * <code>
    -  996   +  929  
          * 'value' and ''
    -  997   +  930  
          * </code>
    -  998   +  931  
          *
    -  999   +  932  
          * @param text the string that contains references to properties.
    -  1000   +  933  
          * @param properties a collection of properties that may be referenced within the text.
    -  1001   +  934  
          * @return the interpolated text.
    -  1002   +  935  
          */
    -  1003   +  936  
         public static String interpolateString(String text, Properties properties) {
    -  1004  14
             final Properties props = properties;
    -  1005  14
             if (text == null) {
    -  1006  1
                 return text;
    -  1007   +  937  14
             final Properties props = properties;
    +  938  14
             if (text == null) {
    +  939  1
                 return text;
    +  940  
             }
    -  1008  13
             if (props == null) {
    -  1009  6
                 return text;
    -  1010   +  941  13
             if (props == null) {
    +  942  6
                 return text;
    +  943  
             }
    -  1011   +  944  
     
    -  1012  7
             final int pos = text.indexOf("${");
    -  1013  7
             if (pos < 0) {
    -  1014  4
                 return text;
    -  1015   +  945  7
             final int pos = text.indexOf("${");
    +  946  7
             if (pos < 0) {
    +  947  4
                 return text;
    +  948  
             }
    -  1016  3
             final int end = text.indexOf("}");
    -  1017  3
             if (end < pos) {
    -  1018  0
                 return text;
    -  1019   +  949  3
             final int end = text.indexOf("}");
    +  950  3
             if (end < pos) {
    +  951  0
                 return text;
    +  952  
             }
    -  1020   +  953  
     
    -  1021  3
             final String propName = text.substring(pos + 2, end);
    -  1022  3
             String propValue = interpolateString(props.getProperty(propName), props);
    -  1023  3
             if (propValue == null) {
    -  1024  0
                 propValue = "";
    -  1025   +  954  3
             final String propName = text.substring(pos + 2, end);
    +  955  3
             String propValue = interpolateString(props.getProperty(propName), props);
    +  956  3
             if (propValue == null) {
    +  957  0
                 propValue = "";
    +  958  
             }
    -  1026  3
             final StringBuilder sb = new StringBuilder(propValue.length() + text.length());
    -  1027  3
             sb.append(text.subSequence(0, pos));
    -  1028  3
             sb.append(propValue);
    -  1029  3
             sb.append(text.substring(end + 1));
    -  1030  3
             return interpolateString(sb.toString(), props); //yes yes, this should be a loop...
    -  1031   +  959  3
             final StringBuilder sb = new StringBuilder(propValue.length() + text.length());
    +  960  3
             sb.append(text.subSequence(0, pos));
    +  961  3
             sb.append(propValue);
    +  962  3
             sb.append(text.substring(end + 1));
    +  963  3
             return interpolateString(sb.toString(), props); //yes yes, this should be a loop...
    +  964  
         }
    -  1032   +  965  
     
    -  1033   +  966  
         /**
    -  1034   +  967  
          * Determines if the key value pair from the manifest is for an "import" type entry for package names.
    -  1035   +  968  
          *
    -  1036   +  969  
          * @param key the key from the manifest
    -  1037   +  970  
          * @param value the value from the manifest
    -  1038   +  971  
          * @return true or false depending on if it is believed the entry is an "import" entry
    -  1039   +  972  
          */
    -  1040   +  973  
         private boolean isImportPackage(String key, String value) {
    -  1041  15
             final Pattern packageRx = Pattern.compile("^([a-zA-Z0-9_#\\$\\*\\.]+\\s*[,;]\\s*)+([a-zA-Z0-9_#\\$\\*\\.]+\\s*)?$");
    -  1042  15
             final boolean matches = packageRx.matcher(value).matches();
    -  1043  15
             return matches && (key.contains("import") || key.contains("include") || value.length() > 10);
    -  1044   +  974  15
             final Pattern packageRx = Pattern.compile("^([a-zA-Z0-9_#\\$\\*\\.]+\\s*[,;]\\s*)+([a-zA-Z0-9_#\\$\\*\\.]+\\s*)?$");
    +  975  15
             final boolean matches = packageRx.matcher(value).matches();
    +  976  15
             return matches && (key.contains("import") || key.contains("include") || value.length() > 10);
    +  977  
         }
    -  1045   +  978  
     
    -  1046   +  979  
         /**
    -  1047   +  980  
          * Cycles through an enumeration of JarEntries, contained within the dependency, and returns a list of the class names. This
    -  1048   +  981  
          * does not include core Java package names (i.e. java.* or javax.*).
    -  1049   +  982  
          *
    -  1050   +  983  
          * @param dependency the dependency being analyzed
    -  1051   +  984  
          * @return an list of fully qualified class names
    -  1052   +  985  
          */
    -  1053   +  986  
         private List<ClassNameInformation> collectClassNames(Dependency dependency) {
    -  1054  5
             final List<ClassNameInformation> classNames = new ArrayList<ClassNameInformation>();
    -  1055  5
             JarFile jar = null;
    -  1056   +  987  5
             final List<ClassNameInformation> classNames = new ArrayList<ClassNameInformation>();
    +  988  5
             JarFile jar = null;
    +  989  
             try {
    -  1057  5
                 jar = new JarFile(dependency.getActualFilePath());
    -  1058  5
                 final Enumeration entries = jar.entries();
    -  1059  1848
                 while (entries.hasMoreElements()) {
    -  1060  1843
                     final JarEntry entry = (JarEntry) entries.nextElement();
    -  1061  1843
                     final String name = entry.getName().toLowerCase();
    -  1062   +  990  5
                 jar = new JarFile(dependency.getActualFilePath());
    +  991  5
                 final Enumeration entries = jar.entries();
    +  992  1848
                 while (entries.hasMoreElements()) {
    +  993  1843
                     final JarEntry entry = (JarEntry) entries.nextElement();
    +  994  1843
                     final String name = entry.getName().toLowerCase();
    +  995  
                     //no longer stripping "|com\\.sun" - there are some com.sun jar files with CVEs.
    -  1063  1843
                     if (name.endsWith(".class") && !name.matches("^javax?\\..*$")) {
    -  1064  1535
                         final ClassNameInformation className = new ClassNameInformation(name.substring(0, name.length() - 6));
    -  1065  1535
                         classNames.add(className);
    -  1066   +  996  1843
                     if (name.endsWith(".class") && !name.matches("^javax?\\..*$")) {
    +  997  1535
                         final ClassNameInformation className = new ClassNameInformation(name.substring(0, name.length() - 6));
    +  998  1535
                         classNames.add(className);
    +  999  
                     }
    -  1067  1843
                 }
    -  1068  0
             } catch (IOException ex) {
    -  1069  0
                 final String msg = String.format("Unable to open jar file '%s'.", dependency.getFileName());
    -  1070  0
                 LOGGER.log(Level.WARNING, msg);
    -  1071  0
                 LOGGER.log(Level.FINE, null, ex);
    -  1072   +  1000  1843
                 }
    +  1001  0
             } catch (IOException ex) {
    +  1002  0
                 final String msg = String.format("Unable to open jar file '%s'.", dependency.getFileName());
    +  1003  0
                 LOGGER.log(Level.WARNING, msg);
    +  1004  0
                 LOGGER.log(Level.FINE, null, ex);
    +  1005  
             } finally {
    -  1073  5
                 if (jar != null) {
    -  1074   +  1006  5
                 if (jar != null) {
    +  1007  
                     try {
    -  1075  5
                         jar.close();
    -  1076  0
                     } catch (IOException ex) {
    -  1077  0
                         LOGGER.log(Level.FINEST, null, ex);
    -  1078  5
                     }
    -  1079   +  1008  5
                         jar.close();
    +  1009  0
                     } catch (IOException ex) {
    +  1010  0
                         LOGGER.log(Level.FINEST, null, ex);
    +  1011  5
                     }
    +  1012  
                 }
    -  1080   +  1013  
             }
    -  1081  5
             return classNames;
    -  1082   +  1014  5
             return classNames;
    +  1015  
         }
    -  1083   +  1016  
     
    -  1084   +  1017  
         /**
    -  1085   +  1018  
          * Cycles through the list of class names and places the package levels 0-3 into the provided maps for vendor and product.
    -  1086   +  1019  
          * This is helpful when analyzing vendor/product as many times this is included in the package name.
    -  1087   +  1020  
          *
    -  1088   +  1021  
          * @param classNames a list of class names
    -  1089   +  1022  
          * @param vendor HashMap of possible vendor names from package names (e.g. owasp)
    -  1090   +  1023  
          * @param product HashMap of possible product names from package names (e.g. dependencycheck)
    -  1091   +  1024  
          */
    -  1092   +  1025  
         private void analyzeFullyQualifiedClassNames(List<ClassNameInformation> classNames,
    -  1093   +  1026  
                 Map<String, Integer> vendor, Map<String, Integer> product) {
    -  1094  5
             for (ClassNameInformation entry : classNames) {
    -  1095  1535
                 final List<String> list = entry.getPackageStructure();
    -  1096  1535
                 addEntry(vendor, list.get(0));
    -  1097   +  1027  5
             for (ClassNameInformation entry : classNames) {
    +  1028  1535
                 final List<String> list = entry.getPackageStructure();
    +  1029  1535
                 addEntry(vendor, list.get(0));
    +  1030  
     
    -  1098  1535
                 if (list.size() == 2) {
    -  1099  0
                     addEntry(product, list.get(1));
    -  1100   +  1031  1535
                 if (list.size() == 2) {
    +  1032  0
                     addEntry(product, list.get(1));
    +  1033  
                 }
    -  1101  1535
                 if (list.size() == 3) {
    -  1102  345
                     addEntry(vendor, list.get(1));
    -  1103  345
                     addEntry(product, list.get(1));
    -  1104  345
                     addEntry(product, list.get(2));
    -  1105   +  1034  1535
                 if (list.size() == 3) {
    +  1035  345
                     addEntry(vendor, list.get(1));
    +  1036  345
                     addEntry(product, list.get(1));
    +  1037  345
                     addEntry(product, list.get(2));
    +  1038  
                 }
    -  1106  1535
                 if (list.size() >= 4) {
    -  1107  1190
                     addEntry(vendor, list.get(1));
    -  1108  1190
                     addEntry(vendor, list.get(2));
    -  1109  1190
                     addEntry(product, list.get(1));
    -  1110  1190
                     addEntry(product, list.get(2));
    -  1111  1190
                     addEntry(product, list.get(3));
    -  1112   +  1039  1535
                 if (list.size() >= 4) {
    +  1040  1190
                     addEntry(vendor, list.get(1));
    +  1041  1190
                     addEntry(vendor, list.get(2));
    +  1042  1190
                     addEntry(product, list.get(1));
    +  1043  1190
                     addEntry(product, list.get(2));
    +  1044  1190
                     addEntry(product, list.get(3));
    +  1045  
                 }
    -  1113  1535
             }
    -  1114  5
         }
    -  1115   +  1046  1535
             }
    +  1047  5
         }
    +  1048  
     
    -  1116   +  1049  
         /**
    -  1117   +  1050  
          * Adds an entry to the specified collection and sets the Integer (e.g. the count) to 1. If the entry already exists in the
    -  1118   +  1051  
          * collection then the Integer is incremented by 1.
    -  1119   +  1052  
          *
    -  1120   +  1053  
          * @param collection a collection of strings and their occurrence count
    -  1121   +  1054  
          * @param key the key to add to the collection
    -  1122   +  1055  
          */
    -  1123   +  1056  
         private void addEntry(Map<String, Integer> collection, String key) {
    -  1124  8520
             if (collection.containsKey(key)) {
    -  1125  7487
                 collection.put(key, collection.get(key) + 1);
    -  1126   +  1057  8520
             if (collection.containsKey(key)) {
    +  1058  7487
                 collection.put(key, collection.get(key) + 1);
    +  1059  
             } else {
    -  1127  1033
                 collection.put(key, 1);
    -  1128   +  1060  1033
                 collection.put(key, 1);
    +  1061  
             }
    -  1129  8520
         }
    -  1130   +  1062  8520
         }
    +  1063  
     
    -  1131   +  1064  
         /**
    -  1132   +  1065  
          * Cycles through the collection of class name information to see if parts of the package names are contained in the provided
    -  1133   +  1066  
          * value. If found, it will be added as the HIGHEST confidence evidence because we have more then one source corroborating the
    -  1134   +  1067  
          * value.
    -  1135   +  1068  
          *
    -  1136   +  1069  
          * @param classes a collection of class name information
    -  1137   +  1070  
          * @param value the value to check to see if it contains a package name
    -  1138   +  1071  
          * @param evidence the evidence collection to add new entries too
    -  1139   +  1072  
          */
    -  1140   +  1073  
         private void addMatchingValues(List<ClassNameInformation> classes, String value, EvidenceCollection evidence) {
    -  1141  39
             if (value == null || value.isEmpty() || classes == null || classes.isEmpty()) {
    -  1142  0
                 return;
    -  1143   +  1074  39
             if (value == null || value.isEmpty() || classes == null || classes.isEmpty()) {
    +  1075  0
                 return;
    +  1076  
             }
    -  1144  39
             final String text = value.toLowerCase();
    -  1145  39
             for (ClassNameInformation cni : classes) {
    -  1146  15708
                 for (String key : cni.getPackageStructure()) {
    -  1147  60662
                     if (text.contains(key)) { //note, package structure elements are already lowercase.
    -  1148  14608
                         evidence.addEvidence("jar", "package name", key, Confidence.HIGHEST);
    -  1149   +  1077  39
             final String text = value.toLowerCase();
    +  1078  39
             for (ClassNameInformation cni : classes) {
    +  1079  15708
                 for (String key : cni.getPackageStructure()) {
    +  1080  60662
                     if (text.contains(key)) { //note, package structure elements are already lowercase.
    +  1081  14608
                         evidence.addEvidence("jar", "package name", key, Confidence.HIGHEST);
    +  1082  
                     }
    -  1150  60662
                 }
    -  1151  15708
             }
    -  1152  39
         }
    -  1153   +  1083  60662
                 }
    +  1084  15708
             }
    +  1085  39
         }
    +  1086  
     
    -  1154   +  1087  
         /**
    -  1155   +  1088  
          * Simple check to see if the attribute from a manifest is just a package name.
    -  1156   +  1089  
          *
    -  1157   +  1090  
          * @param key the key of the value to check
    -  1158   +  1091  
          * @param value the value to check
    -  1159   +  1092  
          * @return true if the value looks like a java package name, otherwise false
    -  1160   +  1093  
          */
    -  1161   +  1094  
         private boolean isPackage(String key, String value) {
    -  1162   +  1095  
     
    -  1163  15
             return !key.matches(".*(version|title|vendor|name|license|description).*")
    -  1164   +  1096  15
             return !key.matches(".*(version|title|vendor|name|license|description).*")
    +  1097  
                     && value.matches("^([a-zA-Z_][a-zA-Z0-9_\\$]*(\\.[a-zA-Z_][a-zA-Z0-9_\\$]*)*)?$");
    -  1165   +  1098  
     
    -  1166   +  1099  
         }
    -  1167   +  1100  
     
    -  1168   +  1101  
         /**
    -  1169   +  1102  
          * Extracts the license information from the pom and adds it to the dependency.
    -  1170   +  1103  
          *
    -  1171   +  1104  
          * @param pom the pom object
    -  1172   +  1105  
          * @param pomProperties the properties, used for string interpolation
    -  1173   +  1106  
          * @param dependency the dependency to add license information too
    -  1174   +  1107  
          */
    -  1175   +  1108  
         public static void extractLicense(Model pom, Properties pomProperties, Dependency dependency) {
    -  1176   +  1109  
             //license
    -  1177  1
             if (pom.getLicenses() != null) {
    -  1178  0
                 String license = null;
    -  1179  0
                 for (License lic : pom.getLicenses().getLicense()) {
    -  1180  0
                     String tmp = null;
    -  1181  0
                     if (lic.getName() != null) {
    -  1182  0
                         tmp = interpolateString(lic.getName(), pomProperties);
    -  1183   +  1110  1
             if (pom.getLicenses() != null) {
    +  1111  1
                 String license = null;
    +  1112  1
                 for (License lic : pom.getLicenses()) {
    +  1113  0
                     String tmp = null;
    +  1114  0
                     if (lic.getName() != null) {
    +  1115  0
                         tmp = interpolateString(lic.getName(), pomProperties);
    +  1116  
                     }
    -  1184  0
                     if (lic.getUrl() != null) {
    -  1185  0
                         if (tmp == null) {
    -  1186  0
                             tmp = interpolateString(lic.getUrl(), pomProperties);
    -  1187   +  1117  0
                     if (lic.getUrl() != null) {
    +  1118  0
                         if (tmp == null) {
    +  1119  0
                             tmp = interpolateString(lic.getUrl(), pomProperties);
    +  1120  
                         } else {
    -  1188  0
                             tmp += ": " + interpolateString(lic.getUrl(), pomProperties);
    -  1189   +  1121  0
                             tmp += ": " + interpolateString(lic.getUrl(), pomProperties);
    +  1122  
                         }
    -  1190   +  1123  
                     }
    -  1191  0
                     if (tmp == null) {
    -  1192  0
                         continue;
    -  1193   +  1124  0
                     if (tmp == null) {
    +  1125  0
                         continue;
    +  1126  
                     }
    -  1194  0
                     if (HTML_DETECTION_PATTERN.matcher(tmp).find()) {
    -  1195  0
                         tmp = Jsoup.parse(tmp).text();
    -  1196   +  1127  0
                     if (HTML_DETECTION_PATTERN.matcher(tmp).find()) {
    +  1128  0
                         tmp = Jsoup.parse(tmp).text();
    +  1129  
                     }
    -  1197  0
                     if (license == null) {
    -  1198  0
                         license = tmp;
    -  1199   +  1130  0
                     if (license == null) {
    +  1131  0
                         license = tmp;
    +  1132  
                     } else {
    -  1200  0
                         license += "\n" + tmp;
    -  1201   +  1133  0
                         license += "\n" + tmp;
    +  1134  
                     }
    -  1202  0
                 }
    -  1203  0
                 if (license != null) {
    -  1204  0
                     dependency.setLicense(license);
    -  1205   +  1135  0
                 }
    +  1136  1
                 if (license != null) {
    +  1137  0
                     dependency.setLicense(license);
    +  1138  
                 }
    -  1206   +  1139  
             }
    -  1207  1
         }
    -  1208   +  1140  1
         }
    +  1141  
     
    -  1209   +  1142  
         /**
    -  1210   +  1143  
          * Stores information about a class name.
    -  1211   +  1144  
          */
    -  1212   +  1145  
         protected static class ClassNameInformation {
    +  1146   +
     
    +  1147   +
             /**
    +  1148   +
              * <p>
    +  1149   +
              * Stores information about a given class name. This class will keep the fully qualified class name and a list of the
    +  1150   +
              * important parts of the package structure. Up to the first four levels of the package structure are stored, excluding a
    +  1151   +
              * leading "org" or "com". Example:</p>
    +  1152   +
              * <code>ClassNameInformation obj = new ClassNameInformation("org.owasp.dependencycheck.analyzer.JarAnalyzer");
    +  1153   +
              * System.out.println(obj.getName());
    +  1154   +
              * for (String p : obj.getPackageStructure())
    +  1155   +
              *     System.out.println(p);
    +  1156   +
              * </code>
    +  1157   +
              * <p>
    +  1158   +
              * Would result in:</p>
    +  1159   +
              * <code>org.owasp.dependencycheck.analyzer.JarAnalyzer
    +  1160   +
              * owasp
    +  1161   +
              * dependencycheck
    +  1162   +
              * analyzer
    +  1163   +
              * jaranalyzer</code>
    +  1164   +
              *
    +  1165   +
              * @param className a fully qualified class name
    +  1166   +
              */
    +  1167  1535
             ClassNameInformation(String className) {
    +  1168  1535
                 name = className;
    +  1169  1535
                 if (name.contains("/")) {
    +  1170  1535
                     final String[] tmp = className.toLowerCase().split("/");
    +  1171  1535
                     int start = 0;
    +  1172  1535
                     int end = 3;
    +  1173  1535
                     if ("com".equals(tmp[0]) || "org".equals(tmp[0])) {
    +  1174  1535
                         start = 1;
    +  1175  1535
                         end = 4;
    +  1176   +
                     }
    +  1177  1535
                     if (tmp.length <= end) {
    +  1178  345
                         end = tmp.length - 1;
    +  1179   +
                     }
    +  1180  7330
                     for (int i = start; i <= end; i++) {
    +  1181  5795
                         packageStructure.add(tmp[i]);
    +  1182   +
                     }
    +  1183  1535
                 } else {
    +  1184  0
                     packageStructure.add(name);
    +  1185   +
                 }
    +  1186  1535
             }
    +  1187   +
             /**
    +  1188   +
              * The fully qualified class name.
    +  1189   +
              */
    +  1190   +
             private String name;
    +  1191   +
     
    +  1192   +
             /**
    +  1193   +
              * Get the value of name
    +  1194   +
              *
    +  1195   +
              * @return the value of name
    +  1196   +
              */
    +  1197   +
             public String getName() {
    +  1198  0
                 return name;
    +  1199   +
             }
    +  1200   +
     
    +  1201   +
             /**
    +  1202   +
              * Set the value of name
    +  1203   +
              *
    +  1204   +
              * @param name new value of name
    +  1205   +
              */
    +  1206   +
             public void setName(String name) {
    +  1207  0
                 this.name = name;
    +  1208  0
             }
    +  1209   +
             /**
    +  1210   +
              * Up to the first four levels of the package structure, excluding a leading "org" or "com".
    +  1211   +
              */
    +  1212  1535
             private final ArrayList<String> packageStructure = new ArrayList<String>();
     1213  
     
     1214  
             /**
     1215   -
              * <p>
    -  1216   -
              * Stores information about a given class name. This class will keep the fully qualified class name and a list of the
    -  1217   -
              * important parts of the package structure. Up to the first four levels of the package structure are stored, excluding a
    -  1218   -
              * leading "org" or "com". Example:</p>
    -  1219   -
              * <code>ClassNameInformation obj = new ClassNameInformation("org.owasp.dependencycheck.analyzer.JarAnalyzer");
    -  1220   -
              * System.out.println(obj.getName());
    -  1221   -
              * for (String p : obj.getPackageStructure())
    -  1222   -
              *     System.out.println(p);
    -  1223   -
              * </code>
    -  1224   -
              * <p>
    -  1225   -
              * Would result in:</p>
    -  1226   -
              * <code>org.owasp.dependencycheck.analyzer.JarAnalyzer
    -  1227   -
              * owasp
    -  1228   -
              * dependencycheck
    -  1229   -
              * analyzer
    -  1230   -
              * jaranalyzer</code>
    -  1231   -
              *
    -  1232   -
              * @param className a fully qualified class name
    -  1233   -
              */
    -  1234  1535
             ClassNameInformation(String className) {
    -  1235  1535
                 name = className;
    -  1236  1535
                 if (name.contains("/")) {
    -  1237  1535
                     final String[] tmp = className.toLowerCase().split("/");
    -  1238  1535
                     int start = 0;
    -  1239  1535
                     int end = 3;
    -  1240  1535
                     if ("com".equals(tmp[0]) || "org".equals(tmp[0])) {
    -  1241  1535
                         start = 1;
    -  1242  1535
                         end = 4;
    -  1243   -
                     }
    -  1244  1535
                     if (tmp.length <= end) {
    -  1245  345
                         end = tmp.length - 1;
    -  1246   -
                     }
    -  1247  7330
                     for (int i = start; i <= end; i++) {
    -  1248  5795
                         packageStructure.add(tmp[i]);
    -  1249   -
                     }
    -  1250  1535
                 } else {
    -  1251  0
                     packageStructure.add(name);
    -  1252   -
                 }
    -  1253  1535
             }
    -  1254   -
             /**
    -  1255   -
              * The fully qualified class name.
    -  1256   -
              */
    -  1257   -
             private String name;
    -  1258   -
     
    -  1259   -
             /**
    -  1260   -
              * Get the value of name
    -  1261   -
              *
    -  1262   -
              * @return the value of name
    -  1263   -
              */
    -  1264   -
             public String getName() {
    -  1265  0
                 return name;
    -  1266   -
             }
    -  1267   -
     
    -  1268   -
             /**
    -  1269   -
              * Set the value of name
    -  1270   -
              *
    -  1271   -
              * @param name new value of name
    -  1272   -
              */
    -  1273   -
             public void setName(String name) {
    -  1274  0
                 this.name = name;
    -  1275  0
             }
    -  1276   -
             /**
    -  1277   -
              * Up to the first four levels of the package structure, excluding a leading "org" or "com".
    -  1278   -
              */
    -  1279  1535
             private final ArrayList<String> packageStructure = new ArrayList<String>();
    -  1280   -
     
    -  1281   -
             /**
    -  1282  
              * Get the value of packageStructure
    -  1283   +  1216  
              *
    -  1284   +  1217  
              * @return the value of packageStructure
    -  1285   +  1218  
              */
    -  1286   +  1219  
             public ArrayList<String> getPackageStructure() {
    -  1287  17243
                 return packageStructure;
    -  1288   +  1220  17243
                 return packageStructure;
    +  1221  
             }
    -  1289   +  1222  
         }
    -  1290   +  1223  
     
    -  1291   +  1224  
         /**
    -  1292   +  1225  
          * Retrieves the next temporary directory to extract an archive too.
    -  1293   +  1226  
          *
    -  1294   +  1227  
          * @return a directory
    -  1295   +  1228  
          * @throws AnalysisException thrown if unable to create temporary directory
    -  1296   +  1229  
          */
    -  1297   +  1230  
         private File getNextTempDirectory() throws AnalysisException {
    -  1298  0
             dirCount += 1;
    -  1299  0
             final File directory = new File(tempFileLocation, String.valueOf(dirCount));
    -  1300   +  1231  0
             dirCount += 1;
    +  1232  0
             final File directory = new File(tempFileLocation, String.valueOf(dirCount));
    +  1233  
             //getting an exception for some directories not being able to be created; might be because the directory already exists?
    -  1301  0
             if (directory.exists()) {
    -  1302  0
                 return getNextTempDirectory();
    -  1303   +  1234  0
             if (directory.exists()) {
    +  1235  0
                 return getNextTempDirectory();
    +  1236  
             }
    -  1304  0
             if (!directory.mkdirs()) {
    -  1305  0
                 final String msg = String.format("Unable to create temp directory '%s'.", directory.getAbsolutePath());
    -  1306  0
                 throw new AnalysisException(msg);
    -  1307   +  1237  0
             if (!directory.mkdirs()) {
    +  1238  0
                 final String msg = String.format("Unable to create temp directory '%s'.", directory.getAbsolutePath());
    +  1239  0
                 throw new AnalysisException(msg);
    +  1240  
             }
    -  1308  0
             return directory;
    -  1309   +  1241  0
             return directory;
    +  1242  
         }
    -  1310   +  1243  
     }
    - + 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 3bdc4a7ef..39942edb8 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html @@ -92,7 +92,7 @@  37  
      *
     38   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     39  
      */
     40  5
     public class JavaScriptAnalyzer extends AbstractFileTypeAnalyzer {
    @@ -274,6 +274,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html index 63f79d2ce..5f4440823 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 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    NexusAnalyzer
    20%
    14/70
    4%
    1/24
    3.375
    NexusAnalyzer
    18%
    13/69
    4%
    1/24
    3.375
     
    @@ -88,7 +88,7 @@  35  
     import org.owasp.dependencycheck.dependency.Evidence;
     36   -
     import org.owasp.dependencycheck.jaxb.pom.PomUtils;
    +
     import org.owasp.dependencycheck.xml.pom.PomUtils;
     37  
     import org.owasp.dependencycheck.utils.InvalidSettingException;
     38   @@ -112,13 +112,13 @@  47  
      * <ul>
     48   -
      * <li>{@link org.owasp.dependencycheck.utils.Settings.KEYS#ANALYZER_NEXUS_ENABLED} determines whether this analyzer is
    +
      * <li>{@link org.owasp.dependencycheck.utils.Settings.KEYS#ANALYZER_NEXUS_ENABLED} determines whether this analyzer is even
     49   -
      * even enabled. This can be overridden by setting the system property.</li>
    +
      * enabled. This can be overridden by setting the system property.</li>
     50   -
      * <li>{@link org.owasp.dependencycheck.utils.Settings.KEYS#ANALYZER_NEXUS_URL} the URL to a Nexus service to search by
    +
      * <li>{@link org.owasp.dependencycheck.utils.Settings.KEYS#ANALYZER_NEXUS_URL} the URL to a Nexus service to search by SHA-1.
     51   -
      * SHA-1. There is an expected <code>%s</code> in this where the SHA-1 will get entered.</li>
    +
      * There is an expected <code>%s</code> in this where the SHA-1 will get entered.</li>
     52  
      * </ul>
     53   @@ -195,278 +195,271 @@
          */
     91  2
         private final boolean enabled = checkEnabled();
     92   -
         /**
    +
     
     93   -
          * Field for doing POM work
    +
         /**
     94   -
          */
    -  95  2
         private final PomUtils pomUtil = new PomUtils();
    -  96   -
     
    -  97   -
         /**
    -  98  
          * Determines if this analyzer is enabled
    -  99   +  95  
          *
    -  100   +  96  
          * @return <code>true</code> if the analyzer is enabled; otherwise <code>false</code>
    -  101   +  97  
          */
    -  102   +  98  
         private boolean checkEnabled() {
    -  103   +  99  
             /* Enable this analyzer ONLY if the Nexus URL has been set to something
    -  104   +  100  
              other than the default one (if it's the default one, we'll use the
    -  105   +  101  
              central one) and it's enabled by the user.
    -  106   +  102  
              */
    -  107  2
             boolean retval = false;
    -  108   +  103  2
             boolean retval = false;
    +  104  
             try {
    -  109  2
                 if ((!DEFAULT_URL.equals(Settings.getString(Settings.KEYS.ANALYZER_NEXUS_URL)))
    -  110   +  105  2
                 if ((!DEFAULT_URL.equals(Settings.getString(Settings.KEYS.ANALYZER_NEXUS_URL)))
    +  106  
                         && Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED)) {
    -  111  0
                     LOGGER.info("Enabling Nexus analyzer");
    -  112  0
                     retval = true;
    -  113   +  107  0
                     LOGGER.info("Enabling Nexus analyzer");
    +  108  0
                     retval = true;
    +  109  
                 } else {
    -  114  2
                     LOGGER.fine("Nexus analyzer disabled, using Central instead");
    +  110  2
                     LOGGER.fine("Nexus analyzer disabled, using Central instead");
    +  111   +
                 }
    +  112  0
             } catch (InvalidSettingException ise) {
    +  113  0
                 LOGGER.warning("Invalid setting. Disabling Nexus analyzer");
    +  114  2
             }
     115   -
                 }
    -  116  0
             } catch (InvalidSettingException ise) {
    -  117  0
                 LOGGER.warning("Invalid setting. Disabling Nexus analyzer");
    -  118  2
             }
    +
     
    +  116  2
             return retval;
    +  117   +
         }
    +  118   +
     
     119   -
     
    -  120  2
             return retval;
    -  121   -
         }
    -  122   -
     
    -  123  
         /**
    -  124   +  120  
          * Determine whether to enable this analyzer or not.
    -  125   +  121  
          *
    -  126   +  122  
          * @return whether the analyzer should be enabled
    -  127   +  123  
          */
    -  128   +  124  
         @Override
    -  129   +  125  
         public boolean isEnabled() {
    -  130  0
             return enabled;
    -  131   +  126  0
             return enabled;
    +  127  
         }
    -  132   +  128  
     
    -  133   +  129  
         /**
    -  134   +  130  
          * Initializes the analyzer once before any analysis is performed.
    -  135   +  131  
          *
    -  136   +  132  
          * @throws Exception if there's an error during initialization
    -  137   +  133  
          */
    -  138   +  134  
         @Override
    -  139   +  135  
         public void initializeFileTypeAnalyzer() throws Exception {
    -  140  0
             LOGGER.fine("Initializing Nexus Analyzer");
    -  141  0
             LOGGER.fine(String.format("Nexus Analyzer enabled: %s", isEnabled()));
    -  142  0
             if (isEnabled()) {
    -  143  0
                 final String searchUrl = Settings.getString(Settings.KEYS.ANALYZER_NEXUS_URL);
    -  144  0
                 LOGGER.fine(String.format("Nexus Analyzer URL: %s", searchUrl));
    -  145   +  136  0
             LOGGER.fine("Initializing Nexus Analyzer");
    +  137  0
             LOGGER.fine(String.format("Nexus Analyzer enabled: %s", isEnabled()));
    +  138  0
             if (isEnabled()) {
    +  139  0
                 final String searchUrl = Settings.getString(Settings.KEYS.ANALYZER_NEXUS_URL);
    +  140  0
                 LOGGER.fine(String.format("Nexus Analyzer URL: %s", searchUrl));
    +  141  
                 try {
    -  146  0
                     searcher = new NexusSearch(new URL(searchUrl));
    -  147  0
                     if (!searcher.preflightRequest()) {
    -  148  0
                         LOGGER.warning("There was an issue getting Nexus status. Disabling analyzer.");
    -  149  0
                         setEnabled(false);
    -  150   +  142  0
                     searcher = new NexusSearch(new URL(searchUrl));
    +  143  0
                     if (!searcher.preflightRequest()) {
    +  144  0
                         LOGGER.warning("There was an issue getting Nexus status. Disabling analyzer.");
    +  145  0
                         setEnabled(false);
    +  146  
                     }
    -  151  0
                 } catch (MalformedURLException mue) {
    -  152   +  147  0
                 } catch (MalformedURLException mue) {
    +  148  
                     // I know that initialize can throw an exception, but we'll
    -  153   +  149  
                     // just disable the analyzer if the URL isn't valid
    -  154  0
                     LOGGER.warning(String.format("Property %s not a valid URL. Nexus Analyzer disabled", searchUrl));
    -  155  0
                     setEnabled(false);
    -  156  0
                 }
    +  150  0
                     LOGGER.warning(String.format("Property %s not a valid URL. Nexus Analyzer disabled", searchUrl));
    +  151  0
                     setEnabled(false);
    +  152  0
                 }
    +  153   +
             }
    +  154  0
         }
    +  155   +
     
    +  156   +
         /**
     157   -
             }
    -  158  0
         }
    -  159   -
     
    -  160   -
         /**
    -  161  
          * Returns the analyzer's name.
    -  162   +  158  
          *
    -  163   +  159  
          * @return the name of the analyzer
    -  164   +  160  
          */
    -  165   +  161  
         @Override
    -  166   +  162  
         public String getName() {
    -  167  4
             return ANALYZER_NAME;
    -  168   +  163  4
             return ANALYZER_NAME;
    +  164  
         }
    -  169   +  165  
     
    -  170   +  166  
         /**
    -  171   +  167  
          * Returns the key used in the properties file to reference the analyzer's enabled property.
    -  172   +  168  
          *
    -  173   +  169  
          * @return the analyzer's enabled property setting key
    -  174   +  170  
          */
    -  175   +  171  
         @Override
    -  176   +  172  
         protected String getAnalyzerEnabledSettingKey() {
    -  177  2
             return Settings.KEYS.ANALYZER_NEXUS_ENABLED;
    -  178   +  173  2
             return Settings.KEYS.ANALYZER_NEXUS_ENABLED;
    +  174  
         }
    -  179   +  175  
     
    -  180   +  176  
         /**
    -  181   +  177  
          * Returns the analysis phase under which the analyzer runs.
    -  182   +  178  
          *
    -  183   +  179  
          * @return the phase under which this analyzer runs
    -  184   +  180  
          */
    -  185   +  181  
         @Override
    -  186   +  182  
         public AnalysisPhase getAnalysisPhase() {
    -  187  1
             return ANALYSIS_PHASE;
    -  188   +  183  1
             return ANALYSIS_PHASE;
    +  184  
         }
    -  189   +  185  
     
    -  190   +  186  
         /**
    -  191   +  187  
          * Returns the extensions for which this Analyzer runs.
    -  192   +  188  
          *
    -  193   +  189  
          * @return the extensions for which this Analyzer runs
    -  194   +  190  
          */
    -  195   +  191  
         @Override
    -  196   +  192  
         public Set<String> getSupportedExtensions() {
    -  197  0
             return SUPPORTED_EXTENSIONS;
    -  198   +  193  0
             return SUPPORTED_EXTENSIONS;
    +  194  
         }
    -  199   +  195  
     
    -  200   +  196  
         /**
    -  201   +  197  
          * Performs the analysis.
    -  202   +  198  
          *
    -  203   +  199  
          * @param dependency the dependency to analyze
    -  204   +  200  
          * @param engine the engine
    -  205   +  201  
          * @throws AnalysisException when there's an exception during analysis
    -  206   +  202  
          */
    -  207   +  203  
         @Override
    -  208   +  204  
         public void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException {
    -  209  0
             if (!isEnabled()) {
    -  210  0
                 return;
    -  211   +  205  0
             if (!isEnabled()) {
    +  206  0
                 return;
    +  207  
             }
    -  212   +  208  
             try {
    -  213  0
                 final MavenArtifact ma = searcher.searchSha1(dependency.getSha1sum());
    -  214  0
                 dependency.addAsEvidence("nexus", ma, Confidence.HIGH);
    -  215  0
                 boolean pomAnalyzed = false;
    -  216  0
                 LOGGER.fine("POM URL " + ma.getPomUrl());
    -  217  0
                 for (Evidence e : dependency.getVendorEvidence()) {
    -  218  0
                     if ("pom".equals(e.getSource())) {
    -  219  0
                         pomAnalyzed = true;
    -  220  0
                         break;
    +  209  0
                 final MavenArtifact ma = searcher.searchSha1(dependency.getSha1sum());
    +  210  0
                 dependency.addAsEvidence("nexus", ma, Confidence.HIGH);
    +  211  0
                 boolean pomAnalyzed = false;
    +  212  0
                 LOGGER.fine("POM URL " + ma.getPomUrl());
    +  213  0
                 for (Evidence e : dependency.getVendorEvidence()) {
    +  214  0
                     if ("pom".equals(e.getSource())) {
    +  215  0
                         pomAnalyzed = true;
    +  216  0
                         break;
    +  217   +
                     }
    +  218  0
                 }
    +  219  0
                 if (!pomAnalyzed && ma.getPomUrl() != null) {
    +  220  0
                     File pomFile = null;
     221   -
                     }
    -  222  0
                 }
    -  223  0
                 if (!pomAnalyzed && ma.getPomUrl() != null) {
    -  224  0
                     File pomFile = null;
    -  225  
                     try {
    -  226  0
                         final File baseDir = Settings.getTempDirectory();
    -  227  0
                         pomFile = File.createTempFile("pom", ".xml", baseDir);
    -  228  0
                         if (!pomFile.delete()) {
    -  229  0
                             final String msg = String.format("Unable to fetch pom.xml for %s from Nexus repository; "
    -  230   +  222  0
                         final File baseDir = Settings.getTempDirectory();
    +  223  0
                         pomFile = File.createTempFile("pom", ".xml", baseDir);
    +  224  0
                         if (!pomFile.delete()) {
    +  225  0
                             final String msg = String.format("Unable to fetch pom.xml for %s from Nexus repository; "
    +  226  
                                     + "this could result in undetected CPE/CVEs.", dependency.getFileName());
    -  231  0
                             LOGGER.warning(msg);
    -  232  0
                             LOGGER.fine("Unable to delete temp file");
    -  233   +  227  0
                             LOGGER.warning(msg);
    +  228  0
                             LOGGER.fine("Unable to delete temp file");
    +  229  
                         }
    -  234  0
                         LOGGER.fine(String.format("Downloading %s", ma.getPomUrl()));
    -  235  0
                         Downloader.fetchFile(new URL(ma.getPomUrl()), pomFile);
    -  236  0
                         pomUtil.analyzePOM(dependency, pomFile);
    -  237  0
                     } catch (DownloadFailedException ex) {
    -  238  0
                         final String msg = String.format("Unable to download pom.xml for %s from Nexus repository; "
    -  239   +  230  0
                         LOGGER.fine(String.format("Downloading %s", ma.getPomUrl()));
    +  231  0
                         Downloader.fetchFile(new URL(ma.getPomUrl()), pomFile);
    +  232  0
                         PomUtils.analyzePOM(dependency, pomFile);
    +  233  0
                     } catch (DownloadFailedException ex) {
    +  234  0
                         final String msg = String.format("Unable to download pom.xml for %s from Nexus repository; "
    +  235  
                                 + "this could result in undetected CPE/CVEs.", dependency.getFileName());
    -  240  0
                         LOGGER.warning(msg);
    -  241   +  236  0
                         LOGGER.warning(msg);
    +  237  
                     } finally {
    -  242  0
                         if (pomFile != null && !FileUtils.deleteQuietly(pomFile)) {
    -  243  0
                             pomFile.deleteOnExit();
    -  244   +  238  0
                         if (pomFile != null && !FileUtils.deleteQuietly(pomFile)) {
    +  239  0
                             pomFile.deleteOnExit();
    +  240  
                         }
    -  245   +  241  
                     }
    -  246   +  242  
                 }
    -  247  0
             } catch (IllegalArgumentException iae) {
    -  248   +  243  0
             } catch (IllegalArgumentException iae) {
    +  244  
                 //dependency.addAnalysisException(new AnalysisException("Invalid SHA-1"));
    -  249  0
                 LOGGER.info(String.format("invalid sha-1 hash on %s", dependency.getFileName()));
    -  250  0
             } catch (FileNotFoundException fnfe) {
    -  251   +  245  0
                 LOGGER.info(String.format("invalid sha-1 hash on %s", dependency.getFileName()));
    +  246  0
             } catch (FileNotFoundException fnfe) {
    +  247  
                 //dependency.addAnalysisException(new AnalysisException("Artifact not found on repository"));
    -  252  0
                 LOGGER.fine(String.format("Artifact not found in repository '%s'", dependency.getFileName()));
    -  253  0
                 LOGGER.log(Level.FINE, fnfe.getMessage(), fnfe);
    -  254  0
             } catch (IOException ioe) {
    -  255   +  248  0
                 LOGGER.fine(String.format("Artifact not found in repository '%s'", dependency.getFileName()));
    +  249  0
                 LOGGER.log(Level.FINE, fnfe.getMessage(), fnfe);
    +  250  0
             } catch (IOException ioe) {
    +  251  
                 //dependency.addAnalysisException(new AnalysisException("Could not connect to repository", ioe));
    -  256  0
                 LOGGER.log(Level.FINE, "Could not connect to nexus repository", ioe);
    -  257  0
             }
    -  258  0
         }
    -  259   +  252  0
                 LOGGER.log(Level.FINE, "Could not connect to nexus repository", ioe);
    +  253  0
             }
    +  254  0
         }
    +  255  
     }
    - + 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 fd6587ddc..f03c8b4fb 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html @@ -296,6 +296,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html index a4ecd8d6f..f368989de 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html @@ -86,7 +86,7 @@  34  
      *
     35   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     36  
      */
     37  2
     public class NvdCveAnalyzer implements Analyzer {
    @@ -292,6 +292,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html index 626d400b3..135e6c457 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html @@ -74,7 +74,7 @@  28  
      *
     29   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     30  
      */
     31  2
     public class VulnerabilitySuppressionAnalyzer extends AbstractSuppressionAnalyzer {
    @@ -159,6 +159,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.AnalysisException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.AnalysisException.html index 5759a1078..2749f3cda 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -143,6 +143,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.html index ba5d6a664..dedc065e9 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -143,6 +143,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html index a2a44c5fa..67f9bcc9f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html @@ -286,6 +286,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html index 7eb296dd9..573bbb4f3 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 @@ -124,7 +124,7 @@  53  
      *
     54   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     55  
      */
     56   @@ -356,13 +356,13 @@
          */
     185  
         public void saveEntry(String vendor, String product, IndexWriter indexWriter) throws CorruptIndexException, IOException {
    -  186  24669
             final Document doc = new Document();
    -  187  24669
             final Field v = new TextField(Fields.VENDOR, vendor, Field.Store.YES);
    -  188  24669
             final Field p = new TextField(Fields.PRODUCT, product, Field.Store.YES);
    -  189  24669
             doc.add(v);
    -  190  24669
             doc.add(p);
    -  191  24669
             indexWriter.addDocument(doc);
    -  192  24669
         }
    +  186  24789
             final Document doc = new Document();
    +  187  24789
             final Field v = new TextField(Fields.VENDOR, vendor, Field.Store.YES);
    +  188  24789
             final Field p = new TextField(Fields.PRODUCT, product, Field.Store.YES);
    +  189  24789
             doc.add(v);
    +  190  24789
             doc.add(p);
    +  191  24789
             indexWriter.addDocument(doc);
    +  192  24789
         }
     193  
     
     194   @@ -424,8 +424,8 @@
                 try {
     233  1
                     final Set<Pair<String, String>> data = cve.getVendorProductList();
     234  1
                     for (Pair<String, String> pair : data) {
    -  235  24669
                         saveEntry(pair.getLeft(), pair.getRight(), indexWriter);
    -  236  24669
                     }
    +  235  24789
                         saveEntry(pair.getLeft(), pair.getRight(), indexWriter);
    +  236  24789
                     }
     237  0
                 } catch (DatabaseException ex) {
     238  0
                     LOGGER.log(Level.FINE, null, ex);
     239  0
                     throw new IndexException("Error reading CPE data", ex);
    @@ -553,7 +553,7 @@
          */
     315  
         public Document getDocument(int documentId) throws IOException {
    -  316  43
             return indexSearcher.doc(documentId);
    +  316  47
             return indexSearcher.doc(documentId);
     317  
         }
     318   @@ -581,6 +581,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html index 86843b483..ec5fd5032 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -107,6 +107,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html index 1501c06a7..bb7d5108f 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 @@ -70,10 +70,10 @@  26  
      *
     27   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     28  
      */
    -  29  1377
     public class IndexEntry implements Serializable {
    +  29  1381
     public class IndexEntry implements Serializable {
     30  
     
     31   @@ -168,8 +168,8 @@
          */
     79  
         public void setVendor(String vendor) {
    -  80  1376
             this.vendor = vendor;
    -  81  1376
         }
    +  80  1380
             this.vendor = vendor;
    +  81  1380
         }
     82  
         /**
     83   @@ -192,7 +192,7 @@
          */
     92  
         public String getProduct() {
    -  93  58
             return product;
    +  93  62
             return product;
     94  
         }
     95   @@ -209,8 +209,8 @@
          */
     101  
         public void setProduct(String product) {
    -  102  1376
             this.product = product;
    -  103  1376
         }
    +  102  1380
             this.product = product;
    +  103  1380
         }
     104  
         /**
     105   @@ -250,8 +250,8 @@
          */
     123  
         public void setSearchScore(float searchScore) {
    -  124  43
             this.searchScore = searchScore;
    -  125  43
         }
    +  124  47
             this.searchScore = searchScore;
    +  125  47
         }
     126  
     
     127   @@ -320,17 +320,17 @@
         @Override
     164  
         public boolean equals(Object obj) {
    -  165  139
             if (obj == null) {
    +  165  171
             if (obj == null) {
     166  0
                 return false;
     167  
             }
    -  168  139
             if (getClass() != obj.getClass()) {
    +  168  171
             if (getClass() != obj.getClass()) {
     169  0
                 return false;
     170  
             }
    -  171  139
             final IndexEntry other = (IndexEntry) obj;
    -  172  139
             if ((this.vendor == null) ? (other.vendor != null) : !this.vendor.equals(other.vendor)) {
    -  173  134
                 return false;
    +  171  171
             final IndexEntry other = (IndexEntry) obj;
    +  172  171
             if ((this.vendor == null) ? (other.vendor != null) : !this.vendor.equals(other.vendor)) {
    +  173  166
                 return false;
     174  
             }
     175  5
             if ((this.product == null) ? (other.product != null) : !this.product.equals(other.product)) {
    @@ -356,13 +356,13 @@
         @Override
     187  
         public String toString() {
    -  188  43
             return "IndexEntry{" + "vendor=" + vendor + ", product=" + product + '}';
    +  188  47
             return "IndexEntry{" + "vendor=" + vendor + ", product=" + product + '}';
     189  
         }
     190  
     }
    - + 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 e73e3b2f6..835aeacbd 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -143,6 +143,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html index ab5d34caf..5d49952b1 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 @@ -74,7 +74,7 @@  28  
      *
     29   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     30  
      */
     31   @@ -182,6 +182,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html index c5cce9d74..803243dc5 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 @@ -72,7 +72,7 @@  27  
      *
     28   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     29  
      */
     30  0
     public class CweHandler extends DefaultHandler {
    @@ -121,6 +121,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html index 6031f2c11..ecb31a8bf 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 @@ -72,7 +72,7 @@  27  
      *
     28   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     29  
      */
     30   @@ -85,7 +85,7 @@
          * The char term attribute.
     34  
          */
    -  35  10
         private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
    +  35  9
         private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
     36  
     
     37   @@ -100,7 +100,7 @@
          */
     42  
         protected CharTermAttribute getTermAtt() {
    -  43  25757
             return termAtt;
    +  43  19600
             return termAtt;
     44  
         }
     45   @@ -125,7 +125,7 @@
          */
     55  
         protected LinkedList<String> getTokens() {
    -  56  25758
             return tokens;
    +  56  19490
             return tokens;
     57  
         }
     58   @@ -142,9 +142,9 @@
          */
     64  
         public AbstractTokenizingFilter(TokenStream stream) {
    -  65  10
             super(stream);
    -  66  10
             tokens = new LinkedList<String>();
    -  67  10
         }
    +  65  9
             super(stream);
    +  66  9
             tokens = new LinkedList<String>();
    +  67  9
         }
     68  
     
     69   @@ -159,20 +159,20 @@
          */
     74  
         protected boolean addTerm() {
    -  75  25700
             final boolean termAdded = !tokens.isEmpty();
    -  76  25697
             if (termAdded) {
    -  77  17242
                 final String term = tokens.pop();
    -  78  17240
                 clearAttributes();
    -  79  17239
                 termAtt.append(term);
    +  75  19420
             final boolean termAdded = !tokens.isEmpty();
    +  76  19177
             if (termAdded) {
    +  77  12818
                 final String term = tokens.pop();
    +  78  12798
                 clearAttributes();
    +  79  12919
                 termAtt.append(term);
     80  
             }
    -  81  25694
             return termAdded;
    +  81  19203
             return termAdded;
     82  
         }
     83  
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html index 5191d7d3c..06933afa6 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 @@ -70,7 +70,7 @@  26  
      *
     27   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     28  
      */
     29   @@ -131,13 +131,13 @@
         @Override
     59  
         protected boolean isTokenChar(int c) {
    -  60  588397
             return Character.isLetter(c) || Character.isDigit(c);
    +  60  591571
             return Character.isLetter(c) || Character.isDigit(c);
     61  
         }
     62  
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html index 551341dcf..e498ee131 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 @@ -64,7 +64,7 @@  23  
      *
     24   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     25  
      */
     26  0
     public class DependencySimilarity extends DefaultSimilarity {
    @@ -111,6 +111,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html index f84ff720c..3a5a6f92e 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 @@ -86,7 +86,7 @@  34  
      *
     35   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     36  
      */
     37   @@ -170,6 +170,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html index 6ff52f72d..6eab9b151 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 @@ -70,7 +70,7 @@  26  
      *
     27   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     28  
      */
     29   @@ -124,15 +124,15 @@
                 final CharSequence text) {
     55  
     
    -  56  102
             if (text == null || buf == null) {
    +  56  150
             if (text == null || buf == null) {
     57  1
                 return;
     58  
             }
     59  
     
    -  60  991
             for (int i = 0; i < text.length(); i++) {
    -  61  890
                 final char c = text.charAt(i);
    -  62  890
                 switch (c) {
    +  60  1291
             for (int i = 0; i < text.length(); i++) {
    +  61  1142
                 final char c = text.charAt(i);
    +  62  1142
                 switch (c) {
     63  
                     case '+':
     64   @@ -172,14 +172,14 @@  81  58
                         buf.append('\\');
     82  
                     default:
    -  83  890
                         buf.append(c);
    +  83  1142
                         buf.append(c);
     84  
                         break;
     85  
                 }
     86  
             }
    -  87  101
         }
    +  87  149
         }
     88  
     
     89   @@ -198,27 +198,27 @@
         public static String escapeLuceneQuery(final CharSequence text) {
     96  
     
    -  97  101
             if (text == null) {
    +  97  149
             if (text == null) {
     98  1
                 return null;
     99  
             }
     100  
     
    -  101  100
             int size = text.length();
    -  102  100
             size = size >> 1;
    -  103  100
             final StringBuilder buf = new StringBuilder(size);
    +  101  148
             int size = text.length();
    +  102  148
             size = size >> 1;
    +  103  148
             final StringBuilder buf = new StringBuilder(size);
     104  
     
    -  105  100
             appendEscapedLuceneQuery(buf, text);
    +  105  148
             appendEscapedLuceneQuery(buf, text);
     106  
     
    -  107  100
             return buf.toString();
    +  107  148
             return buf.toString();
     108  
         }
     109  
     }
    - + 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 cc883b9ed..bdb40841e 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 @@ -82,7 +82,7 @@  32  
      *
     33   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     34  
      */
     35   @@ -196,6 +196,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html index 85da73540..cd7853518 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 @@ -80,7 +80,7 @@  31  
      *
     32   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     33  
      */
     34   @@ -185,35 +185,35 @@
     
     87  
             //collect all the terms into the words collection
    -  88  650
             while (input.incrementToken()) {
    -  89  184
                 final String word = new String(termAtt.buffer(), 0, termAtt.length());
    -  90  184
                 words.add(word);
    -  91  184
             }
    +  88  842
             while (input.incrementToken()) {
    +  89  232
                 final String word = new String(termAtt.buffer(), 0, termAtt.length());
    +  90  232
                 words.add(word);
    +  91  232
             }
     92  
     
     93  
             //if we have a previousTerm - write it out as its own token concatenated
     94  
             // with the current word (if one is available).
    -  95  466
             if (previousWord != null && !words.isEmpty()) {
    -  96  176
                 final String word = words.getFirst();
    -  97  176
                 clearAttributes();
    -  98  176
                 termAtt.append(previousWord).append(word);
    -  99  176
                 previousWord = null;
    -  100  176
                 return true;
    +  95  610
             if (previousWord != null && !words.isEmpty()) {
    +  96  224
                 final String word = words.getFirst();
    +  97  224
                 clearAttributes();
    +  98  224
                 termAtt.append(previousWord).append(word);
    +  99  224
                 previousWord = null;
    +  100  224
                 return true;
     101  
             }
     102  
             //if we have words, write it out as a single token
    -  103  290
             if (!words.isEmpty()) {
    -  104  184
                 final String word = words.removeFirst();
    -  105  184
                 clearAttributes();
    -  106  184
                 termAtt.append(word);
    -  107  184
                 previousWord = word;
    -  108  184
                 return true;
    +  103  386
             if (!words.isEmpty()) {
    +  104  232
                 final String word = words.removeFirst();
    +  105  232
                 clearAttributes();
    +  106  232
                 termAtt.append(word);
    +  107  232
                 previousWord = word;
    +  108  232
                 return true;
     109  
             }
    -  110  106
             return false;
    +  110  154
             return false;
     111  
         }
     112   @@ -241,6 +241,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html index 30acf624a..3d8e34094 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 @@ -88,7 +88,7 @@  35  
      *
     36   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     37  
      */
     38   @@ -112,8 +112,8 @@
          */
     48  
         public UrlTokenizingFilter(TokenStream stream) {
    -  49  10
             super(stream);
    -  50  10
         }
    +  49  9
             super(stream);
    +  50  9
         }
     51  
     
     52   @@ -134,11 +134,11 @@
         @Override
     60  
         public boolean incrementToken() throws IOException {
    -  61  25752
             final LinkedList<String> tokens = getTokens();
    -  62  25750
             final CharTermAttribute termAtt = getTermAtt();
    -  63  25757
             if (tokens.isEmpty() && input.incrementToken()) {
    -  64  17235
                 final String text = new String(termAtt.buffer(), 0, termAtt.length());
    -  65  17231
                 if (UrlStringUtils.containsUrl(text)) {
    +  61  19218
             final LinkedList<String> tokens = getTokens();
    +  62  19329
             final CharTermAttribute termAtt = getTermAtt();
    +  63  19573
             if (tokens.isEmpty() && input.incrementToken()) {
    +  64  12952
                 final String text = new String(termAtt.buffer(), 0, termAtt.length());
    +  65  12840
                 if (UrlStringUtils.containsUrl(text)) {
     66  6
                     final String[] parts = text.split("\\s");
     67  12
                     for (String part : parts) {
     68  6
                         if (UrlStringUtils.isUrl(part)) {
    @@ -158,18 +158,18 @@  79  
                     }
     80  6
                 } else {
    -  81  17224
                     tokens.add(text);
    +  81  12860
                     tokens.add(text);
     82  
                 }
     83  
             }
    -  84  25693
             return addTerm();
    +  84  19288
             return addTerm();
     85  
         }
     86  
     }
    - + 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 660df0fa5..65453e5e8 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 @@ -415,6 +415,6 @@
     // vim: cc=120:sw=4:ts=4:sts=4
    - + 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 b5100d9b6..cf23d0e49 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 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    NexusSearch
    0%
    0/57
    0%
    0/24
    8.667
    NexusSearch
    0%
    0/59
    0%
    0/24
    8.667
     
    @@ -102,7 +102,7 @@  42  
         /**
     43   -
          * The root URL for the Nexus repository service
    +
          * The root URL for the Nexus repository service.
     44  
          */
     45   @@ -112,232 +112,244 @@  47  
         /**
     48   -
          * Whether to use the Proxy when making requests
    +
          * Whether to use the Proxy when making requests.
     49  
          */
     50  
         private boolean useProxy;
     51   -
     
    +
         /**
     52   -
         /**
    +
          * The username to use if the Nexus requires authentication.
     53   -
          * Used for logging.
    -  54  
          */
    -  55  0
         private static final Logger LOGGER = Logger.getLogger(NexusSearch.class
    +  54  0
         private String userName = null;
    +  55   +
         /**
     56   -
                 .getName());
    +
          * The password to use if the Nexus requires authentication.
     57   -
     
    +
          */
     58   -
         /**
    +
         private char[] password;
     59   -
          * Creates a NexusSearch for the given repository URL.
    -  60   -
          *
    -  61   -
          * @param rootURL the root URL of the repository on which searches should execute. full URL's are calculated relative to this
    -  62   -
          * URL, so it should end with a /
    -  63   -
          */
    -  64  0
         public NexusSearch(URL rootURL) {
    -  65  0
             this.rootURL = rootURL;
    -  66   -
             try {
    -  67  0
                 if (null != Settings.getString(Settings.KEYS.PROXY_SERVER)
    -  68   -
                         && Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY)) {
    -  69  0
                     useProxy = true;
    -  70  0
                     LOGGER.fine("Using proxy");
    -  71   -
                 } else {
    -  72  0
                     useProxy = false;
    -  73  0
                     LOGGER.fine("Not using proxy");
    -  74   -
                 }
    -  75  0
             } catch (InvalidSettingException ise) {
    -  76  0
                 useProxy = false;
    -  77  0
             }
    -  78  0
         }
    -  79   -
     
    -  80  
         /**
    -  81   -
          * Searches the configured Nexus repository for the given sha1 hash. If the artifact is found, a <code>MavenArtifact</code> is
    -  82   -
          * populated with the coordinate information.
    -  83   -
          *
    -  84   -
          * @param sha1 The SHA-1 hash string for which to search
    -  85   -
          * @return the populated Maven coordinates
    -  86   -
          * @throws IOException if it's unable to connect to the specified repository or if the specified artifact is not found.
    -  87   +  60   +
          * Used for logging.
    +  61  
          */
    +  62  0
         private static final Logger LOGGER = Logger.getLogger(NexusSearch.class.getName());
    +  63   +
     
    +  64   +
         /**
    +  65   +
          * Creates a NexusSearch for the given repository URL.
    +  66   +
          *
    +  67   +
          * @param rootURL the root URL of the repository on which searches should execute. full URL's are calculated relative to this
    +  68   +
          * URL, so it should end with a /
    +  69   +
          */
    +  70  0
         public NexusSearch(URL rootURL) {
    +  71  0
             this.rootURL = rootURL;
    +  72   +
             try {
    +  73  0
                 if (null != Settings.getString(Settings.KEYS.PROXY_SERVER)
    +  74   +
                         && Settings.getBoolean(Settings.KEYS.ANALYZER_NEXUS_PROXY)) {
    +  75  0
                     useProxy = true;
    +  76  0
                     LOGGER.fine("Using proxy");
    +  77   +
                 } else {
    +  78  0
                     useProxy = false;
    +  79  0
                     LOGGER.fine("Not using proxy");
    +  80   +
                 }
    +  81  0
             } catch (InvalidSettingException ise) {
    +  82  0
                 useProxy = false;
    +  83  0
             }
    +  84  0
         }
    +  85   +
     
    +  86   +
         /**
    +  87   +
          * Searches the configured Nexus repository for the given sha1 hash. If the artifact is found, a <code>MavenArtifact</code> is
     88   -
         public MavenArtifact searchSha1(String sha1) throws IOException {
    -  89  0
             if (null == sha1 || !sha1.matches("^[0-9A-Fa-f]{40}$")) {
    -  90  0
                 throw new IllegalArgumentException("Invalid SHA1 format");
    +
          * populated with the coordinate information.
    +  89   +
          *
    +  90   +
          * @param sha1 The SHA-1 hash string for which to search
     91   -
             }
    +
          * @return the populated Maven coordinates
     92   -
     
    -  93  0
             final URL url = new URL(rootURL, String.format("identify/sha1/%s",
    +
          * @throws IOException if it's unable to connect to the specified repository or if the specified artifact is not found.
    +  93   +
          */
     94   -
                     sha1.toLowerCase()));
    -  95   -
     
    -  96  0
             LOGGER.fine(String.format("Searching Nexus url %s", url.toString()));
    +
         public MavenArtifact searchSha1(String sha1) throws IOException {
    +  95  0
             if (null == sha1 || !sha1.matches("^[0-9A-Fa-f]{40}$")) {
    +  96  0
                 throw new IllegalArgumentException("Invalid SHA1 format");
     97   -
     
    +
             }
     98   -
             // Determine if we need to use a proxy. The rules:
    -  99   -
             // 1) If the proxy is set, AND the setting is set to true, use the proxy
    +
     
    +  99  0
             final URL url = new URL(rootURL, String.format("identify/sha1/%s",
     100   -
             // 2) Otherwise, don't use the proxy (either the proxy isn't configured,
    +
                     sha1.toLowerCase()));
     101   -
             // or proxy is specifically
    -  102   -
             // set to false
    -  103  0
             final HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
    +
     
    +  102  0
             LOGGER.fine(String.format("Searching Nexus url %s", url.toString()));
    +  103   +
     
     104   -
     
    -  105  0
             conn.setDoOutput(true);
    +
             // Determine if we need to use a proxy. The rules:
    +  105   +
             // 1) If the proxy is set, AND the setting is set to true, use the proxy
     106   -
     
    +
             // 2) Otherwise, don't use the proxy (either the proxy isn't configured,
     107   -
             // JSON would be more elegant, but there's not currently a dependency
    +
             // or proxy is specifically set to false
     108   -
             // on JSON, so don't want to add one just for this
    -  109  0
             conn.addRequestProperty("Accept", "application/xml");
    -  110  0
             conn.connect();
    +
             HttpURLConnection conn;
    +  109  0
             conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
    +  110  0
             conn.setDoOutput(true);
     111  
     
    -  112  0
             if (conn.getResponseCode() == 200) {
    +  112   +
             // JSON would be more elegant, but there's not currently a dependency
     113   +
             // on JSON, so don't want to add one just for this
    +  114  0
             conn.addRequestProperty("Accept", "application/xml");
    +  115  0
             conn.connect();
    +  116   +
     
    +  117  0
             if (conn.getResponseCode() == 200) {
    +  118  
                 try {
    -  114  0
                     final DocumentBuilder builder = DocumentBuilderFactory
    -  115   -
                             .newInstance().newDocumentBuilder();
    -  116  0
                     final Document doc = builder.parse(conn.getInputStream());
    -  117  0
                     final XPath xpath = XPathFactory.newInstance().newXPath();
    -  118  0
                     final String groupId = xpath
    -  119   -
                             .evaluate(
    +  119  0
                     final DocumentBuilder builder = DocumentBuilderFactory
     120   -
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/groupId",
    -  121   -
                                     doc);
    -  122  0
                     final String artifactId = xpath.evaluate(
    -  123   -
                             "/org.sonatype.nexus.rest.model.NexusArtifact/artifactId",
    +
                             .newInstance().newDocumentBuilder();
    +  121  0
                     final Document doc = builder.parse(conn.getInputStream());
    +  122  0
                     final XPath xpath = XPathFactory.newInstance().newXPath();
    +  123  0
                     final String groupId = xpath
     124   -
                             doc);
    -  125  0
                     final String version = xpath
    +
                             .evaluate(
    +  125   +
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/groupId",
     126   -
                             .evaluate(
    -  127   -
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/version",
    +
                                     doc);
    +  127  0
                     final String artifactId = xpath.evaluate(
     128   -
                                     doc);
    -  129  0
                     final String link = xpath
    -  130   -
                             .evaluate(
    +
                             "/org.sonatype.nexus.rest.model.NexusArtifact/artifactId",
    +  129   +
                             doc);
    +  130  0
                     final String version = xpath
     131   -
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/artifactLink",
    -  132   -
                                     doc);
    -  133  0
                     final String pomLink = xpath
    -  134  
                             .evaluate(
    -  135   -
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/pomLink",
    -  136   +  132   +
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/version",
    +  133  
                                     doc);
    -  137  0
                     final MavenArtifact ma = new MavenArtifact(groupId, artifactId, version);
    -  138  0
                     if (link != null && !"".equals(link)) {
    -  139  0
                         ma.setArtifactUrl(link);
    +  134  0
                     final String link = xpath
    +  135   +
                             .evaluate(
    +  136   +
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/artifactLink",
    +  137   +
                                     doc);
    +  138  0
                     final String pomLink = xpath
    +  139   +
                             .evaluate(
     140   +
                                     "/org.sonatype.nexus.rest.model.NexusArtifact/pomLink",
    +  141   +
                                     doc);
    +  142  0
                     final MavenArtifact ma = new MavenArtifact(groupId, artifactId, version);
    +  143  0
                     if (link != null && !"".equals(link)) {
    +  144  0
                         ma.setArtifactUrl(link);
    +  145  
                     }
    -  141  0
                     if (pomLink != null && !"".equals(pomLink)) {
    -  142  0
                         ma.setPomUrl(pomLink);
    -  143   +  146  0
                     if (pomLink != null && !"".equals(pomLink)) {
    +  147  0
                         ma.setPomUrl(pomLink);
    +  148  
                     }
    -  144  0
                     return ma;
    -  145  0
                 } catch (Throwable e) {
    -  146   +  149  0
                     return ma;
    +  150  0
                 } catch (Throwable e) {
    +  151  
                     // Anything else is jacked-up XML stuff that we really can't recover
    -  147   -
                     // from well
    -  148  0
                     throw new IOException(e.getMessage(), e);
    -  149   -
                 }
    -  150  0
             } else if (conn.getResponseCode() == 404) {
    -  151  0
                 throw new FileNotFoundException("Artifact not found in Nexus");
     152   -
             } else {
    -  153  0
                 final String msg = String.format("Could not connect to Nexus received response code: %d %s",
    +
                     // from well
    +  153  0
                     throw new IOException(e.getMessage(), e);
     154   -
                         conn.getResponseCode(), conn.getResponseMessage());
    -  155  0
                 LOGGER.fine(msg);
    -  156  0
                 throw new IOException(msg);
    +
                 }
    +  155  0
             } else if (conn.getResponseCode() == 404) {
    +  156  0
                 throw new FileNotFoundException("Artifact not found in Nexus");
     157   -
             }
    -  158   -
         }
    +
             } else {
    +  158  0
                 final String msg = String.format("Could not connect to Nexus received response code: %d %s",
     159   -
     
    -  160   -
         /**
    -  161   -
          * Do a preflight request to see if the repository is actually working.
    +
                         conn.getResponseCode(), conn.getResponseMessage());
    +  160  0
                 LOGGER.fine(msg);
    +  161  0
                 throw new IOException(msg);
     162   -
          *
    +
             }
     163   -
          * @return whether the repository is listening and returns the /status URL correctly
    -  164   -
          */
    -  165   -
         public boolean preflightRequest() {
    -  166   -
             try {
    -  167  0
                 final HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(new URL(rootURL, "status"), useProxy);
    -  168  0
                 conn.addRequestProperty("Accept", "application/xml");
    -  169  0
                 conn.connect();
    -  170  0
                 if (conn.getResponseCode() != 200) {
    -  171  0
                     LOGGER.log(Level.WARNING, "Expected 200 result from Nexus, got {0}", conn.getResponseCode());
    -  172  0
                     return false;
    -  173   -
                 }
    -  174  0
                 final DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
    -  175  0
                 final Document doc = builder.parse(conn.getInputStream());
    -  176  0
                 if (!"status".equals(doc.getDocumentElement().getNodeName())) {
    -  177  0
                     LOGGER.log(Level.WARNING, "Expected root node name of status, got {0}", doc.getDocumentElement().getNodeName());
    -  178  0
                     return false;
    -  179   -
                 }
    -  180  0
             } catch (Throwable e) {
    -  181  0
                 return false;
    -  182  0
             }
    -  183   -
     
    -  184  0
             return true;
    -  185  
         }
    -  186   -
     }
    -  187   +  164  
     
    -  188   +  165   +
         /**
    +  166   +
          * Do a preflight request to see if the repository is actually working.
    +  167   +
          *
    +  168   +
          * @return whether the repository is listening and returns the /status URL correctly
    +  169   +
          */
    +  170   +
         public boolean preflightRequest() {
    +  171   +
             HttpURLConnection conn;
    +  172   +
             try {
    +  173  0
                 URL url = new URL(rootURL, "status");
    +  174  0
                 conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
    +  175  0
                 conn.addRequestProperty("Accept", "application/xml");
    +  176  0
                 conn.connect();
    +  177  0
                 if (conn.getResponseCode() != 200) {
    +  178  0
                     LOGGER.log(Level.WARNING, "Expected 200 result from Nexus, got {0}", conn.getResponseCode());
    +  179  0
                     return false;
    +  180   +
                 }
    +  181  0
                 final DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
    +  182  0
                 final Document doc = builder.parse(conn.getInputStream());
    +  183  0
                 if (!"status".equals(doc.getDocumentElement().getNodeName())) {
    +  184  0
                     LOGGER.log(Level.WARNING, "Expected root node name of status, got {0}", doc.getDocumentElement().getNodeName());
    +  185  0
                     return false;
    +  186   +
                 }
    +  187  0
             } catch (Throwable e) {
    +  188  0
                 return false;
    +  189  0
             }
    +  190   +
     
    +  191  0
             return true;
    +  192   +
         }
    +  193   +
     }
    +  194   +
     
    +  195  
     // vim: cc=120:sw=4:ts=4:sts=4
    - + 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 24d201dc5..00de45953 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 @@ -357,6 +357,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParseException.html index f32cc66a1..16c26900b 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 @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html index e77ac79a8..659d69111 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html @@ -93,6 +93,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html index e2248c352..6af32a369 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 @@ -163,6 +163,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html index 51f5b4285..16fe897fa 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 @@ -100,7 +100,7 @@  41  
      *
     42   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     43  
      */
     44   @@ -499,6 +499,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html index 284ec6cfe..2443aaf5d 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 @@ -64,7 +64,7 @@  23  
      *
     24   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     25  
      */
     26   @@ -117,6 +117,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html index cfa3cc114..65d7dc8a1 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html @@ -116,7 +116,7 @@  49  
      *
     50   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     51  
      */
     52   @@ -602,8 +602,8 @@
             try {
     320  1
                 ps = getConnection().prepareStatement(SELECT_VENDOR_PRODUCT_LIST);
     321  1
                 rs = ps.executeQuery();
    -  322  24670
                 while (rs.next()) {
    -  323  24669
                     data.add(new Pair<String, String>(rs.getString(1), rs.getString(2)));
    +  322  24790
                 while (rs.next()) {
    +  323  24789
                     data.add(new Pair<String, String>(rs.getString(1), rs.getString(2)));
     324  
                 }
     325  0
             } catch (SQLException ex) {
    @@ -1374,6 +1374,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html index ad5e8621d..48cbd9fb1 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -131,6 +131,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html index 5915459bb..f440a1863 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 @@ -86,7 +86,7 @@  34  
      *
     35   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     36  
      */
     37   @@ -342,6 +342,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html index 1a3b81c07..4c4fbcabc 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -131,6 +131,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoader.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoader.html index 809861163..4bbfe2d38 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 @@ -91,7 +91,7 @@  36  
      *
     37   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     38  
      */
     39   @@ -176,17 +176,17 @@  84  2
                     final File[] files = file.listFiles();
     85  
     
    -  86  33
                     for (File f : files) {
    +  86  34
                     for (File f : files) {
     87  
                         try {
    -  88  31
                             urls.add(f.toURI().toURL());
    +  88  32
                             urls.add(f.toURI().toURL());
     89  0
                         } catch (MalformedURLException ex) {
     90  0
                             final String msg = String.format("Unable to load database driver '%s'; invalid path provided '%s'",
     91  
                                     className, f.getAbsoluteFile());
     92  0
                             LOGGER.log(Level.FINE, msg, ex);
     93  0
                             throw new DriverLoadException(msg, ex);
    -  94  31
                         }
    +  94  32
                         }
     95  
                     }
     96  2
                 } else if (file.exists()) {
    @@ -274,6 +274,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverShim.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverShim.html index 51d03ea4e..a16d35368 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 @@ -90,7 +90,7 @@  36  
      *
     37   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     38  
      * @see java.sql.Driver
     39   @@ -392,6 +392,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html index 064c4d2d5..407c608a6 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 @@ -68,7 +68,7 @@  25  
      *
     26   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     27  
      */
     28   @@ -93,6 +93,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html index f767aec83..191f9816e 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html @@ -96,7 +96,7 @@  39  
      *
     40   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     41  
      */
     42  2
     public class EngineVersionCheck implements CachedWebDataSource {
    @@ -369,6 +369,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html index 580ccfab5..6b0914f41 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25  15
     public class NvdCveInfo {
    @@ -276,6 +276,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveUpdater.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveUpdater.html index aa3749051..b85eb5087 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 @@ -76,7 +76,7 @@  29  
      *
     30   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     31  
      */
     32  0
     public class NvdCveUpdater implements CachedWebDataSource {
    @@ -136,6 +136,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdate.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdate.html index be4b32b3e..ab23bf60c 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 @@ -110,7 +110,7 @@  46  
      *
     47   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     48  
      */
     49   @@ -520,6 +520,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html index dc4dc196a..25baf8c0b 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 @@ -70,7 +70,7 @@  26  
      *
     27   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     28  
      */
     29   @@ -121,6 +121,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateableNvdCve.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateableNvdCve.html index 46eb94f0a..718aa7de2 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 @@ -82,7 +82,7 @@  32  
      *
     33   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     34  
      */
     35  12
     public class UpdateableNvdCve implements java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {
    @@ -361,6 +361,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.InvalidDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.InvalidDataException.html index e50c7a3e9..4b4e151dd 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 @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25   @@ -115,6 +115,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.UpdateException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.UpdateException.html index 561b939a9..7b18a63c7 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 @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27   @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.DownloadTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.DownloadTask.html index 90ab667a1..47571ed2e 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.DownloadTask.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.DownloadTask.html @@ -102,7 +102,7 @@  42  
      *
     43   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     44  
      */
     45  0
     public class DownloadTask implements Callable<Future<ProcessTask>> {
    @@ -497,8 +497,8 @@
     
     281  
                 int len;
    -  282  1521
                 while ((len = cin.read(buffer)) > 0) {
    -  283  1519
                     out.write(buffer, 0, len);
    +  282  1200
                 while ((len = cin.read(buffer)) > 0) {
    +  283  1198
                     out.write(buffer, 0, len);
     284  
                 }
     285   @@ -532,6 +532,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.ProcessTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.ProcessTask.html index 6993217f2..5a2c507af 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 @@ -106,7 +106,7 @@  44  
      *
     45   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     46  
      */
     47  0
     public class ProcessTask implements Callable<ProcessTask> {
    @@ -340,6 +340,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html index 0680a5b19..f0ac532a7 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 @@ -87,7 +87,7 @@  34  
      *
     35   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     36  
      */
     37  1
     public class NvdCve12Handler extends DefaultHandler {
    @@ -449,6 +449,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html index 9796bb03a..336cbbe3c 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 @@ -95,7 +95,7 @@  38  
      *
     39   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     40  
      */
     41  1
     public class NvdCve20Handler extends DefaultHandler {
    @@ -867,6 +867,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html index ec8b46fa4..42182ef50 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html @@ -62,7 +62,7 @@  22  
      *
     23   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     24  
      */
     25  9
     public enum Confidence {
    @@ -100,6 +100,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html index 01ad19c27..9043d400f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html @@ -98,7 +98,7 @@  40  
      *
     41   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     42  
      */
     43  2
     public class Dependency implements Serializable, Comparable<Dependency> {
    @@ -869,7 +869,7 @@
          */
     473  
         public EvidenceCollection getProductEvidence() {
    -  474  98
             return this.productEvidence;
    +  474  102
             return this.productEvidence;
     475  
         }
     476   @@ -1446,6 +1446,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html index 64af38224..43a077eb9 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 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    Evidence
    60%
    45/75
    36%
    27/74
    3.381
    Evidence
    65%
    50/76
    48%
    36/74
    3.273
     
    @@ -66,10 +66,10 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
    -  27  37353
     public class Evidence implements Serializable, Comparable<Evidence> {
    +  27  38725
     public class Evidence implements Serializable, Comparable<Evidence> {
     28  
     
     29   @@ -98,12 +98,12 @@
          * @param confidence the confidence of the evidence.
     42  
          */
    -  43  14719
         public Evidence(String source, String name, String value, Confidence confidence) {
    -  44  14719
             this.source = source;
    -  45  14719
             this.name = name;
    -  46  14719
             this.value = value;
    -  47  14719
             this.confidence = confidence;
    -  48  14719
         }
    +  43  14740
         public Evidence(String source, String name, String value, Confidence confidence) {
    +  44  14740
             this.source = source;
    +  45  14740
             this.name = name;
    +  46  14740
             this.value = value;
    +  47  14740
             this.confidence = confidence;
    +  48  14740
         }
     49  
         /**
     50   @@ -208,8 +208,8 @@
          */
     103  
         public String getValue() {
    -  104  709
             used = true;
    -  105  709
             return value;
    +  104  837
             used = true;
    +  105  837
             return value;
     106  
         }
     107   @@ -228,8 +228,8 @@
          */
     114  
         public String getValue(Boolean setUsed) {
    -  115  50
             used = used || setUsed;
    -  116  50
             return value;
    +  115  52
             used = used || setUsed;
    +  116  52
             return value;
     117  
         }
     118   @@ -270,7 +270,7 @@
          */
     137  
         public boolean isUsed() {
    -  138  1059
             return used;
    +  138  1279
             return used;
     139  
         }
     140   @@ -311,7 +311,7 @@
          */
     159  
         public Confidence getConfidence() {
    -  160  233
             return confidence;
    +  160  239
             return confidence;
     161  
         }
     162   @@ -372,18 +372,18 @@
         @Override
     194  
         public boolean equals(Object that) {
    -  195  0
             if (this == that) {
    +  195  9
             if (this == that) {
     196  0
                 return true;
     197  
             }
    -  198  0
             if (!(that instanceof Evidence)) {
    +  198  9
             if (!(that instanceof Evidence)) {
     199  0
                 return false;
     200  
             }
    -  201  0
             final Evidence e = (Evidence) that;
    +  201  9
             final Evidence e = (Evidence) that;
     202  
     
    -  203  0
             return testEquality(name, e.name) && testEquality(source, e.source) && testEquality(value, e.value)
    +  203  9
             return testEquality(name, e.name) && testEquality(source, e.source) && testEquality(value, e.value)
     204  
                     && (confidence == null ? e.confidence == null : confidence == e.confidence);
     205   @@ -406,7 +406,7 @@
          */
     214  
         private boolean testEquality(String l, String r) {
    -  215  0
             return l == null ? r == null : l.equalsIgnoreCase(r);
    +  215  11
             return l == null ? r == null : l.equalsIgnoreCase(r);
     216  
         }
     217   @@ -425,15 +425,15 @@
          */
     224  
         public int compareTo(Evidence o) {
    -  225  37353
             if (o == null) {
    +  225  38735
             if (o == null) {
     226  0
                 return 1;
     227  
             }
    -  228  37353
             if (equalsWithNullCheck(source, o.source)) {
    -  229  23683
                 if (equalsWithNullCheck(name, o.name)) {
    -  230  23576
                     if (equalsWithNullCheck(value, o.value)) {
    -  231  14655
                         if (equalsWithNullCheck(confidence, o.confidence)) {
    -  232  14642
                             return 0; //they are equal
    +  228  38735
             if (equalsWithNullCheck(source, o.source)) {
    +  229  23706
                 if (equalsWithNullCheck(name, o.name)) {
    +  230  23582
                     if (equalsWithNullCheck(value, o.value)) {
    +  231  14657
                         if (equalsWithNullCheck(confidence, o.confidence)) {
    +  232  14644
                             return 0; //they are equal
     233  
                         } else {
     234  13
                             return compareToWithNullCheck(confidence, o.confidence);
    @@ -441,17 +441,17 @@
                         }
     236  
                     } else {
    -  237  8921
                         return compareToIgnoreCaseWithNullCheck(value, o.value);
    +  237  8925
                         return compareToIgnoreCaseWithNullCheck(value, o.value);
     238  
                     }
     239  
                 } else {
    -  240  107
                     return compareToIgnoreCaseWithNullCheck(name, o.name);
    +  240  124
                     return compareToIgnoreCaseWithNullCheck(name, o.name);
     241  
                 }
     242  
             } else {
    -  243  13670
                 return compareToIgnoreCaseWithNullCheck(source, o.source);
    +  243  15029
                 return compareToIgnoreCaseWithNullCheck(source, o.source);
     244  
             }
     245   @@ -474,13 +474,13 @@
          */
     254  
         private boolean equalsWithNullCheck(String me, String other) {
    -  255  84612
             if (me == null && other == null) {
    +  255  86023
             if (me == null && other == null) {
     256  0
                 return true;
    -  257  84612
             } else if (me == null || other == null) {
    +  257  86023
             } else if (me == null || other == null) {
     258  0
                 return false;
     259  
             }
    -  260  84612
             return me.equals(other);
    +  260  86023
             return me.equalsIgnoreCase(other);
     261  
         }
     262   @@ -501,13 +501,13 @@
          */
     270  
         private boolean equalsWithNullCheck(Confidence me, Confidence other) {
    -  271  14655
             if (me == null && other == null) {
    +  271  14657
             if (me == null && other == null) {
     272  0
                 return true;
    -  273  14655
             } else if (me == null || other == null) {
    +  273  14657
             } else if (me == null || other == null) {
     274  0
                 return false;
     275  
             }
    -  276  14655
             return me.equals(other);
    +  276  14657
             return me.equals(other);
     277  
         }
     278   @@ -530,15 +530,15 @@
          */
     287  
         private int compareToIgnoreCaseWithNullCheck(String me, String other) {
    -  288  22698
             if (me == null && other == null) {
    +  288  24078
             if (me == null && other == null) {
     289  0
                 return 0;
    -  290  22698
             } else if (me == null) {
    +  290  24078
             } else if (me == null) {
     291  0
                 return -1; //the other string is greater then me
    -  292  22698
             } else if (other == null) {
    +  292  24078
             } else if (other == null) {
     293  0
                 return 1; //me is greater then the other string
     294  
             }
    -  295  22698
             return me.compareToIgnoreCase(other);
    +  295  24078
             return me.compareToIgnoreCase(other);
     296  
         }
     297   @@ -546,9 +546,9 @@  298  
         /**
     299   -
          * Wrapper around {@link java.lang.Enum#compareTo(java.lang.Enum) Enum.compareTo} with an exhaustive, possibly
    +
          * Wrapper around {@link java.lang.Enum#compareTo(java.lang.Enum) Enum.compareTo} with an exhaustive, possibly duplicative,
     300   -
          * duplicative, check against nulls.
    +
          * check against nulls.
     301  
          *
     302   @@ -573,9 +573,28 @@  315  
         }
     316   +
     
    +  317   +
         /**
    +  318   +
          * Standard toString() implementation.
    +  319   +
          *
    +  320   +
          * @return the string representation of the object
    +  321   +
          */
    +  322   +
         @Override
    +  323   +
         public String toString() {
    +  324  0
             return "Evidence{" + "name=" + name + ", source=" + source + ", value=" + value + ", confidence=" + confidence + '}';
    +  325   +
         }
    +  326  
     }
    - + 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 85a2930b6..d819eed3a 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html @@ -97,7 +97,7 @@  37  
      *
     38   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     39  
      */
     40   @@ -117,10 +117,10 @@
          * Used to iterate over highest confidence evidence contained in the collection.
     48  
          */
    -  49  59
         private static final Filter<Evidence> HIGHEST_CONFIDENCE = new Filter<Evidence>() {
    +  49  61
         private static final Filter<Evidence> HIGHEST_CONFIDENCE = new Filter<Evidence>() {
     50  
             public boolean passes(Evidence evidence) {
    -  51  58
                 return evidence.getConfidence() == Confidence.HIGHEST;
    +  51  60
                 return evidence.getConfidence() == Confidence.HIGHEST;
     52  
             }
     53   @@ -131,10 +131,10 @@
          * Used to iterate over high confidence evidence contained in the collection.
     56  
          */
    -  57  49
         private static final Filter<Evidence> HIGH_CONFIDENCE = new Filter<Evidence>() {
    +  57  50
         private static final Filter<Evidence> HIGH_CONFIDENCE = new Filter<Evidence>() {
     58  
             public boolean passes(Evidence evidence) {
    -  59  48
                 return evidence.getConfidence() == Confidence.HIGH;
    +  59  49
                 return evidence.getConfidence() == Confidence.HIGH;
     60  
             }
     61   @@ -148,7 +148,7 @@  65  1
         private static final Filter<Evidence> MEDIUM_CONFIDENCE = new Filter<Evidence>() {
     66  
             public boolean passes(Evidence evidence) {
    -  67  32
                 return evidence.getConfidence() == Confidence.MEDIUM;
    +  67  34
                 return evidence.getConfidence() == Confidence.MEDIUM;
     68  
             }
     69   @@ -162,7 +162,7 @@  73  1
         private static final Filter<Evidence> LOW_CONFIDENCE = new Filter<Evidence>() {
     74  
             public boolean passes(Evidence evidence) {
    -  75  32
                 return evidence.getConfidence() == Confidence.LOW;
    +  75  34
                 return evidence.getConfidence() == Confidence.LOW;
     76  
             }
     77   @@ -176,7 +176,7 @@  81  1
         private static final Filter<Evidence> EVIDENCE_USED = new Filter<Evidence>() {
     82  
             public boolean passes(Evidence evidence) {
    -  83  1057
                 return evidence.isUsed();
    +  83  1277
                 return evidence.isUsed();
     84  
             }
     85   @@ -417,7 +417,7 @@
          */
     221  
         public Iterator<Evidence> iterator() {
    -  222  126
             return list.iterator();
    +  222  138
             return list.iterator();
     223  
         }
     224   @@ -436,23 +436,23 @@
          */
     231  
         public boolean containsUsedString(String text) {
    -  232  121
             if (text == null) {
    +  232  133
             if (text == null) {
     233  0
                 return false;
     234  
             }
    -  235  121
             final String textToTest = text.toLowerCase();
    +  235  133
             final String textToTest = text.toLowerCase();
     236  
     
    -  237  121
             for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this)) {
    +  237  133
             for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this)) {
     238  
                 //TODO consider changing the regex to only compare alpha-numeric (i.e. strip everything else)
    -  239  643
                 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]", "");
    -  240  643
                 if (value.contains(textToTest)) {
    +  239  768
                 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]", "");
    +  240  768
                 if (value.contains(textToTest)) {
     241  48
                     return true;
     242  
                 }
    -  243  595
             }
    -  244  73
             return false;
    +  243  720
             }
    +  244  85
             return false;
     245  
         }
     246   @@ -504,11 +504,11 @@  273  
         public boolean contains(Confidence confidence) {
     274  14
             for (Evidence e : list) {
    -  275  63
                 if (e.getConfidence().equals(confidence)) {
    +  275  62
                 if (e.getConfidence().equals(confidence)) {
     276  12
                     return true;
     277  
                 }
    -  278  51
             }
    +  278  50
             }
     279  2
             return false;
     280  
         }
    @@ -615,8 +615,8 @@
         public String toString() {
     342  3
             final StringBuilder sb = new StringBuilder();
     343  3
             for (Evidence e : this.list) {
    -  344  12
                 sb.append(e.getValue()).append(' ');
    -  345  12
             }
    +  344  13
                 sb.append(e.getValue()).append(' ');
    +  345  13
             }
     346  3
             return sb.toString();
     347  
         }
    @@ -677,22 +677,22 @@
          */
     376  
         private String urlCorrection(String value) {
    -  377  643
             if (value == null || !UrlStringUtils.containsUrl(value)) {
    -  378  627
                 return value;
    +  377  768
             if (value == null || !UrlStringUtils.containsUrl(value)) {
    +  378  749
                 return value;
     379  
             }
    -  380  16
             final StringBuilder sb = new StringBuilder(value.length());
    -  381  16
             final String[] parts = value.split("\\s");
    -  382  32
             for (String part : parts) {
    -  383  16
                 if (UrlStringUtils.isUrl(part)) {
    +  380  19
             final StringBuilder sb = new StringBuilder(value.length());
    +  381  19
             final String[] parts = value.split("\\s");
    +  382  38
             for (String part : parts) {
    +  383  19
                 if (UrlStringUtils.isUrl(part)) {
     384  
                     try {
    -  385  16
                         final List<String> data = UrlStringUtils.extractImportantUrlData(part);
    -  386  16
                         sb.append(' ').append(StringUtils.join(data, ' '));
    +  385  19
                         final List<String> data = UrlStringUtils.extractImportantUrlData(part);
    +  386  19
                         sb.append(' ').append(StringUtils.join(data, ' '));
     387  0
                     } catch (MalformedURLException ex) {
     388  0
                         LOGGER.log(Level.FINE, "error parsing " + part, ex);
     389  0
                         sb.append(' ').append(part);
    -  390  16
                     }
    +  390  19
                     }
     391  
                 } else {
     392  0
                     sb.append(' ').append(part);
    @@ -700,13 +700,13 @@
                 }
     394  
             }
    -  395  16
             return sb.toString().trim();
    +  395  19
             return sb.toString().trim();
     396  
         }
     397  
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html index a768ec4eb..0e28dbf65 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html @@ -64,7 +64,7 @@  23  
      *
     24   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     25  
      */
     26  27
     public class Identifier implements Serializable, Comparable<Identifier> {
    @@ -425,6 +425,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html index aac40bbb8..068706341 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27  502
     public class Reference implements Serializable, Comparable<Reference> {
    @@ -287,6 +287,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html index 93fdf880c..ad8e2d233 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html @@ -72,7 +72,7 @@  27  
      *
     28   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     29  
      */
     30  36
     public class Vulnerability implements Serializable, Comparable<Vulnerability> {
    @@ -833,6 +833,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html index 149177758..2d3ada036 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html @@ -68,7 +68,7 @@  25  
      *
     26   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     27  
      */
     28  105
     public class VulnerabilityComparator implements Comparator<Vulnerability>, Serializable {
    @@ -107,6 +107,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html index ffc2da475..67c5ec920 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html @@ -76,7 +76,7 @@  29  
      *
     30   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     31  
      */
     32  11337
     public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable<VulnerableSoftware> {
    @@ -650,6 +650,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html index 3415020ac..761120809 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27   @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html index 2a6633119..69403d0c2 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html index db3028ac5..f0aef99cb 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html @@ -76,7 +76,7 @@  29  
      *
     30   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     31  
      */
     32  0
     public class EscapeTool {
    @@ -158,6 +158,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html index e1dd0c7b9..c376ff454 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html @@ -113,7 +113,7 @@  47  
      *
     48   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     49  
      */
     50   @@ -544,6 +544,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html index 6fc1e6056..01bcbd951 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html @@ -220,6 +220,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html index 36e8760ff..7c3bdd1e5 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html @@ -68,7 +68,7 @@  25  
      *
     26   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     27  
      */
     28  171
     public class PropertyType {
    @@ -345,6 +345,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html index f63ed908a..2ea079148 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html @@ -74,7 +74,7 @@  28  
      *
     29   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     30  
      */
     31  9
     public class SuppressionErrorHandler implements ErrorHandler {
    @@ -196,6 +196,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html index 61884f052..e09d32931 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html @@ -74,7 +74,7 @@  28  
      *
     29   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     30  
      */
     31  9
     public class SuppressionHandler extends DefaultHandler {
    @@ -339,6 +339,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html index e15ab9f1a..3fbe5a7cc 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27   @@ -137,6 +137,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html index 5e79f1192..65673ac00 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html @@ -96,7 +96,7 @@  39  
      *
     40   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     41  
      */
     42  6
     public class SuppressionParser {
    @@ -237,6 +237,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html index d1b082217..d279ef7f7 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html @@ -74,7 +74,7 @@  28  
      *
     29   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     30  
      */
     31  91
     public class SuppressionRule {
    @@ -831,6 +831,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html index 914d4b1c9..fc220866c 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html @@ -76,7 +76,7 @@  29  
      *
     30   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     31  
      */
     32   @@ -189,6 +189,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html index 9eeadfd13..90954bf54 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html @@ -60,7 +60,7 @@  21  
      *
     22   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     23  
      */
     24   @@ -107,6 +107,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html index 88e15bd17..bafcfe2c1 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html @@ -92,7 +92,7 @@  37  
      *
     38   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     39  
      */
     40  14
     public class DependencyVersion implements Iterable, Comparable<DependencyVersion> {
    @@ -445,6 +445,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html index 2155460d3..c9dcd4465 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html @@ -74,7 +74,7 @@  28  
      *
     29   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     30  
      */
     31   @@ -181,6 +181,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html index e7318c3c1..6f24d7936 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html @@ -88,7 +88,7 @@  35  
      *
     36   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     37  
      */
     38   @@ -256,6 +256,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html index cd199d1a2..aff52d3c4 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html @@ -56,19 +56,19 @@
     
     19  
         public Iterator<T> filter(Iterator<T> iterator) {
    -  20  142
             return new FilterIterator(iterator);
    +  20  154
             return new FilterIterator(iterator);
     21  
         }
     22  
     
     23  
         public Iterable<T> filter(final Iterable<T> iterable) {
    -  24  142
             return new Iterable<T>() {
    +  24  154
             return new Iterable<T>() {
     25  
     
     26  
                 public Iterator<T> iterator() {
    -  27  142
                     return filter(iterable.iterator());
    +  27  154
                     return filter(iterable.iterator());
     28  
                 }
     29   @@ -86,28 +86,28 @@
             private T next;
     36  
     
    -  37  142
             private FilterIterator(Iterator<T> iterator) {
    -  38  142
                 this.iterator = iterator;
    -  39  142
                 toNext();
    -  40  142
             }
    +  37  154
             private FilterIterator(Iterator<T> iterator) {
    +  38  154
                 this.iterator = iterator;
    +  39  154
                 toNext();
    +  40  154
             }
     41  
     
     42  
             public boolean hasNext() {
    -  43  788
                 return next != null;
    +  43  927
                 return next != null;
     44  
             }
     45  
     
     46  
             public T next() {
    -  47  694
                 if (next == null) {
    +  47  821
                 if (next == null) {
     48  0
                     throw new NoSuchElementException();
     49  
                 }
    -  50  694
                 T returnValue = next;
    -  51  694
                 toNext();
    -  52  694
                 return returnValue;
    +  50  821
                 T returnValue = next;
    +  51  821
                 toNext();
    +  52  821
                 return returnValue;
     53  
             }
     54   @@ -121,22 +121,22 @@
     
     59  
             private void toNext() {
    -  60  836
                 next = null;
    -  61  1325
                 while (iterator.hasNext()) {
    -  62  1230
                     T item = iterator.next();
    -  63  1230
                     if (item != null && passes(item)) {
    -  64  741
                         next = item;
    -  65  741
                         break;
    +  60  975
                 next = null;
    +  61  1564
                 while (iterator.hasNext()) {
    +  62  1457
                     T item = iterator.next();
    +  63  1457
                     if (item != null && passes(item)) {
    +  64  868
                         next = item;
    +  65  868
                         break;
     66  
                     }
    -  67  489
                 }
    -  68  836
             }
    +  67  589
                 }
    +  68  975
             }
     69  
         }
     70  
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html index 6d6533366..d4111812f 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 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    NonClosingStream
    100%
    3/3
    N/A
    1
    NonClosingStream
    0%
    0/3
    N/A
    1
     
    @@ -70,7 +70,7 @@  26  
      *
     27   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     28  
      */
     29   @@ -89,8 +89,8 @@
          */
     36  
         public NonClosingStream(InputStream in) {
    -  37  1
             super(in);
    -  38  1
         }
    +  37  0
             super(in);
    +  38  0
         }
     39  
     
     40   @@ -105,11 +105,11 @@
         public void close() {
     45  
             // don't close the stream.
    -  46  1
         }
    +  46  0
         }
     47  
     }
    - + 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 6fb9d74f5..969ee88e8 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html @@ -68,7 +68,7 @@  25  
      *
     26   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     27  
      */
     28   @@ -97,17 +97,17 @@
          * @param right the value for the right pair
     41  
          */
    -  42  24669
         public Pair(L left, R right) {
    -  43  24669
             this.left = left;
    -  44  24669
             this.right = right;
    -  45  24669
         }
    +  42  24789
         public Pair(L left, R right) {
    +  43  24789
             this.left = left;
    +  44  24789
             this.right = right;
    +  45  24789
         }
     46  
         /**
     47  
          * The left element of the pair.
     48  
          */
    -  49  24669
         private L left = null;
    +  49  24789
         private L left = null;
     50  
     
     51   @@ -122,7 +122,7 @@
          */
     56  
         public L getLeft() {
    -  57  24669
             return left;
    +  57  24789
             return left;
     58  
         }
     59   @@ -147,7 +147,7 @@
          * The right element of the pair.
     70  
          */
    -  71  24669
         private R right = null;
    +  71  24789
         private R right = null;
     72  
     
     73   @@ -162,7 +162,7 @@
          */
     78  
         public R getRight() {
    -  79  24669
             return right;
    +  79  24789
             return right;
     80  
         }
     81   @@ -197,10 +197,10 @@
         @Override
     97  
         public int hashCode() {
    -  98  24681
             int hash = 3;
    -  99  24681
             hash = 53 * hash + (this.left != null ? this.left.hashCode() : 0);
    -  100  24681
             hash = 53 * hash + (this.right != null ? this.right.hashCode() : 0);
    -  101  24681
             return hash;
    +  98  24801
             int hash = 3;
    +  99  24801
             hash = 53 * hash + (this.left != null ? this.left.hashCode() : 0);
    +  100  24801
             hash = 53 * hash + (this.right != null ? this.right.hashCode() : 0);
    +  101  24801
             return hash;
     102  
         }
     103   @@ -245,6 +245,6 @@
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html index c6894b5d8..771fccadf 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html @@ -78,7 +78,7 @@  30  
      *
     31   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     32  
      */
     33   @@ -125,7 +125,7 @@
          */
     56  
         public static boolean containsUrl(String text) {
    -  57  17880
             return CONTAINS_URL_TEST.matcher(text).matches();
    +  57  13740
             return CONTAINS_URL_TEST.matcher(text).matches();
     58  
         }
     59   @@ -144,7 +144,7 @@
          */
     66  
         public static boolean isUrl(String text) {
    -  67  22
             return IS_URL_TEST.matcher(text).matches();
    +  67  25
             return IS_URL_TEST.matcher(text).matches();
     68  
         }
     69   @@ -188,40 +188,40 @@
          */
     89  
         public static List<String> extractImportantUrlData(String text) throws MalformedURLException {
    -  90  22
             final List<String> importantParts = new ArrayList<String>();
    -  91  22
             final URL url = new URL(text);
    -  92  22
             final String[] domain = url.getHost().split("\\.");
    +  90  25
             final List<String> importantParts = new ArrayList<String>();
    +  91  25
             final URL url = new URL(text);
    +  92  25
             final String[] domain = url.getHost().split("\\.");
     93  
             //add the domain except www and the tld.
    -  94  63
             for (int i = 0; i < domain.length - 1; i++) {
    -  95  41
                 final String sub = domain[i];
    -  96  41
                 if (!IGNORE_LIST.contains(sub.toLowerCase())) {
    -  97  38
                     importantParts.add(sub);
    +  94  72
             for (int i = 0; i < domain.length - 1; i++) {
    +  95  47
                 final String sub = domain[i];
    +  96  47
                 if (!IGNORE_LIST.contains(sub.toLowerCase())) {
    +  97  44
                     importantParts.add(sub);
     98  
                 }
     99  
             }
    -  100  22
             final String document = url.getPath();
    -  101  22
             final String[] pathParts = document.split("[\\//]");
    -  102  38
             for (int i = 0; i < pathParts.length - 2; i++) {
    -  103  16
                 if (!pathParts[i].isEmpty()) {
    +  100  25
             final String document = url.getPath();
    +  101  25
             final String[] pathParts = document.split("[\\//]");
    +  102  44
             for (int i = 0; i < pathParts.length - 2; i++) {
    +  103  19
                 if (!pathParts[i].isEmpty()) {
     104  0
                     importantParts.add(pathParts[i]);
     105  
                 }
     106  
             }
    -  107  22
             if (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {
    -  108  19
                 final String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll("\\..*{0,5}$", "");
    -  109  19
                 importantParts.add(fileNameNoExt);
    +  107  25
             if (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {
    +  108  22
                 final String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll("\\..*{0,5}$", "");
    +  109  22
                 importantParts.add(fileNameNoExt);
     110  
             }
    -  111  22
             return importantParts;
    +  111  25
             return importantParts;
     112  
         }
     113  
     }
    - + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.License.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.License.html new file mode 100644 index 000000000..6d92acdde --- /dev/null +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.License.html @@ -0,0 +1,182 @@ + + + + +Coverage Report + + + + +
    Coverage Report - org.owasp.dependencycheck.xml.pom.License
    +
     
    + + + + +
    Classes in this File Line Coverage Branch Coverage Complexity
    License
    0%
    0/12
    N/A
    1
    +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     1  
     /*
     2  
      * Copyright 2015 OWASP.
     3  
      *
     4  
      * Licensed under the Apache License, Version 2.0 (the "License");
     5  
      * you may not use this file except in compliance with the License.
     6  
      * You may obtain a copy of the License at
     7  
      *
     8  
      *      http://www.apache.org/licenses/LICENSE-2.0
     9  
      *
     10  
      * Unless required by applicable law or agreed to in writing, software
     11  
      * distributed under the License is distributed on an "AS IS" BASIS,
     12  
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  
      * See the License for the specific language governing permissions and
     14  
      * limitations under the License.
     15  
      */
     16  
     package org.owasp.dependencycheck.xml.pom;
     17  
     
     18  
     /**
     19  
      *
     20  
      * @author jeremy
     21  
      */
     22  
     public class License {
     23  
     
     24  0
         public License() {
     25  0
         }
     26  
     
     27  
         /**
     28  
          * Constructs a new license.
     29  
          *
     30  
          * @param name
     31  
          * @param url
     32  
          */
     33  0
         public License(String name, String url) {
     34  0
             this.url = url;
     35  0
             this.name = name;
     36  
     
     37  0
         }
     38  
     
     39  
         /**
     40  
          * The url to the license.
     41  
          */
     42  
         private String url;
     43  
     
     44  
         /**
     45  
          * Get the value of url.
     46  
          *
     47  
          * @return the value of url
     48  
          */
     49  
         public String getUrl() {
     50  0
             return url;
     51  
         }
     52  
     
     53  
         /**
     54  
          * Set the value of url.
     55  
          *
     56  
          * @param url new value of url
     57  
          */
     58  
         public void setUrl(String url) {
     59  0
             this.url = url;
     60  0
         }
     61  
     
     62  
         /**
     63  
          * The name of the license.
     64  
          */
     65  
         private String name;
     66  
     
     67  
         /**
     68  
          * Get the value of name.
     69  
          *
     70  
          * @return the value of name
     71  
          */
     72  
         public String getName() {
     73  0
             return name;
     74  
         }
     75  
     
     76  
         /**
     77  
          * Set the value of name.
     78  
          *
     79  
          * @param name new value of name
     80  
          */
     81  
         public void setName(String name) {
     82  0
             this.name = name;
     83  0
         }
     84  
     
     85  
     }
    + + + + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.Model.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.Model.html new file mode 100644 index 000000000..0a8afe885 --- /dev/null +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.Model.html @@ -0,0 +1,512 @@ + + + + +Coverage Report + + + + +
    Coverage Report - org.owasp.dependencycheck.xml.pom.Model
    +
     
    + + + + +
    Classes in this File Line Coverage Branch Coverage Complexity
    Model
    87%
    28/32
    N/A
    1
    +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     1  
     /*
     2  
      * This file is part of dependency-check-core.
     3  
      *
     4  
      * Licensed under the Apache License, Version 2.0 (the "License");
     5  
      * you may not use this file except in compliance with the License.
     6  
      * You may obtain a copy of the License at
     7  
      *
     8  
      *     http://www.apache.org/licenses/LICENSE-2.0
     9  
      *
     10  
      * Unless required by applicable law or agreed to in writing, software
     11  
      * distributed under the License is distributed on an "AS IS" BASIS,
     12  
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  
      * See the License for the specific language governing permissions and
     14  
      * limitations under the License.
     15  
      *
     16  
      * Copyright (c) 2015 Jeremy Long. All Rights Reserved.
     17  
      */
     18  
     package org.owasp.dependencycheck.xml.pom;
     19  
     
     20  
     import java.util.ArrayList;
     21  
     import java.util.List;
     22  
     
     23  
     /**
     24  
      * A simple pojo to hold data related to a Maven POM file.
     25  
      *
     26  
      * @author jeremy
     27  
      */
     28  2
     public class Model {
     29  
     
     30  
         /**
     31  
          * The name of the project.
     32  
          */
     33  
         private String name;
     34  
     
     35  
         /**
     36  
          * Get the value of name.
     37  
          *
     38  
          * @return the value of name
     39  
          */
     40  
         public String getName() {
     41  2
             return name;
     42  
         }
     43  
     
     44  
         /**
     45  
          * Set the value of name.
     46  
          *
     47  
          * @param name new value of name
     48  
          */
     49  
         public void setName(String name) {
     50  2
             this.name = name;
     51  2
         }
     52  
     
     53  
         /**
     54  
          * The organization name.
     55  
          */
     56  
         private String organization;
     57  
     
     58  
         /**
     59  
          * Get the value of organization.
     60  
          *
     61  
          * @return the value of organization
     62  
          */
     63  
         public String getOrganization() {
     64  1
             return organization;
     65  
         }
     66  
     
     67  
         /**
     68  
          * Set the value of organization.
     69  
          *
     70  
          * @param organization new value of organization
     71  
          */
     72  
         public void setOrganization(String organization) {
     73  0
             this.organization = organization;
     74  0
         }
     75  
     
     76  
         /**
     77  
          * The description.
     78  
          */
     79  
         private String description;
     80  
     
     81  
         /**
     82  
          * Get the value of description.
     83  
          *
     84  
          * @return the value of description
     85  
          */
     86  
         public String getDescription() {
     87  1
             return description;
     88  
         }
     89  
     
     90  
         /**
     91  
          * Set the value of description.
     92  
          *
     93  
          * @param description new value of description
     94  
          */
     95  
         public void setDescription(String description) {
     96  1
             this.description = description;
     97  1
         }
     98  
     
     99  
         /**
     100  
          * The group id.
     101  
          */
     102  
         private String groupId;
     103  
     
     104  
         /**
     105  
          * Get the value of groupId.
     106  
          *
     107  
          * @return the value of groupId
     108  
          */
     109  
         public String getGroupId() {
     110  1
             return groupId;
     111  
         }
     112  
     
     113  
         /**
     114  
          * Set the value of groupId.
     115  
          *
     116  
          * @param groupId new value of groupId
     117  
          */
     118  
         public void setGroupId(String groupId) {
     119  2
             this.groupId = groupId;
     120  2
         }
     121  
     
     122  
         /**
     123  
          * The artifact id.
     124  
          */
     125  
         private String artifactId;
     126  
     
     127  
         /**
     128  
          * Get the value of artifactId.
     129  
          *
     130  
          * @return the value of artifactId
     131  
          */
     132  
         public String getArtifactId() {
     133  1
             return artifactId;
     134  
         }
     135  
     
     136  
         /**
     137  
          * Set the value of artifactId.
     138  
          *
     139  
          * @param artifactId new value of artifactId
     140  
          */
     141  
         public void setArtifactId(String artifactId) {
     142  2
             this.artifactId = artifactId;
     143  2
         }
     144  
     
     145  
         /**
     146  
          * The version number.
     147  
          */
     148  
         private String version;
     149  
     
     150  
         /**
     151  
          * Get the value of version.
     152  
          *
     153  
          * @return the value of version
     154  
          */
     155  
         public String getVersion() {
     156  1
             return version;
     157  
         }
     158  
     
     159  
         /**
     160  
          * Set the value of version.
     161  
          *
     162  
          * @param version new value of version
     163  
          */
     164  
         public void setVersion(String version) {
     165  1
             this.version = version;
     166  1
         }
     167  
     
     168  
         /**
     169  
          * The parent group id.
     170  
          */
     171  
         private String parentGroupId;
     172  
     
     173  
         /**
     174  
          * Get the value of parentGroupId.
     175  
          *
     176  
          * @return the value of parentGroupId
     177  
          */
     178  
         public String getParentGroupId() {
     179  2
             return parentGroupId;
     180  
         }
     181  
     
     182  
         /**
     183  
          * Set the value of parentGroupId.
     184  
          *
     185  
          * @param parentGroupId new value of parentGroupId
     186  
          */
     187  
         public void setParentGroupId(String parentGroupId) {
     188  1
             this.parentGroupId = parentGroupId;
     189  1
         }
     190  
     
     191  
         /**
     192  
          * The parent artifact id.
     193  
          */
     194  
         private String parentArtifactId;
     195  
     
     196  
         /**
     197  
          * Get the value of parentArtifactId.
     198  
          *
     199  
          * @return the value of parentArtifactId
     200  
          */
     201  
         public String getParentArtifactId() {
     202  2
             return parentArtifactId;
     203  
         }
     204  
     
     205  
         /**
     206  
          * Set the value of parentArtifactId.
     207  
          *
     208  
          * @param parentArtifactId new value of parentArtifactId
     209  
          */
     210  
         public void setParentArtifactId(String parentArtifactId) {
     211  1
             this.parentArtifactId = parentArtifactId;
     212  1
         }
     213  
     
     214  
         /**
     215  
          * The parent version number.
     216  
          */
     217  
         private String parentVersion;
     218  
     
     219  
         /**
     220  
          * Get the value of parentVersion.
     221  
          *
     222  
          * @return the value of parentVersion
     223  
          */
     224  
         public String getParentVersion() {
     225  2
             return parentVersion;
     226  
         }
     227  
     
     228  
         /**
     229  
          * Set the value of parentVersion.
     230  
          *
     231  
          * @param parentVersion new value of parentVersion
     232  
          */
     233  
         public void setParentVersion(String parentVersion) {
     234  1
             this.parentVersion = parentVersion;
     235  1
         }
     236  
     
     237  
         /**
     238  
          * The list of licenses.
     239  
          */
     240  2
         private List<License> licenses = new ArrayList<License>();
     241  
     
     242  
         /**
     243  
          * Returns the list of licenses.
     244  
          *
     245  
          * @return the list of licenses
     246  
          */
     247  
         public List<License> getLicenses() {
     248  2
             return licenses;
     249  
         }
     250  
     
     251  
         /**
     252  
          * Adds a new license to the list of licenses.
     253  
          *
     254  
          * @param license the license to add
     255  
          */
     256  
         public void addLicense(License license) {
     257  0
             licenses.add(license);
     258  0
         }
     259  
     
     260  
     }
    + + + + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomHandler.html new file mode 100644 index 000000000..c3514f843 --- /dev/null +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomHandler.html @@ -0,0 +1,355 @@ + + + + +Coverage Report + + + + +
    Coverage Report - org.owasp.dependencycheck.xml.pom.PomHandler
    +
     
    + + + + +
    Classes in this File Line Coverage Branch Coverage Complexity
    PomHandler
    77%
    35/45
    60%
    23/38
    5.75
    +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     1  
     /*
     2  
      * This file is part of dependency-check-core.
     3  
      *
     4  
      * Licensed under the Apache License, Version 2.0 (the "License");
     5  
      * you may not use this file except in compliance with the License.
     6  
      * You may obtain a copy of the License at
     7  
      *
     8  
      *     http://www.apache.org/licenses/LICENSE-2.0
     9  
      *
     10  
      * Unless required by applicable law or agreed to in writing, software
     11  
      * distributed under the License is distributed on an "AS IS" BASIS,
     12  
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  
      * See the License for the specific language governing permissions and
     14  
      * limitations under the License.
     15  
      *
     16  
      * Copyright (c) 2015 Jeremy Long. All Rights Reserved.
     17  
      */
     18  
     package org.owasp.dependencycheck.xml.pom;
     19  
     
     20  
     import java.util.ArrayDeque;
     21  
     import java.util.Deque;
     22  
     import org.xml.sax.Attributes;
     23  
     import org.xml.sax.SAXException;
     24  
     import org.xml.sax.helpers.DefaultHandler;
     25  
     
     26  
     /**
     27  
      * A handler to read the pom.xml model.
     28  
      *
     29  
      * @author Jeremy Long
     30  
      */
     31  2
     public class PomHandler extends DefaultHandler {
     32  
     
     33  
         /**
     34  
          * The project element.
     35  
          */
     36  
         public static final String PROJECT = "project";
     37  
         /**
     38  
          * The artifactId element.
     39  
          */
     40  
         public static final String GROUPID = "groupId";
     41  
         /**
     42  
          * The artifactId element.
     43  
          */
     44  
         public static final String ARTIFACTID = "artifactId";
     45  
         /**
     46  
          * The version element.
     47  
          */
     48  
         public static final String VERSION = "version";
     49  
         /**
     50  
          * The parent element.
     51  
          */
     52  
         public static final String PARENT = "parent";
     53  
         /**
     54  
          * The name element.
     55  
          */
     56  
         public static final String NAME = "name";
     57  
         /**
     58  
          * The organization element.
     59  
          */
     60  
         public static final String ORGANIZATION = "organization";
     61  
         /**
     62  
          * The description element.
     63  
          */
     64  
         public static final String DESCRIPTION = "description";
     65  
         /**
     66  
          * The licenses element.
     67  
          */
     68  
         public static final String LICENSES = "licenses";
     69  
         /**
     70  
          * The license element.
     71  
          */
     72  
         public static final String LICENSE = "license";
     73  
         /**
     74  
          * The url element.
     75  
          */
     76  
         public static final String URL = "url";
     77  
     
     78  
         /**
     79  
          * The pom model.
     80  
          */
     81  2
         private Model model = new Model();
     82  
     
     83  
         /**
     84  
          * Returns the model obtained from the pom.xml.
     85  
          *
     86  
          * @return the model object
     87  
          */
     88  
         public Model getModel() {
     89  2
             return model;
     90  
         }
     91  
         /**
     92  
          * The stack of elements processed; used to determine the parent node.
     93  
          */
     94  2
         private final Deque<String> stack = new ArrayDeque<String>();
     95  
         /**
     96  
          * The license object.
     97  
          */
     98  2
         private License license = null;
     99  
     
     100  
         /**
     101  
          * The current node text being extracted from the element.
     102  
          */
     103  
         private StringBuffer currentText;
     104  
     
     105  
         /**
     106  
          * Handles the start element event.
     107  
          *
     108  
          * @param uri the uri of the element being processed
     109  
          * @param localName the local name of the element being processed
     110  
          * @param qName the qName of the element being processed
     111  
          * @param attributes the attributes of the element being processed
     112  
          * @throws SAXException thrown if there is an exception processing
     113  
          */
     114  
         @Override
     115  
         public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
     116  471
             currentText = new StringBuffer();
     117  471
             stack.push(qName);
     118  471
             if (LICENSE.equals(qName)) {
     119  0
                 license = new License();
     120  
             }
     121  471
         }
     122  
     
     123  
         /**
     124  
          * Handles the end element event.
     125  
          *
     126  
          * @param uri the URI of the element
     127  
          * @param localName the local name of the element
     128  
          * @param qName the qName of the element
     129  
          * @throws SAXException thrown if there is an exception processing
     130  
          */
     131  
         @Override
     132  
         public void endElement(String uri, String localName, String qName) throws SAXException {
     133  471
             stack.pop();
     134  471
             final String parentNode = stack.peek();
     135  471
             if (PROJECT.equals(parentNode)) {
     136  29
                 if (GROUPID.equals(qName)) {
     137  2
                     model.setGroupId(currentText.toString());
     138  27
                 } else if (ARTIFACTID.equals(qName)) {
     139  2
                     model.setArtifactId(currentText.toString());
     140  25
                 } else if (VERSION.equals(qName)) {
     141  1
                     model.setVersion(currentText.toString());
     142  24
                 } else if (NAME.equals(qName)) {
     143  2
                     model.setName(currentText.toString());
     144  22
                 } else if (ORGANIZATION.equals(qName)) {
     145  0
                     model.setOrganization(currentText.toString());
     146  22
                 } else if (DESCRIPTION.equals(qName)) {
     147  1
                     model.setDescription(currentText.toString());
     148  
                 }
     149  442
             } else if (PARENT.equals(parentNode)) {
     150  3
                 if (GROUPID.equals(qName)) {
     151  1
                     model.setParentGroupId(currentText.toString());
     152  2
                 } else if (ARTIFACTID.equals(qName)) {
     153  1
                     model.setParentArtifactId(currentText.toString());
     154  1
                 } else if (VERSION.equals(qName)) {
     155  1
                     model.setParentVersion(currentText.toString());
     156  
                 }
     157  439
             } else if (LICENSE.equals(parentNode)) {
     158  0
                 if (license == null) {
     159  
                     //TODO add error logging
     160  0
                 } else if (NAME.equals(qName)) {
     161  0
                     license.setName(currentText.toString());
     162  0
                 } else if (URL.equals(qName)) {
     163  0
                     license.setUrl(currentText.toString());
     164  
                 }
     165  439
             } else if (LICENSES.equals(parentNode)) {
     166  0
                 if (LICENSE.equals(qName)) {
     167  0
                     if (license != null) {
     168  0
                         model.addLicense(license);
     169  
                     } else {
     170  
                         //TODO add error logging
     171  
                     }
     172  
                 }
     173  
             }
     174  471
         }
     175  
     
     176  
         /**
     177  
          * Collects the body text of the node being processed.
     178  
          *
     179  
          * @param ch the char array of text
     180  
          * @param start the start position to copy text from in the char array
     181  
          * @param length the number of characters to copy from the char array
     182  
          * @throws SAXException thrown if there is a parsing exception
     183  
          */
     184  
         @Override
     185  
         public void characters(char[] ch, int start, int length) throws SAXException {
     186  953
             currentText.append(ch, start, length);
     187  953
         }
     188  
     }
    + + + + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParseException.html new file mode 100644 index 000000000..7a33ab71e --- /dev/null +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParseException.html @@ -0,0 +1,144 @@ + + + + +Coverage Report + + + + +
    Coverage Report - org.owasp.dependencycheck.xml.pom.PomParseException
    +
     
    + + + + +
    Classes in this File Line Coverage Branch Coverage Complexity
    PomParseException
    0%
    0/8
    N/A
    1
    +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     1  
     /*
     2  
      * This file is part of dependency-check-core.
     3  
      *
     4  
      * Licensed under the Apache License, Version 2.0 (the "License");
     5  
      * you may not use this file except in compliance with the License.
     6  
      * You may obtain a copy of the License at
     7  
      *
     8  
      *     http://www.apache.org/licenses/LICENSE-2.0
     9  
      *
     10  
      * Unless required by applicable law or agreed to in writing, software
     11  
      * distributed under the License is distributed on an "AS IS" BASIS,
     12  
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  
      * See the License for the specific language governing permissions and
     14  
      * limitations under the License.
     15  
      *
     16  
      * Copyright (c) 2015 Jeremy Long. All Rights Reserved.
     17  
      */
     18  
     package org.owasp.dependencycheck.xml.pom;
     19  
     
     20  
     import org.owasp.dependencycheck.suppression.*;
     21  
     import java.io.IOException;
     22  
     
     23  
     /**
     24  
      * An exception used when parsing a suppression rule file fails.
     25  
      *
     26  
      * @author Jeremy Long
     27  
      */
     28  
     public class PomParseException extends IOException {
     29  
     
     30  
         /**
     31  
          * Creates a new SuppressionParseException.
     32  
          */
     33  
         public PomParseException() {
     34  0
             super();
     35  0
         }
     36  
     
     37  
         /**
     38  
          * Creates a new SuppressionParseException.
     39  
          *
     40  
          * @param msg a message for the exception.
     41  
          */
     42  
         public PomParseException(String msg) {
     43  0
             super(msg);
     44  0
         }
     45  
     
     46  
         /**
     47  
          * Creates a new SuppressionParseException.
     48  
          *
     49  
          * @param ex the cause of the parse exception
     50  
          */
     51  
         public PomParseException(Throwable ex) {
     52  0
             super(ex);
     53  0
         }
     54  
     
     55  
         /**
     56  
          * Creates a new SuppressionParseException.
     57  
          *
     58  
          * @param msg a message for the exception.
     59  
          * @param ex the cause of the parse exception
     60  
          */
     61  
         public PomParseException(String msg, Throwable ex) {
     62  0
             super(msg, ex);
     63  0
         }
     64  
     }
    + + + + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParser.html new file mode 100644 index 000000000..35261ab5d --- /dev/null +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParser.html @@ -0,0 +1,216 @@ + + + + +Coverage Report + + + + +
    Coverage Report - org.owasp.dependencycheck.xml.pom.PomParser
    +
     
    + + + + +
    Classes in this File Line Coverage Branch Coverage Complexity
    PomParser
    50%
    17/34
    50%
    1/2
    8
    +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     1  
     /*
     2  
      * This file is part of dependency-check-core.
     3  
      *
     4  
      * Licensed under the Apache License, Version 2.0 (the "License");
     5  
      * you may not use this file except in compliance with the License.
     6  
      * You may obtain a copy of the License at
     7  
      *
     8  
      *     http://www.apache.org/licenses/LICENSE-2.0
     9  
      *
     10  
      * Unless required by applicable law or agreed to in writing, software
     11  
      * distributed under the License is distributed on an "AS IS" BASIS,
     12  
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  
      * See the License for the specific language governing permissions and
     14  
      * limitations under the License.
     15  
      *
     16  
      * Copyright (c) 2015 Jeremy Long. All Rights Reserved.
     17  
      */
     18  
     package org.owasp.dependencycheck.xml.pom;
     19  
     
     20  
     import java.io.File;
     21  
     import java.io.FileInputStream;
     22  
     import java.io.FileNotFoundException;
     23  
     import java.io.IOException;
     24  
     import java.io.InputStream;
     25  
     import java.io.InputStreamReader;
     26  
     import java.io.Reader;
     27  
     import java.util.List;
     28  
     import java.util.logging.Level;
     29  
     import java.util.logging.Logger;
     30  
     import javax.xml.parsers.ParserConfigurationException;
     31  
     import javax.xml.parsers.SAXParser;
     32  
     import javax.xml.parsers.SAXParserFactory;
     33  
     import org.xml.sax.InputSource;
     34  
     import org.xml.sax.SAXException;
     35  
     import org.xml.sax.XMLReader;
     36  
     
     37  
     /**
     38  
      * A parser for pom.xml files.
     39  
      *
     40  
      * @author Jeremy Long
     41  
      */
     42  2
     public class PomParser {
     43  
     
     44  
         /**
     45  
          * The logger.
     46  
          */
     47  1
         private static final Logger LOGGER = Logger.getLogger(PomParser.class.getName());
     48  
     
     49  
         /**
     50  
          * Parses the given xml file and returns a Model object containing only the fields dependency-check requires.
     51  
          *
     52  
          * @param file a pom.xml
     53  
          * @return a Model object containing only the fields dependency-check requires
     54  
          * @throws PomParseException thrown if the xml file cannot be parsed
     55  
          */
     56  
         public Model parse(File file) throws PomParseException {
     57  1
             FileInputStream fis = null;
     58  
             try {
     59  1
                 fis = new FileInputStream(file);
     60  1
                 return parse(fis);
     61  0
             } catch (IOException ex) {
     62  0
                 LOGGER.log(Level.FINE, null, ex);
     63  0
                 throw new PomParseException(ex);
     64  
             } finally {
     65  1
                 if (fis != null) {
     66  
                     try {
     67  1
                         fis.close();
     68  0
                     } catch (IOException ex) {
     69  0
                         LOGGER.log(Level.FINE, "Unable to close stream", ex);
     70  2
                     }
     71  
                 }
     72  
             }
     73  
         }
     74  
     
     75  
         /**
     76  
          * Parses the given xml file and returns a Model object containing only the fields dependency-check requires.
     77  
          *
     78  
          * @param inputStream an InputStream containing suppression rues
     79  
          * @return a list of suppression rules
     80  
          * @throws SuppressionParseException if the xml cannot be parsed
     81  
          */
     82  
         public Model parse(InputStream inputStream) throws PomParseException {
     83  
             try {
     84  2
                 final PomHandler handler = new PomHandler();
     85  2
                 final SAXParserFactory factory = SAXParserFactory.newInstance();
     86  
     //            factory.setNamespaceAware(true);
     87  
     //            factory.setValidating(true);
     88  2
                 final SAXParser saxParser = factory.newSAXParser();
     89  2
                 final XMLReader xmlReader = saxParser.getXMLReader();
     90  2
                 xmlReader.setContentHandler(handler);
     91  
     
     92  2
                 final Reader reader = new InputStreamReader(inputStream, "UTF-8");
     93  2
                 final InputSource in = new InputSource(reader);
     94  
                 //in.setEncoding("UTF-8");
     95  
     
     96  2
                 xmlReader.parse(in);
     97  
     
     98  2
                 return handler.getModel();
     99  0
             } catch (ParserConfigurationException ex) {
     100  0
                 LOGGER.log(Level.FINE, null, ex);
     101  0
                 throw new PomParseException(ex);
     102  0
             } catch (SAXException ex) {
     103  0
                 LOGGER.log(Level.FINE, null, ex);
     104  0
                 throw new PomParseException(ex);
     105  0
             } catch (FileNotFoundException ex) {
     106  0
                 LOGGER.log(Level.FINE, null, ex);
     107  0
                 throw new PomParseException(ex);
     108  0
             } catch (IOException ex) {
     109  0
                 LOGGER.log(Level.FINE, null, ex);
     110  0
                 throw new PomParseException(ex);
     111  
             }
     112  
         }
     113  
     }
    + + + + diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomUtils.html new file mode 100644 index 000000000..7d93ee98b --- /dev/null +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomUtils.html @@ -0,0 +1,328 @@ + + + + +Coverage Report + + + + +
    Coverage Report - org.owasp.dependencycheck.xml.pom.PomUtils
    +
     
    + + + + +
    Classes in this File Line Coverage Branch Coverage Complexity
    PomUtils
    14%
    14/96
    1%
    1/80
    14
    +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     1  
     /*
     2  
      * This file is part of dependency-check-core.
     3  
      *
     4  
      * Licensed under the Apache License, Version 2.0 (the "License");
     5  
      * you may not use this file except in compliance with the License.
     6  
      * You may obtain a copy of the License at
     7  
      *
     8  
      *     http://www.apache.org/licenses/LICENSE-2.0
     9  
      *
     10  
      * Unless required by applicable law or agreed to in writing, software
     11  
      * distributed under the License is distributed on an "AS IS" BASIS,
     12  
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  
      * See the License for the specific language governing permissions and
     14  
      * limitations under the License.
     15  
      *
     16  
      * Copyright (c) 2015 Jeremy Long. All Rights Reserved.
     17  
      */
     18  
     package org.owasp.dependencycheck.xml.pom;
     19  
     
     20  
     import java.io.File;
     21  
     import java.io.IOException;
     22  
     import java.util.jar.JarFile;
     23  
     import java.util.logging.Level;
     24  
     import java.util.logging.Logger;
     25  
     import java.util.zip.ZipEntry;
     26  
     import org.owasp.dependencycheck.analyzer.JarAnalyzer;
     27  
     import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
     28  
     import org.owasp.dependencycheck.dependency.Confidence;
     29  
     import org.owasp.dependencycheck.dependency.Dependency;
     30  
     
     31  
     /**
     32  
      *
     33  
      * @author jeremy
     34  
      */
     35  
     public final class PomUtils {
     36  
     
     37  
         /**
     38  
          * empty private constructor for utility class.
     39  
          */
     40  0
         private PomUtils() {
     41  0
         }
     42  
         /**
     43  
          * The logger.
     44  
          */
     45  1
         private static final Logger LOGGER = Logger.getLogger(PomUtils.class.getName());
     46  
     
     47  
         /**
     48  
          * Reads in the specified POM and converts it to a Model.
     49  
          *
     50  
          * @param file the pom.xml file
     51  
          * @return returns a
     52  
          * @throws AnalysisException is thrown if there is an exception extracting or parsing the POM
     53  
          * {@link org.owasp.dependencycheck.jaxb.pom.generated.Model} object
     54  
          */
     55  
         public static Model readPom(File file) throws AnalysisException {
     56  1
             Model model = null;
     57  
             try {
     58  1
                 PomParser parser = new PomParser();
     59  1
                 model = parser.parse(file);
     60  0
             } catch (PomParseException ex) {
     61  0
                 final String msg = String.format("Unable to parse pom '%s'", file.getPath());
     62  0
                 LOGGER.log(Level.WARNING, msg);
     63  0
                 LOGGER.log(Level.FINE, "", ex);
     64  0
                 throw new AnalysisException(ex);
     65  0
             } catch (IOException ex) {
     66  0
                 final String msg = String.format("Unable to parse pom '%s'(IO Exception)", file.getPath());
     67  0
                 LOGGER.log(Level.WARNING, msg);
     68  0
                 LOGGER.log(Level.FINE, "", ex);
     69  0
                 throw new AnalysisException(ex);
     70  0
             } catch (Throwable ex) {
     71  0
                 final String msg = String.format("Unexpected error during parsing of the pom '%s'", file.getPath());
     72  0
                 LOGGER.log(Level.WARNING, msg);
     73  0
                 LOGGER.log(Level.FINE, "", ex);
     74  0
                 throw new AnalysisException(ex);
     75  1
             }
     76  1
             return model;
     77  
         }
     78  
     
     79  
         /**
     80  
          * Retrieves the specified POM from a jar file and converts it to a Model.
     81  
          *
     82  
          * @param path the path to the pom.xml file within the jar file
     83  
          * @param jar the jar file to extract the pom from
     84  
          * @return returns a
     85  
          * @throws AnalysisException is thrown if there is an exception extracting or parsing the POM
     86  
          * {@link org.owasp.dependencycheck.jaxb.pom.generated.Model} object
     87  
          */
     88  
         public static Model readPom(String path, JarFile jar) throws AnalysisException {
     89  1
             final ZipEntry entry = jar.getEntry(path);
     90  1
             Model model = null;
     91  1
             if (entry != null) { //should never be null
     92  
                 try {
     93  
     //                final NonClosingStream stream = new NonClosingStream(jar.getInputStream(entry));
     94  
     //                final InputStreamReader reader = new InputStreamReader(stream, "UTF-8");
     95  
     //                final InputSource xml = new InputSource(reader);
     96  
     //                final SAXSource source = new SAXSource(xml);
     97  1
                     final PomParser parser = new PomParser();
     98  1
                     model = parser.parse(jar.getInputStream(entry));
     99  1
                     LOGGER.fine(String.format("Read POM %s", path));
     100  0
                 } catch (SecurityException ex) {
     101  0
                     final String msg = String.format("Unable to parse pom '%s' in jar '%s'; invalid signature", path, jar.getName());
     102  0
                     LOGGER.log(Level.WARNING, msg);
     103  0
                     LOGGER.log(Level.FINE, null, ex);
     104  0
                     throw new AnalysisException(ex);
     105  0
                 } catch (IOException ex) {
     106  0
                     final String msg = String.format("Unable to parse pom '%s' in jar '%s' (IO Exception)", path, jar.getName());
     107  0
                     LOGGER.log(Level.WARNING, msg);
     108  0
                     LOGGER.log(Level.FINE, "", ex);
     109  0
                     throw new AnalysisException(ex);
     110  0
                 } catch (Throwable ex) {
     111  0
                     final String msg = String.format("Unexpected error during parsing of the pom '%s' in jar '%s'", path, jar.getName());
     112  0
                     LOGGER.log(Level.WARNING, msg);
     113  0
                     LOGGER.log(Level.FINE, "", ex);
     114  0
                     throw new AnalysisException(ex);
     115  1
                 }
     116  
             }
     117  1
             return model;
     118  
         }
     119  
     
     120  
         /**
     121  
          * Reads in the pom file and adds elements as evidence to the given dependency.
     122  
          *
     123  
          * @param dependency the dependency being analyzed
     124  
          * @param pomFile the pom file to read
     125  
          * @throws AnalysisException is thrown if there is an exception parsing the pom
     126  
          */
     127  
         public static void analyzePOM(Dependency dependency, File pomFile) throws AnalysisException {
     128  0
             final Model pom = PomUtils.readPom(pomFile);
     129  
     
     130  0
             String groupid = pom.getGroupId();
     131  0
             String parentGroupId = null;
     132  
     
     133  0
             if (pom.getParentGroupId() != null) {
     134  0
                 parentGroupId = pom.getParentGroupId();
     135  0
                 if ((groupid == null || groupid.isEmpty()) && parentGroupId != null && !parentGroupId.isEmpty()) {
     136  0
                     groupid = parentGroupId;
     137  
                 }
     138  
             }
     139  0
             if (groupid != null && !groupid.isEmpty()) {
     140  0
                 dependency.getVendorEvidence().addEvidence("pom", "groupid", groupid, Confidence.HIGHEST);
     141  0
                 dependency.getProductEvidence().addEvidence("pom", "groupid", groupid, Confidence.LOW);
     142  0
                 if (parentGroupId != null && !parentGroupId.isEmpty() && !parentGroupId.equals(groupid)) {
     143  0
                     dependency.getVendorEvidence().addEvidence("pom", "parent-groupid", parentGroupId, Confidence.MEDIUM);
     144  0
                     dependency.getProductEvidence().addEvidence("pom", "parent-groupid", parentGroupId, Confidence.LOW);
     145  
                 }
     146  
             }
     147  0
             String artifactid = pom.getArtifactId();
     148  0
             String parentArtifactId = null;
     149  0
             if (pom.getParentArtifactId() != null) {
     150  0
                 parentArtifactId = pom.getParentArtifactId();
     151  0
                 if ((artifactid == null || artifactid.isEmpty()) && parentArtifactId != null && !parentArtifactId.isEmpty()) {
     152  0
                     artifactid = parentArtifactId;
     153  
                 }
     154  
             }
     155  0
             if (artifactid != null && !artifactid.isEmpty()) {
     156  0
                 if (artifactid.startsWith("org.") || artifactid.startsWith("com.")) {
     157  0
                     artifactid = artifactid.substring(4);
     158  
                 }
     159  0
                 dependency.getProductEvidence().addEvidence("pom", "artifactid", artifactid, Confidence.HIGHEST);
     160  0
                 dependency.getVendorEvidence().addEvidence("pom", "artifactid", artifactid, Confidence.LOW);
     161  0
                 if (parentArtifactId != null && !parentArtifactId.isEmpty() && !parentArtifactId.equals(artifactid)) {
     162  0
                     dependency.getProductEvidence().addEvidence("pom", "parent-artifactid", parentArtifactId, Confidence.MEDIUM);
     163  0
                     dependency.getVendorEvidence().addEvidence("pom", "parent-artifactid", parentArtifactId, Confidence.LOW);
     164  
                 }
     165  
             }
     166  
             //version
     167  0
             String version = pom.getVersion();
     168  0
             String parentVersion = null;
     169  0
             if (pom.getParentVersion() != null) {
     170  0
                 parentVersion = pom.getParentVersion();
     171  0
                 if ((version == null || version.isEmpty()) && parentVersion != null && !parentVersion.isEmpty()) {
     172  0
                     version = parentVersion;
     173  
                 }
     174  
             }
     175  0
             if (version != null && !version.isEmpty()) {
     176  0
                 dependency.getVersionEvidence().addEvidence("pom", "version", version, Confidence.HIGHEST);
     177  0
                 if (parentVersion != null && !parentVersion.isEmpty() && !parentVersion.equals(version)) {
     178  0
                     dependency.getVersionEvidence().addEvidence("pom", "parent-version", version, Confidence.LOW);
     179  
                 }
     180  
             }
     181  
     
     182  0
             final String orgName = pom.getOrganization();
     183  0
             if (orgName != null && !orgName.isEmpty()) {
     184  0
                 dependency.getVendorEvidence().addEvidence("pom", "organization name", orgName, Confidence.HIGH);
     185  
             }
     186  0
             final String pomName = pom.getName();
     187  0
             if (pomName != null && !pomName.isEmpty()) {
     188  0
                 dependency.getProductEvidence().addEvidence("pom", "name", pomName, Confidence.HIGH);
     189  0
                 dependency.getVendorEvidence().addEvidence("pom", "name", pomName, Confidence.HIGH);
     190  
             }
     191  
     
     192  0
             if (pom.getDescription() != null) {
     193  0
                 final String description = pom.getDescription();
     194  0
                 if (description != null && !description.isEmpty()) {
     195  0
                     JarAnalyzer.addDescription(dependency, description, "pom", "description");
     196  
                 }
     197  
             }
     198  0
             JarAnalyzer.extractLicense(pom, null, dependency);
     199  0
         }
     200  
     }
    + + + + diff --git a/dependency-check-core/cpd.html b/dependency-check-core/cpd.html index a12127418..36c67f0d8 100644 --- a/dependency-check-core/cpd.html +++ b/dependency-check-core/cpd.html @@ -1,13 +1,13 @@ - + dependency-check-core - CPD Results @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@

    org.apache.openjpa:openjpa

    @@ -1282,7 +1294,7 @@ - + @@ -1294,7 +1306,7 @@ -
    jmockit
    Current Version1.15
    1.16
    Scope test
    jar
    Newer versions1.16-beta1 Next Incremental
    1.16-beta2 Latest Incremental
    +1.17-beta1 Next Incremental

    org.jsoup:jsoup

    @@ -1363,7 +1375,7 @@ - + @@ -1399,7 +1411,7 @@ -
    dependency-check-utils
    Current Version1.2.9
    1.2.10
    Scope compile
    jar
    Newer versions2.5.6 Next Incremental
    2.5.6.SEC01
    2.5.6.SEC02
    2.5.6.SEC03 Latest Incremental
    3.0.0.RELEASE Next Major
    3.0.1.RELEASE
    3.0.2.RELEASE
    3.0.3.RELEASE
    3.0.4.RELEASE
    3.0.5.RELEASE
    3.0.6.RELEASE
    3.0.7.RELEASE
    3.1.0.RELEASE
    3.1.1.RELEASE
    3.1.2.RELEASE
    3.2.0.RELEASE
    3.2.1.RELEASE
    3.2.2.RELEASE
    3.2.3.RELEASE
    3.2.4.RELEASE
    3.2.5.RELEASE
    3.2.6.RELEASE
    3.2.7.RELEASE
    3.2.8.RELEASE
    3.2.9.RELEASE
    3.2.10.RELEASE
    3.2.11.RELEASE
    3.2.12.RELEASE
    3.2.13.RELEASE
    4.0.0.RELEASE
    4.0.1.RELEASE
    4.0.2.RELEASE
    4.0.3.RELEASE
    4.0.4.RELEASE
    4.0.5.RELEASE
    4.0.6.RELEASE
    4.0.7.RELEASE
    4.0.8.RELEASE
    4.0.9.RELEASE
    4.1.0.RELEASE
    4.1.1.RELEASE
    4.1.2.RELEASE
    4.1.3.RELEASE
    4.1.4.RELEASE
    4.1.5.RELEASE Latest Major
    +2.5.6 Next Incremental
    2.5.6.SEC01
    2.5.6.SEC02
    2.5.6.SEC03 Latest Incremental
    3.0.0.RELEASE Next Major
    3.0.1.RELEASE
    3.0.2.RELEASE
    3.0.3.RELEASE
    3.0.4.RELEASE
    3.0.5.RELEASE
    3.0.6.RELEASE
    3.0.7.RELEASE
    3.1.0.RELEASE
    3.1.1.RELEASE
    3.1.2.RELEASE
    3.2.0.RELEASE
    3.2.1.RELEASE
    3.2.2.RELEASE
    3.2.3.RELEASE
    3.2.4.RELEASE
    3.2.5.RELEASE
    3.2.6.RELEASE
    3.2.7.RELEASE
    3.2.8.RELEASE
    3.2.9.RELEASE
    3.2.10.RELEASE
    3.2.11.RELEASE
    3.2.12.RELEASE
    3.2.13.RELEASE
    4.0.0.RELEASE
    4.0.1.RELEASE
    4.0.2.RELEASE
    4.0.3.RELEASE
    4.0.4.RELEASE
    4.0.5.RELEASE
    4.0.6.RELEASE
    4.0.7.RELEASE
    4.0.8.RELEASE
    4.0.9.RELEASE
    4.1.0.RELEASE
    4.1.1.RELEASE
    4.1.2.RELEASE
    4.1.3.RELEASE
    4.1.4.RELEASE
    4.1.5.RELEASE
    4.1.6.RELEASE Latest Major

    org.springframework.retry:spring-retry

    @@ -1453,7 +1465,31 @@ -
    jar
    Newer versions3.0.1.RELEASE Next Incremental
    3.0.2.RELEASE
    3.0.3.RELEASE
    3.0.4.RELEASE
    3.0.5.RELEASE
    3.0.6.RELEASE
    3.0.7.RELEASE
    3.0.8.RELEASE Latest Incremental
    3.1.0.RELEASE Next Minor
    3.1.1.RELEASE
    3.1.2.RELEASE
    3.1.3.RELEASE
    3.1.4.RELEASE
    3.1.5.RELEASE
    3.1.6.RELEASE
    3.1.7.RELEASE
    3.2.0.RELEASE
    3.2.1.RELEASE
    3.2.2.RELEASE
    3.2.3.RELEASE
    3.2.4.RELEASE
    3.2.5.RELEASE
    3.2.6.RELEASE Latest Minor
    +3.0.1.RELEASE Next Incremental
    3.0.2.RELEASE
    3.0.3.RELEASE
    3.0.4.RELEASE
    3.0.5.RELEASE
    3.0.6.RELEASE
    3.0.7.RELEASE
    3.0.8.RELEASE Latest Incremental
    3.1.0.RELEASE Next Minor
    3.1.1.RELEASE
    3.1.2.RELEASE
    3.1.3.RELEASE
    3.1.4.RELEASE
    3.1.5.RELEASE
    3.1.6.RELEASE
    3.1.7.RELEASE
    3.2.0.RELEASE
    3.2.1.RELEASE
    3.2.2.RELEASE
    3.2.3.RELEASE
    3.2.4.RELEASE
    3.2.5.RELEASE
    3.2.6.RELEASE
    3.2.7.RELEASE Latest Minor
    4.0.0.RELEASE Next Major +
    +

    uk.ltd.getahead:dwr

    + + + + + + + + + + + + + + + + + + + + + +
    Status No newer versions available.
    Group Iduk.ltd.getahead
    Artifact Iddwr
    Current Version1.1.1
    Scopeprovided
    Classifier
    Typejar
    diff --git a/dependency-check-core/failsafe-report.html b/dependency-check-core/failsafe-report.html index 3dd72bebe..d66e8df00 100644 --- a/dependency-check-core/failsafe-report.html +++ b/dependency-check-core/failsafe-report.html @@ -1,13 +1,13 @@ - + dependency-check-core - Surefire Report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@

    Package List

    @@ -287,7 +287,7 @@ function toggleDisplay(elementId) { 0 0 100% -6.265 +5.843 org.owasp.dependencycheck 1 @@ -295,7 +295,7 @@ function toggleDisplay(elementId) { 0 0 100% -51.868 +37.656 org.owasp.dependencycheck.analyzer 18 @@ -303,7 +303,7 @@ function toggleDisplay(elementId) { 0 0 100% -27.937 +22.35 org.owasp.dependencycheck.data.update 3 @@ -311,7 +311,7 @@ function toggleDisplay(elementId) { 0 0 100% -18.512 +119.214 org.owasp.dependencycheck.data.nvdcve 9 @@ -319,7 +319,7 @@ function toggleDisplay(elementId) { 0 0 100% -6.724
    +6.384

    Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.

    org.owasp.dependencycheck.reporting

    @@ -341,7 +341,7 @@ function toggleDisplay(elementId) { 0 0 100% -6.265
    +5.843

    org.owasp.dependencycheck

    @@ -362,7 +362,7 @@ function toggleDisplay(elementId) { -
    0 0 100%51.868
    +37.656

    org.owasp.dependencycheck.analyzer

    @@ -383,7 +383,7 @@ function toggleDisplay(elementId) { - + @@ -392,7 +392,7 @@ function toggleDisplay(elementId) { - + @@ -401,7 +401,7 @@ function toggleDisplay(elementId) { -
    0 0 100%18.87
    14.568
    CPEAnalyzerIntegrationTest0 0 100%5.969
    5.059
    VulnerabilitySuppressionAnalyzerIntegrationTest0 0 100%3.098
    +2.723

    org.owasp.dependencycheck.data.update

    @@ -422,7 +422,7 @@ function toggleDisplay(elementId) { - + @@ -431,7 +431,7 @@ function toggleDisplay(elementId) { -
    0 0 100%16.841
    113.972
    StandardUpdateIntegrationTest0 0 100%1.671
    +5.242

    org.owasp.dependencycheck.data.nvdcve

    @@ -452,7 +452,7 @@ function toggleDisplay(elementId) { - + @@ -461,7 +461,7 @@ function toggleDisplay(elementId) { -
    0 0 100%2.903
    2.774
    DatabasePropertiesIntegrationTest0 0 100%3.821

    +3.61

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -471,15 +471,15 @@ function toggleDisplay(elementId) { testAnalyzeTar -4.32 +2.765 testAnalyzeTgz -7.189 +6.568 testAnalyze -1.526 +0.938 testGetAnalysisPhase @@ -491,7 +491,7 @@ function toggleDisplay(elementId) { testAnalyze_badZip -1.385 +0.577 testInitialize @@ -499,34 +499,34 @@ function toggleDisplay(elementId) { testAnalyzeTarGz -4.444 +3.714 testSupportsExtension -0.001 +0.002 testGetSupportedExtensions -0.002
    +0.001

    CPEAnalyzerIntegrationTest

    - + - + - + - + @@ -537,7 +537,7 @@ function toggleDisplay(elementId) { - + @@ -552,78 +552,78 @@ function toggleDisplay(elementId) { - + - + - + -
    testSearchCPE1.613
    1.503
    testDetermineCPE1.425
    1.304
    testDetermineIdentifiers0.969
    0.994
    testDetermineCPE_full1.961
    1.257
    testBuildSearch
    testAnalyze3.097
    2.722
    testGetAnalysisPhase
    testOpen1.134
    1.082
    testGetCPEs0.584
    0.527
    testGetVulnerabilities0.681
    0.666
    testGetMatchingSoftware0.504
    +0.499

    DatabasePropertiesIntegrationTest

    - + - + - + - + -
    testSave1.557
    1.428
    testGetProperty_String_String0.575
    0.508
    testGetProperties0.54
    0.568
    testGetProperty_String0.573
    0.539
    testIsEmpty0.576
    +0.567

    NvdCveUpdaterIntegrationTest

    -
    testUpdate16.841
    +113.972

    StandardUpdateIntegrationTest

    - + -
    testOpenDataStores1.025
    3.402
    testUpdatesNeeded0.646
    +1.84

    EngineIntegrationTest

    -
    testEngine51.868
    +37.656

    ReportGeneratorIntegrationTest

    - + -
    testGenerateXMLReport6.264
    5.843
    testGenerateReport0.001

    +0
    diff --git a/dependency-check-core/findbugs.html b/dependency-check-core/findbugs.html index c23e1fe6d..435ec46f4 100644 --- a/dependency-check-core/findbugs.html +++ b/dependency-check-core/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-core - FindBugs Bug Detector Report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ diff --git a/dependency-check-core/images/dc-core.svg b/dependency-check-core/images/dc-core.svg new file mode 100644 index 000000000..cdb0a9378 --- /dev/null +++ b/dependency-check-core/images/dc-core.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dependency-check-core/index.html b/dependency-check-core/index.html index 1220fac4b..4cf54da48 100644 --- a/dependency-check-core/index.html +++ b/dependency-check-core/index.html @@ -1,13 +1,13 @@ - + dependency-check-core - About @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +
    +

    org/owasp/dependencycheck/xml/pom/PomHandler.java

    + + + + + + + + + + + + +
    ViolationLine
    Avoid empty if statements158160
    These nested if statements could be combined166172
    Avoid empty if statements169171
    +
    +

    org/owasp/dependencycheck/xml/pom/PomParser.java

    + + + + + + +
    ViolationLine
    Avoid unused imports such as 'java.util.List'27
    diff --git a/dependency-check-core/project-info.html b/dependency-check-core/project-info.html index b8498cf99..de360c1e2 100644 --- a/dependency-check-core/project-info.html +++ b/dependency-check-core/project-info.html @@ -1,13 +1,13 @@ - + dependency-check-core - Project Information @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@

    org.owasp.dependencycheck.data.nvdcve

    @@ -845,7 +883,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.114
    +0.069

    org.owasp.dependencycheck.data.lucene

    @@ -884,7 +922,7 @@ function toggleDisplay(elementId) { - + @@ -893,7 +931,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.06
    0.063
    UrlTokenizingFilterTest0 0 100%0.982

    +0.589

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -903,14 +941,14 @@ function toggleDisplay(elementId) { testNewHashSet -0.022
    +0.025

    AbstractSuppressionAnalyzerTest

    - + @@ -918,29 +956,29 @@ function toggleDisplay(elementId) { - + -
    testFailureToLocateSuppressionFileAnywhere0.362
    0.469
    testGetRulesFromSuppressionFileFromURL
    testGetRulesFromSuppressionFileInClasspath0.023
    0.024
    testGetSupportedExtensions0
    +0.001

    AnalyzerServiceTest

    -
    testGetAnalyzers0.491
    +0.033

    AssemblyAnalyzerTest

    - + - + - + -
    testGetName0.197
    0.192
    testAnalysis0.101
    0.095
    testWithSettingMono @@ -953,11 +991,11 @@ function toggleDisplay(elementId) {
    testNonexistent0.082
    0.074
    testLog4Net0.148
    +0.139

    DependencyBundlingAnalyzerTest

    @@ -980,7 +1018,7 @@ function toggleDisplay(elementId) { -
    testIsCore0
    +0.001

    FalsePositiveAnalyzerTest

    @@ -1002,7 +1040,7 @@ function toggleDisplay(elementId) { - + @@ -1010,7 +1048,7 @@ function toggleDisplay(elementId) { - + @@ -1018,18 +1056,18 @@ function toggleDisplay(elementId) { -
    testAnalyze0.07
    0.071
    testClose
    testGetAnalysisPhase0.001
    0
    testGetName
    testInitialize0.001
    +0

    HintAnalyzerTest

    - + - + @@ -1040,38 +1078,38 @@ function toggleDisplay(elementId) { - + - + - + - + -
    testAnalyze7.801
    6.917
    testGetAnalysisPhase0.002
    0.003
    testGetName
    testAnalyze0.29
    0.071
    testGetName0.25
    0.001
    testInterpolateString0.222
    0
    testSupportsExtension0.206
    0
    testGetSupportedExtensions0.203
    +0

    JavaScriptAnalyzerTest

    - + - + - + @@ -1079,7 +1117,7 @@ function toggleDisplay(elementId) { - + @@ -1087,7 +1125,7 @@ function toggleDisplay(elementId) { -
    testAnalyze0.006
    0.009
    testClose0
    0.001
    testGetAnalysisPhase0.001
    0
    testGetName
    testInitialize0.001
    0
    testSupportsExtension
    testGetSupportedExtensions0.001
    +0

    NuspecAnalyzerTest

    @@ -1113,23 +1151,23 @@ function toggleDisplay(elementId) { - + - + - + - + -
    testMultipleReturns0.17
    1.501
    testNullSha10.001
    0
    testMalformedSha10
    0.001
    testValidSha10.053
    0.088
    testMissingSha10.046
    +0.088

    IndexEntryTest

    @@ -1175,27 +1213,27 @@ function toggleDisplay(elementId) {
    - - + + - -
    testExamples0.051
    testClear0.052
    testClear0.009
    +testExamples +0.011

    UrlTokenizingFilterTest

    - + - + -
    testRandomStrings0.971
    0.572
    testExamples0.006
    0.009
    testEmptyTerm0.005
    +0.008

    NexusSearchTest

    @@ -1241,15 +1279,15 @@ function toggleDisplay(elementId) { - + - + -
    testGoodDocument0
    0.005
    testMissingDocument0.021
    0.014
    testNotNuspec0.017
    +0.011

    DriverLoaderTest

    @@ -1264,37 +1302,37 @@ function toggleDisplay(elementId) { - + - + - + -
    testLoad_String_String_badClassName0.001
    0
    testLoad_String_String_badPath0.005
    0.002
    testLoad_String_String0.047
    0.037
    testLoad_String_String_multiple_paths0.061
    +0.03

    EngineVersionCheckTest

    - + -
    testShouldUpdate0.173
    2.238
    testGetCurrentReleaseVersion0.051
    +0.104

    NvdCveInfoTest

    - + @@ -1317,7 +1355,7 @@ function toggleDisplay(elementId) { -
    testSetGetTimestamp0
    0.001
    testSetGetNeedsUpdate
    testCall1.097
    +2.873

    UpdateableNvdCveTest

    @@ -1347,14 +1385,14 @@ function toggleDisplay(elementId) { -
    testParse0.038
    +0.035

    NvdCve_2_0_HandlerTest

    -
    testParse0.161
    +0.095

    DependencyTest

    @@ -1365,7 +1403,7 @@ function toggleDisplay(elementId) { - + @@ -1373,15 +1411,15 @@ function toggleDisplay(elementId) { - + - + - + @@ -1409,7 +1447,7 @@ function toggleDisplay(elementId) { - + @@ -1429,7 +1467,7 @@ function toggleDisplay(elementId) { - + @@ -1445,7 +1483,18 @@ function toggleDisplay(elementId) { -
    testGetSha1sum0
    0.005
    testGetProductEvidence
    testGetActualFilePath0.017
    0.001
    testAddAsEvidence0
    0.001
    testAddAsEvidenceWithEmptyArtefact0
    0.001
    testSetFileExtension
    testSetFilePath0.001
    0
    testGetFileName
    testGetMd5sum0.022
    0.012
    testGetEvidence
    testSetActualFilePath0.003
    +0.002 +
    +

    EvidenceTest

    + + + + + + + + +
    testCompareTo0
    testEquals0

    VulnerableSoftwareTest

    @@ -1504,7 +1553,7 @@ function toggleDisplay(elementId) { - + @@ -1540,15 +1589,15 @@ function toggleDisplay(elementId) { - + - + - + @@ -1576,7 +1625,7 @@ function toggleDisplay(elementId) { - + @@ -1596,11 +1645,11 @@ function toggleDisplay(elementId) { - + - + @@ -1612,15 +1661,15 @@ function toggleDisplay(elementId) { - + - + -
    testCpe0
    0.001
    testCve
    testProcessGAV0.002
    0
    testAddCvssBelow0
    0.001
    testFilePath0.002
    0
    testGetCvssBelow
    testGetCpe0
    0.001
    testGetCve
    testHasCwe0
    0.001
    testSetCvssBelow0.001
    0
    testSetSha1
    testSetCve0.001
    0
    testSetCwe0.001
    0
    testCountCharacter0.001
    +0

    DateUtilTest

    @@ -1676,6 +1725,13 @@ function toggleDisplay(elementId) { +
    testPasses0
    +
    +

    PomUtilsTest

    + + + +
    testReadPom_File 0

    Failure Details

    diff --git a/dependency-check-core/taglist.html b/dependency-check-core/taglist.html index fca2f1923..9b46b94c6 100644 --- a/dependency-check-core/taglist.html +++ b/dependency-check-core/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-core - Tag List report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +137 + +org.owasp.dependencycheck.xml.pom.PomHandler +Line + +add error logging +159 + +add error logging +170
    diff --git a/dependency-check-core/team-list.html b/dependency-check-core/team-list.html index 95204b05f..8ba04dbf7 100644 --- a/dependency-check-core/team-list.html +++ b/dependency-check-core/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-core - Team list @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +https://www.owasp.org/ +developer

    Contributors

    The following additional people have contributed to this project through the way of suggestions, patches or documentation.

    - -
    diff --git a/dependency-check-maven/apidocs/deprecated-list.html b/dependency-check-maven/apidocs/deprecated-list.html index c564102e7..4bc59cbce 100644 --- a/dependency-check-maven/apidocs/deprecated-list.html +++ b/dependency-check-maven/apidocs/deprecated-list.html @@ -2,16 +2,16 @@ - + -Deprecated List (Dependency-Check Maven Plugin 1.2.9 API) - +Deprecated List (Dependency-Check Maven Plugin 1.2.10 API) + @@ -82,7 +82,7 @@ org.owasp.dependencycheck.maven.BaseDependencyCheckMojo.generate(Sink, Locale) -
    use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale) instead.
    + diff --git a/dependency-check-maven/apidocs/help-doc.html b/dependency-check-maven/apidocs/help-doc.html index 156db33ec..39261deb0 100644 --- a/dependency-check-maven/apidocs/help-doc.html +++ b/dependency-check-maven/apidocs/help-doc.html @@ -2,16 +2,16 @@ - + -API Help (Dependency-Check Maven Plugin 1.2.9 API) - +API Help (Dependency-Check Maven Plugin 1.2.10 API) + diff --git a/dependency-check-maven/apidocs/index-all.html b/dependency-check-maven/apidocs/index-all.html index 5fc366e4f..2c5522b68 100644 --- a/dependency-check-maven/apidocs/index-all.html +++ b/dependency-check-maven/apidocs/index-all.html @@ -2,16 +2,16 @@ - + -Index (Dependency-Check Maven Plugin 1.2.9 API) - +Index (Dependency-Check Maven Plugin 1.2.10 API) + @@ -100,6 +100,10 @@
    Returns whether or not a the report can be generated.
    +
    canGenerateReport() - Method in class org.owasp.dependencycheck.maven.UpdateMojo
    +
    +
    Returns false; this mojo cannot generate a report.
    +
    checkForFailure(List<Dependency>) - Method in class org.owasp.dependencycheck.maven.BaseDependencyCheckMojo
    Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the @@ -113,8 +117,7 @@
     
    cleanup() - Method in class org.owasp.dependencycheck.maven.Engine
    -
    Releases resources used by the analyzers by calling close() on each - analyzer.
    +
    Releases resources used by the analyzers by calling close() on each analyzer.
    closeAnalyzer(Analyzer) - Method in class org.owasp.dependencycheck.maven.Engine
    @@ -128,8 +131,8 @@
    Engine - Class in org.owasp.dependencycheck.maven
    -
    A modified version of the core engine specifically designed to persist some - data between multiple executions of a multi-module Maven project.
    +
    A modified version of the core engine specifically designed to persist some data between multiple executions of a multi-module + Maven project.
    Engine(MavenProject, List<MavenProject>) - Constructor for class org.owasp.dependencycheck.maven.Engine
    @@ -153,7 +156,7 @@
    generate(Sink, Locale) - Method in class org.owasp.dependencycheck.maven.BaseDependencyCheckMojo
    Deprecated. -
    use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale) instead.
    +
    generate(Sink, Locale) - Method in class org.owasp.dependencycheck.maven.BaseDependencyCheckMojo
    @@ -200,6 +203,10 @@
    Gets the description of the Dependency-Check report to be displayed in the Maven Generated Reports page.
    +
    getDescription(Locale) - Method in class org.owasp.dependencycheck.maven.UpdateMojo
    +
    +
    Gets the description of the Dependency-Check report to be displayed in the Maven Generated Reports page.
    +
    getFormat() - Method in class org.owasp.dependencycheck.maven.BaseDependencyCheckMojo
    Returns the report format.
    @@ -212,6 +219,10 @@
    Returns the report name.
    +
    getName(Locale) - Method in class org.owasp.dependencycheck.maven.UpdateMojo
    +
    +
    Returns the report name.
    +
    getOutputDirectory() - Method in class org.owasp.dependencycheck.maven.BaseDependencyCheckMojo
    Returns the output directory.
    @@ -279,12 +290,7 @@
    org.owasp.dependencycheck.maven - package org.owasp.dependencycheck.maven
    -
    - - org.owasp.dependencycheck.maven - - - This is the main package containing the Mojo Maven Plugin - dependency-check.
    +
    This is the main package containing the Mojo Maven Plugin - dependency-check.
    @@ -298,8 +304,7 @@
    resetFileTypeAnalyzers() - Method in class org.owasp.dependencycheck.maven.Engine
    -
    Resets the file type analyzers so that they can be re-used to scan - additional directories.
    +
    Resets the file type analyzers so that they can be re-used to scan additional directories.
    runCheck() - Method in class org.owasp.dependencycheck.maven.AggregateMojo
    @@ -313,6 +318,10 @@
    Executes the dependency-check engine on the project's dependencies and generates the report.
    +
    runCheck() - Method in class org.owasp.dependencycheck.maven.UpdateMojo
    +
    +
    Executes the dependency-check engine on the project's dependencies and generates the report.
    +
    @@ -337,11 +346,20 @@

    U

    +
    update() - Method in class org.owasp.dependencycheck.maven.Engine
    +
    +
    Runs the update steps of dependency-check.
    +
    UPDATE_EXECUTED_FLAG - Static variable in class org.owasp.dependencycheck.maven.Engine
    -
    Key used in the MavenProject context values to note whether or not an - update has been executed.
    +
    Key used in the MavenProject context values to note whether or not an update has been executed.
    +
    UpdateMojo - Class in org.owasp.dependencycheck.maven
    +
    +
    Maven Plugin that checks the project dependencies to see if they have any known published vulnerabilities.
    +
    +
    UpdateMojo() - Constructor for class org.owasp.dependencycheck.maven.UpdateMojo
    +
     
    diff --git a/dependency-check-maven/apidocs/index.html b/dependency-check-maven/apidocs/index.html index 64d620feb..02da8b7ee 100644 --- a/dependency-check-maven/apidocs/index.html +++ b/dependency-check-maven/apidocs/index.html @@ -2,9 +2,9 @@ - + -Dependency-Check Maven Plugin 1.2.9 API +Dependency-Check Maven Plugin 1.2.10 API @@ -121,7 +121,7 @@ extends Maven Plugin that checks project dependencies and the dependencies of all child modules to see if they have any known published vulnerabilities.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html index 692b0c109..b02d472b5 100644 --- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html +++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html @@ -2,16 +2,16 @@ - + -BaseDependencyCheckMojo (Dependency-Check Maven Plugin 1.2.9 API) - +BaseDependencyCheckMojo (Dependency-Check Maven Plugin 1.2.10 API) + @@ -105,7 +105,7 @@
    Direct Known Subclasses:
    -
    AggregateMojo, CheckMojo
    +
    AggregateMojo, CheckMojo, UpdateMojo


    @@ -113,7 +113,7 @@ extends org.apache.maven.plugin.AbstractMojo implements org.apache.maven.reporting.MavenReport
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    @@ -195,7 +195,7 @@ implements org.apache.maven.reporting.MavenReport generate(org.codehaus.doxia.sink.Sink sink, Locale locale)
    Deprecated.  -
    use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale) instead.
    +
    @@ -419,7 +419,7 @@ implements org.apache.maven.reporting.MavenReport public final void generate(org.codehaus.doxia.sink.Sink sink, Locale locale) throws org.apache.maven.reporting.MavenReportException -
    Deprecated. use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale) instead.
    +
    Generates the Dependency-Check Site Report.
    Specified by:
    diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/CheckMojo.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/CheckMojo.html index 741aea972..8df629418 100644 --- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/CheckMojo.html +++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/CheckMojo.html @@ -2,16 +2,16 @@ - + -CheckMojo (Dependency-Check Maven Plugin 1.2.9 API) - +CheckMojo (Dependency-Check Maven Plugin 1.2.10 API) + @@ -119,7 +119,7 @@ public class CheckMojo extends BaseDependencyCheckMojo
    Maven Plugin that checks the project dependencies to see if they have any known published vulnerabilities.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/Engine.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/Engine.html index 51a443848..d03f7f14f 100644 --- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/Engine.html +++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/Engine.html @@ -2,16 +2,16 @@ - + -Engine (Dependency-Check Maven Plugin 1.2.9 API) - +Engine (Dependency-Check Maven Plugin 1.2.10 API) + @@ -103,10 +103,10 @@
    public class Engine
     extends Engine
    -
    A modified version of the core engine specifically designed to persist some - data between multiple executions of a multi-module Maven project.
    +
    A modified version of the core engine specifically designed to persist some data between multiple executions of a multi-module + Maven project.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    @@ -128,8 +128,7 @@ extends static String UPDATE_EXECUTED_FLAG -
    Key used in the MavenProject context values to note whether or not an - update has been executed.
    +
    Key used in the MavenProject context values to note whether or not an update has been executed.
    @@ -176,8 +175,7 @@ extends void cleanup() -
    Releases resources used by the analyzers by calling close() on each - analyzer.
    +
    Releases resources used by the analyzers by calling close() on each analyzer.
    @@ -195,8 +193,13 @@ extends void resetFileTypeAnalyzers() -
    Resets the file type analyzers so that they can be re-used to scan - additional directories.
    +
    Resets the file type analyzers so that they can be re-used to scan additional directories.
    + + + +void +update() +
    Runs the update steps of dependency-check.
    @@ -205,7 +208,7 @@ extends Engine -getAnalyzers, getAnalyzers, getDependencies, getFileTypeAnalyzers, initializeEngine, scan, scan, scan, scan, scan, scan, scanDirectory, scanFile, setDependencies, supportsExtension +doUpdates, getAnalyzers, getAnalyzers, getDependencies, getFileTypeAnalyzers, initializeEngine, scan, scan, scan, scan, scan, scan, scanDirectory, scanFile, setDependencies, supportsExtension @@ -258,11 +260,9 @@ extends List<org.apache.maven.project.MavenProject> reactorProjects) throws DatabaseException
    Creates a new Engine to perform anyalsis on dependencies.
    -
    Parameters:
    project - the current Maven project
    reactorProjects - the reactor projects for the current Maven - execution
    +
    Parameters:
    project - the current Maven project
    reactorProjects - the reactor projects for the current Maven execution
    Throws:
    -
    DatabaseException - thrown if there is an issue connecting to the - database
    +
    DatabaseException - thrown if there is an issue connecting to the database
    @@ -287,6 +287,16 @@ extends + + +
      +
    • +

      update

      +
      public void update()
      +
      Runs the update steps of dependency-check.
      +
    • +
    @@ -294,8 +304,8 @@ extends

    initializeAnalyzer

    protected Analyzer initializeAnalyzer(Analyzer analyzer)
    -
    Initializes the given analyzer. This skips the initialization of the - CPEAnalyzer if it has been initialized by a previous execution.
    +
    Initializes the given analyzer. This skips the initialization of the CPEAnalyzer if it has been initialized by a previous + execution.
    Overrides:
    initializeAnalyzer in class Engine
    @@ -310,8 +320,7 @@ extends

    cleanup

    public void cleanup()
    -
    Releases resources used by the analyzers by calling close() on each - analyzer.
    +
    Releases resources used by the analyzers by calling close() on each analyzer.
    Overrides:
    cleanup in class Engine
    @@ -339,10 +348,8 @@ extends

    resetFileTypeAnalyzers

    public void resetFileTypeAnalyzers()
    -
    Resets the file type analyzers so that they can be re-used to scan - additional directories. Without the reset the analyzer might be disabled - because the first scan/analyze did not identify any files that could be - processed by the analyzer.
    +
    Resets the file type analyzers so that they can be re-used to scan additional directories. Without the reset the analyzer + might be disabled because the first scan/analyze did not identify any files that could be processed by the analyzer.
    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 f7537a64b..66de397da 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.2.9 API) - +HelpMojo (Dependency-Check Maven Plugin 1.2.10 API) + @@ -37,7 +37,7 @@
    + +UpdateMojo + +
    Maven Plugin that checks the project dependencies to see if they have any known published vulnerabilities.
    + + @@ -123,14 +124,7 @@

    Package org.owasp.dependencycheck.maven Description

    -
    - - org.owasp.dependencycheck.maven - - - This is the main package containing the Mojo Maven Plugin - dependency-check. - -
    +
    This is the main package containing the Mojo Maven Plugin - dependency-check.
    diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-tree.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-tree.html index 5e4ccf03c..d9fabfc34 100644 --- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-tree.html +++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.maven Class Hierarchy (Dependency-Check Maven Plugin 1.2.9 API) - +org.owasp.dependencycheck.maven Class Hierarchy (Dependency-Check Maven Plugin 1.2.10 API) + @@ -76,6 +76,7 @@
  • org.owasp.dependencycheck.maven.HelpMojo
  • diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-use.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-use.html index f59a7e74f..15e1ba0e3 100644 --- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-use.html +++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.2.10 API) + @@ -81,8 +81,8 @@ Engine -
    A modified version of the core engine specifically designed to persist some - data between multiple executions of a multi-module Maven project.
    +
    A modified version of the core engine specifically designed to persist some data between multiple executions of a multi-module + Maven project.
    diff --git a/dependency-check-maven/apidocs/overview-tree.html b/dependency-check-maven/apidocs/overview-tree.html index 3f688ca2f..206de20f9 100644 --- a/dependency-check-maven/apidocs/overview-tree.html +++ b/dependency-check-maven/apidocs/overview-tree.html @@ -2,16 +2,16 @@ - + -Class Hierarchy (Dependency-Check Maven Plugin 1.2.9 API) - +Class Hierarchy (Dependency-Check Maven Plugin 1.2.10 API) + @@ -80,6 +80,7 @@
  • org.owasp.dependencycheck.maven.HelpMojo
  • diff --git a/dependency-check-maven/check-mojo.html b/dependency-check-maven/check-mojo.html index 0d75adc2b..341c50afd 100644 --- a/dependency-check-maven/check-mojo.html +++ b/dependency-check-maven/check-mojo.html @@ -1,13 +1,13 @@ - + dependency-check-maven - dependency-check:check @@ -20,7 +20,7 @@ - + @@ -43,7 +43,7 @@
    -

    Details

    +

    Details

    +
    +

    src/main/java/org/owasp/dependencycheck/maven/UpdateMojo.java

    + + + + + + + + +
    ViolationMessageLine
    ErrorsUnused import - org.apache.maven.artifact.Artifact.23
    diff --git a/dependency-check-maven/checkstyle.rss b/dependency-check-maven/checkstyle.rss index 0e043157a..58925fe4f 100644 --- a/dependency-check-maven/checkstyle.rss +++ b/dependency-check-maven/checkstyle.rss @@ -25,8 +25,8 @@ under the License. en-us ©2013 - 2015 OWASP - File: 48, - Errors: 0, + <title>File: 50, + Errors: 1, Warnings: 0, Infos: 0 @@ -211,6 +211,20 @@ under the License. 0 + + + + org/owasp/dependencycheck/maven/UpdateMojo.java + + + 0 + + + 0 + + + 0 + @@ -393,6 +407,20 @@ under the License. 0 + + + + src/main/java/org/owasp/dependencycheck/maven/UpdateMojo.java + + + 0 + + + 0 + + + 1 + diff --git a/dependency-check-maven/cobertura/frame-sourcefiles-org.owasp.dependencycheck.maven.html b/dependency-check-maven/cobertura/frame-sourcefiles-org.owasp.dependencycheck.maven.html index 3171a51fc..6bbe9c114 100644 --- a/dependency-check-maven/cobertura/frame-sourcefiles-org.owasp.dependencycheck.maven.html +++ b/dependency-check-maven/cobertura/frame-sourcefiles-org.owasp.dependencycheck.maven.html @@ -24,11 +24,14 @@ org.owasp.dependencycheck.maven CheckMojo (0%) -Engine (13%) +Engine (12%) HelpMojo (0%) + +UpdateMojo (0%) + diff --git a/dependency-check-maven/cobertura/frame-sourcefiles.html b/dependency-check-maven/cobertura/frame-sourcefiles.html index b8425bb2d..7231ad62c 100644 --- a/dependency-check-maven/cobertura/frame-sourcefiles.html +++ b/dependency-check-maven/cobertura/frame-sourcefiles.html @@ -24,11 +24,14 @@ All Packages CheckMojo (0%) -Engine (13%) +Engine (12%) HelpMojo (0%) + +UpdateMojo (0%) + diff --git a/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.html b/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.html index 6c81e6218..1f4ace59c 100644 --- a/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.html +++ b/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.html @@ -16,7 +16,7 @@ - +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.maven5
    7%
    50/672
    3%
    12/398
    4.924
    org.owasp.dependencycheck.maven6
    7%
    50/691
    2%
    12/402
    4.704
    - + diff --git a/dependency-check-maven/cobertura/frame-summary.html b/dependency-check-maven/cobertura/frame-summary.html index 1eecd386c..00929e631 100644 --- a/dependency-check-maven/cobertura/frame-summary.html +++ b/dependency-check-maven/cobertura/frame-summary.html @@ -16,8 +16,8 @@ - - + +
    Package # Classes Line Coverage Branch Coverage Complexity
    All Packages5
    7%
    50/672
    3%
    12/398
    4.924
    org.owasp.dependencycheck.maven5
    7%
    50/672
    3%
    12/398
    4.924
    All Packages6
    7%
    50/691
    2%
    12/402
    4.704
    org.owasp.dependencycheck.maven6
    7%
    50/691
    2%
    12/402
    4.704
    - + diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.AggregateMojo.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.AggregateMojo.html index 1be6d0a17..ce31f15a2 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.AggregateMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.AggregateMojo.html @@ -108,7 +108,7 @@  45  
      *
     46   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     47  
      */
     48   @@ -444,6 +444,6 @@
     }
    - + diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.BaseDependencyCheckMojo.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.BaseDependencyCheckMojo.html index ca6d3e532..58ddcbfe7 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.BaseDependencyCheckMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.BaseDependencyCheckMojo.html @@ -144,7 +144,7 @@  63  
      *
     64   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     65  
      */
     66  1
     public abstract class BaseDependencyCheckMojo extends AbstractMojo implements MavenReport {
    @@ -754,7 +754,7 @@  383  
          * @throws MavenReportException if a maven report exception occurs
     384   -
          * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale) instead.
    +
          * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead.
     385  
          */
     386   @@ -1774,6 +1774,6 @@
     }
    - + diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.CheckMojo.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.CheckMojo.html index 090e5a2d9..e16a428f4 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.CheckMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.CheckMojo.html @@ -86,7 +86,7 @@  34  
      *
     35   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     36  
      */
     37   @@ -228,6 +228,6 @@
     }
    - + diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.Engine.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.Engine.html index 5f1947a55..540290b76 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.Engine.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.Engine.html @@ -12,7 +12,7 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    Engine
    13%
    9/65
    2%
    1/44
    3.7
    Engine
    12%
    9/70
    2%
    1/48
    3.636
     
    @@ -76,13 +76,13 @@  29  
     /**
     30   -
      * A modified version of the core engine specifically designed to persist some
    +
      * A modified version of the core engine specifically designed to persist some data between multiple executions of a multi-module
     31   -
      * data between multiple executions of a multi-module Maven project.
    +
      * Maven project.
     32  
      *
     33   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     34  
      */
     35   @@ -123,281 +123,284 @@  53  
         /**
     54   -
          * Key used in the MavenProject context values to note whether or not an
    +
          * Key used in the MavenProject context values to note whether or not an update has been executed.
     55   -
          * update has been executed.
    +
          */
     56   -
          */
    -  57  
         public static final String UPDATE_EXECUTED_FLAG = "dependency-check-update-executed";
    +  57   +
     
     58   -
     
    +
         /**
     59   -
         /**
    -  60  
          * Creates a new Engine to perform anyalsis on dependencies.
    -  61   +  60  
          *
    -  62   +  61  
          * @param project the current Maven project
    +  62   +
          * @param reactorProjects the reactor projects for the current Maven execution
     63   -
          * @param reactorProjects the reactor projects for the current Maven
    +
          * @throws DatabaseException thrown if there is an issue connecting to the database
     64   -
          * execution
    -  65   -
          * @throws DatabaseException thrown if there is an issue connecting to the
    -  66   -
          * database
    -  67  
          */
    -  68  1
         public Engine(MavenProject project, List<MavenProject> reactorProjects) throws DatabaseException {
    -  69  1
             this.currentProject = project;
    -  70  1
             this.reactorProjects = reactorProjects;
    -  71  1
             initializeEngine();
    -  72  1
         }
    -  73   +  65  1
         public Engine(MavenProject project, List<MavenProject> reactorProjects) throws DatabaseException {
    +  66  1
             this.currentProject = project;
    +  67  1
             this.reactorProjects = reactorProjects;
    +  68  1
             initializeEngine();
    +  69  1
         }
    +  70  
     
    -  74   +  71  
         /**
    -  75   +  72  
          * Runs the analyzers against all of the dependencies.
    -  76   +  73  
          */
    -  77   +  74  
         @Override
    -  78   +  75  
         public void analyzeDependencies() {
    -  79  0
             final MavenProject root = getExecutionRoot();
    -  80  0
             if (root != null) {
    -  81  0
                 LOGGER.fine(String.format("Checking root project, %s, if updates have already been completed", root.getArtifactId()));
    -  82   +  76  0
             final MavenProject root = getExecutionRoot();
    +  77  0
             if (root != null) {
    +  78  0
                 LOGGER.fine(String.format("Checking root project, %s, if updates have already been completed", root.getArtifactId()));
    +  79  
             } else {
    -  83  0
                 LOGGER.fine("Checking root project, null, if updates have already been completed");
    +  80  0
                 LOGGER.fine("Checking root project, null, if updates have already been completed");
    +  81   +
             }
    +  82  0
             if (root != null && root.getContextValue(UPDATE_EXECUTED_FLAG) != null) {
    +  83  0
                 System.setProperty(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE.toString());
     84  
             }
    -  85  0
             if (root != null && root.getContextValue(UPDATE_EXECUTED_FLAG) != null) {
    -  86  0
                 System.setProperty(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE.toString());
    -  87   +  85  0
             super.analyzeDependencies();
    +  86  0
             if (root != null) {
    +  87  0
                 root.setContextValue(UPDATE_EXECUTED_FLAG, Boolean.TRUE);
    +  88  
             }
    -  88  0
             super.analyzeDependencies();
    -  89  0
             if (root != null) {
    -  90  0
                 root.setContextValue(UPDATE_EXECUTED_FLAG, Boolean.TRUE);
    +  89  0
         }
    +  90   +
     
     91   -
             }
    -  92  0
         }
    +
         /**
    +  92   +
          * Runs the update steps of dependency-check.
     93   -
     
    +
          */
     94   -
         /**
    -  95   -
          * This constructor should not be called. Use Engine(MavenProject) instead.
    -  96   -
          *
    -  97   -
          * @throws DatabaseException thrown if there is an issue connecting to the
    +
         public void update() {
    +  95  0
             final MavenProject root = getExecutionRoot();
    +  96  0
             if (root != null && root.getContextValue(UPDATE_EXECUTED_FLAG) != null) {
    +  97  0
                 System.setProperty(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE.toString());
     98   -
          * database
    -  99   -
          */
    -  100  0
         private Engine() throws DatabaseException {
    -  101  0
         }
    +
             }
    +  99  0
             this.doUpdates();
    +  100  0
         }
    +  101   +
     
     102   -
     
    +
         /**
     103   -
         /**
    +
          * This constructor should not be called. Use Engine(MavenProject) instead.
     104   -
          * Initializes the given analyzer. This skips the initialization of the
    -  105   -
          * CPEAnalyzer if it has been initialized by a previous execution.
    -  106  
          *
    -  107   -
          * @param analyzer the analyzer to initialize
    -  108   -
          * @return the initialized analyzer
    +  105   +
          * @throws DatabaseException thrown if there is an issue connecting to the database
    +  106   +
          */
    +  107  0
         private Engine() throws DatabaseException {
    +  108  0
         }
     109   -
          */
    -  110   -
         @Override
    -  111   -
         protected Analyzer initializeAnalyzer(Analyzer analyzer) {
    -  112  0
             if ((analyzer instanceof CPEAnalyzer)) {
    -  113  0
                 CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer();
    -  114  0
                 if (cpe != null) {
    -  115  0
                     return cpe;
    -  116   -
                 }
    -  117  0
                 cpe = (CPEAnalyzer) super.initializeAnalyzer(analyzer);
    -  118  0
                 storeCPEAnalyzer(cpe);
    -  119   -
             }
    -  120  0
             return super.initializeAnalyzer(analyzer);
    -  121   -
         }
    -  122  
     
    -  123   +  110  
         /**
    -  124   -
          * Releases resources used by the analyzers by calling close() on each
    -  125   -
          * analyzer.
    -  126   +  111   +
          * Initializes the given analyzer. This skips the initialization of the CPEAnalyzer if it has been initialized by a previous
    +  112   +
          * execution.
    +  113   +
          *
    +  114   +
          * @param analyzer the analyzer to initialize
    +  115   +
          * @return the initialized analyzer
    +  116  
          */
    -  127   +  117  
         @Override
    -  128   -
         public void cleanup() {
    -  129  1
             super.cleanup();
    -  130  1
             if (currentProject == null || reactorProjects == null) {
    -  131  1
                 return;
    -  132   -
             }
    -  133  0
             if (this.currentProject == reactorProjects.get(reactorProjects.size() - 1)) {
    -  134  0
                 final CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer();
    -  135  0
                 if (cpe != null) {
    -  136  0
                     cpe.close();
    -  137   +  118   +
         protected Analyzer initializeAnalyzer(Analyzer analyzer) {
    +  119  0
             if ((analyzer instanceof CPEAnalyzer)) {
    +  120  0
                 CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer();
    +  121  0
                 if (cpe != null) {
    +  122  0
                     return cpe;
    +  123  
                 }
    +  124  0
                 cpe = (CPEAnalyzer) super.initializeAnalyzer(analyzer);
    +  125  0
                 storeCPEAnalyzer(cpe);
    +  126   +
             }
    +  127  0
             return super.initializeAnalyzer(analyzer);
    +  128   +
         }
    +  129   +
     
    +  130   +
         /**
    +  131   +
          * Releases resources used by the analyzers by calling close() on each analyzer.
    +  132   +
          */
    +  133   +
         @Override
    +  134   +
         public void cleanup() {
    +  135  1
             super.cleanup();
    +  136  1
             if (currentProject == null || reactorProjects == null) {
    +  137  1
                 return;
     138  
             }
    -  139  0
         }
    -  140   -
     
    -  141   -
         /**
    -  142   -
          * Closes the given analyzer. This skips closing the CPEAnalyzer.
    +  139  0
             if (this.currentProject == reactorProjects.get(reactorProjects.size() - 1)) {
    +  140  0
                 final CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer();
    +  141  0
                 if (cpe != null) {
    +  142  0
                     cpe.close();
     143   -
          *
    +
                 }
     144   -
          * @param analyzer the analyzer to close
    -  145   -
          */
    +
             }
    +  145  0
         }
     146   -
         @Override
    +
     
     147   -
         protected void closeAnalyzer(Analyzer analyzer) {
    -  148  0
             if ((analyzer instanceof CPEAnalyzer)) {
    -  149  0
                 if (getPreviouslyLoadedCPEAnalyzer() == null) {
    -  150  0
                     super.closeAnalyzer(analyzer);
    +
         /**
    +  148   +
          * Closes the given analyzer. This skips closing the CPEAnalyzer.
    +  149   +
          *
    +  150   +
          * @param analyzer the analyzer to close
     151   -
                 }
    +
          */
     152   -
             } else {
    -  153  0
                 super.closeAnalyzer(analyzer);
    -  154   -
             }
    -  155  0
         }
    -  156   -
     
    +
         @Override
    +  153   +
         protected void closeAnalyzer(Analyzer analyzer) {
    +  154  0
             if ((analyzer instanceof CPEAnalyzer)) {
    +  155  0
                 if (getPreviouslyLoadedCPEAnalyzer() == null) {
    +  156  0
                     super.closeAnalyzer(analyzer);
     157   -
         /**
    +
                 }
     158   -
          * Gets the CPEAnalyzer from the root Maven Project.
    -  159   -
          *
    +
             } else {
    +  159  0
                 super.closeAnalyzer(analyzer);
     160   -
          * @return an initialized CPEAnalyzer
    -  161   -
          */
    +
             }
    +  161  0
         }
     162   +
     
    +  163   +
         /**
    +  164   +
          * Gets the CPEAnalyzer from the root Maven Project.
    +  165   +
          *
    +  166   +
          * @return an initialized CPEAnalyzer
    +  167   +
          */
    +  168  
         private CPEAnalyzer getPreviouslyLoadedCPEAnalyzer() {
    -  163  0
             CPEAnalyzer cpe = null;
    -  164  0
             final MavenProject project = getExecutionRoot();
    -  165  0
             if (project != null) {
    -  166  0
                 final Object obj = project.getContextValue(CPE_ANALYZER_KEY);
    -  167  0
                 if (obj != null && obj instanceof CPEAnalyzer) {
    -  168  0
                     cpe = (CPEAnalyzer) project.getContextValue(CPE_ANALYZER_KEY);
    -  169   -
                 }
    -  170   -
             }
    -  171  0
             return cpe;
    -  172   -
         }
    -  173   -
     
    -  174   -
         /**
    +  169  0
             CPEAnalyzer cpe = null;
    +  170  0
             final MavenProject project = getExecutionRoot();
    +  171  0
             if (project != null) {
    +  172  0
                 final Object obj = project.getContextValue(CPE_ANALYZER_KEY);
    +  173  0
                 if (obj != null && obj instanceof CPEAnalyzer) {
    +  174  0
                     cpe = (CPEAnalyzer) project.getContextValue(CPE_ANALYZER_KEY);
     175   -
          * Stores a CPEAnalyzer in the root Maven Project.
    -  176   -
          *
    -  177   -
          * @param cpe the CPEAnalyzer to store
    -  178   -
          */
    -  179   -
         private void storeCPEAnalyzer(CPEAnalyzer cpe) {
    -  180  0
             final MavenProject p = getExecutionRoot();
    -  181  0
             if (p != null) {
    -  182  0
                 p.setContextValue(CPE_ANALYZER_KEY, cpe);
    -  183   -
             }
    -  184  0
         }
    -  185   -
     
    -  186   -
         /**
    -  187   -
          * Returns the root Maven Project.
    -  188   -
          *
    -  189   -
          * @return the root Maven Project
    -  190   -
          */
    -  191   -
         private MavenProject getExecutionRoot() {
    -  192  0
             if (reactorProjects == null) {
    -  193  0
                 return null;
    -  194   -
             }
    -  195  0
             for (MavenProject p : reactorProjects) {
    -  196  0
                 if (p.isExecutionRoot()) {
    -  197  0
                     return p;
    -  198  
                 }
    -  199  0
             }
    -  200   -
             //the following should  never run, but leaving it as a failsafe.
    -  201  0
             if (this.currentProject == null) {
    -  202  0
                 return null;
    -  203   +  176  
             }
    -  204  0
             MavenProject p = this.currentProject;
    -  205  0
             while (p.getParent() != null) {
    -  206  0
                 p = p.getParent();
    -  207   -
             }
    -  208  0
             return p;
    -  209   +  177  0
             return cpe;
    +  178  
         }
    -  210   +  179  
     
    -  211   +  180  
         /**
    -  212   -
          * Resets the file type analyzers so that they can be re-used to scan
    -  213   -
          * additional directories. Without the reset the analyzer might be disabled
    -  214   -
          * because the first scan/analyze did not identify any files that could be
    -  215   -
          * processed by the analyzer.
    -  216   +  181   +
          * Stores a CPEAnalyzer in the root Maven Project.
    +  182   +
          *
    +  183   +
          * @param cpe the CPEAnalyzer to store
    +  184  
          */
    +  185   +
         private void storeCPEAnalyzer(CPEAnalyzer cpe) {
    +  186  0
             final MavenProject p = getExecutionRoot();
    +  187  0
             if (p != null) {
    +  188  0
                 p.setContextValue(CPE_ANALYZER_KEY, cpe);
    +  189   +
             }
    +  190  0
         }
    +  191   +
     
    +  192   +
         /**
    +  193   +
          * Returns the root Maven Project.
    +  194   +
          *
    +  195   +
          * @return the root Maven Project
    +  196   +
          */
    +  197   +
         private MavenProject getExecutionRoot() {
    +  198  0
             if (reactorProjects == null) {
    +  199  0
                 return null;
    +  200   +
             }
    +  201  0
             for (MavenProject p : reactorProjects) {
    +  202  0
                 if (p.isExecutionRoot()) {
    +  203  0
                     return p;
    +  204   +
                 }
    +  205  0
             }
    +  206   +
             //the following should  never run, but leaving it as a failsafe.
    +  207  0
             if (this.currentProject == null) {
    +  208  0
                 return null;
    +  209   +
             }
    +  210  0
             MavenProject p = this.currentProject;
    +  211  0
             while (p.getParent() != null) {
    +  212  0
                 p = p.getParent();
    +  213   +
             }
    +  214  0
             return p;
    +  215   +
         }
    +  216   +
     
     217   +
         /**
    +  218   +
          * Resets the file type analyzers so that they can be re-used to scan additional directories. Without the reset the analyzer
    +  219   +
          * might be disabled because the first scan/analyze did not identify any files that could be processed by the analyzer.
    +  220   +
          */
    +  221  
         public void resetFileTypeAnalyzers() {
    -  218  0
             for (FileTypeAnalyzer a : getFileTypeAnalyzers()) {
    -  219  0
                 a.reset();
    -  220  0
             }
    -  221  0
         }
    -  222   +  222  0
             for (FileTypeAnalyzer a : getFileTypeAnalyzers()) {
    +  223  0
                 a.reset();
    +  224  0
             }
    +  225  0
         }
    +  226  
     }
    - + diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.HelpMojo.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.HelpMojo.html index d4abd9aae..75ae8fbb9 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.HelpMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.HelpMojo.html @@ -765,6 +765,6 @@
     }
    - + diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.UpdateMojo.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.UpdateMojo.html new file mode 100644 index 000000000..ba61e6b3e --- /dev/null +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.UpdateMojo.html @@ -0,0 +1,212 @@ + + + + +Coverage Report + + + + +
    Coverage Report - org.owasp.dependencycheck.maven.UpdateMojo
    +
     
    + + + + +
    Classes in this File Line Coverage Branch Coverage Complexity
    UpdateMojo
    0%
    0/14
    N/A
    1.5
    +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     1  
     /*
     2  
      * This file is part of dependency-check-maven.
     3  
      *
     4  
      * Licensed under the Apache License, Version 2.0 (the "License");
     5  
      * you may not use this file except in compliance with the License.
     6  
      * You may obtain a copy of the License at
     7  
      *
     8  
      *     http://www.apache.org/licenses/LICENSE-2.0
     9  
      *
     10  
      * Unless required by applicable law or agreed to in writing, software
     11  
      * distributed under the License is distributed on an "AS IS" BASIS,
     12  
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     13  
      * See the License for the specific language governing permissions and
     14  
      * limitations under the License.
     15  
      *
     16  
      * Copyright (c) 2013 Jeremy Long. All Rights Reserved.
     17  
      */
     18  
     package org.owasp.dependencycheck.maven;
     19  
     
     20  
     import java.util.Locale;
     21  
     import java.util.logging.Level;
     22  
     import java.util.logging.Logger;
     23  
     import org.apache.maven.artifact.Artifact;
     24  
     import org.apache.maven.plugin.MojoExecutionException;
     25  
     import org.apache.maven.plugin.MojoFailureException;
     26  
     import org.apache.maven.plugins.annotations.LifecyclePhase;
     27  
     import org.apache.maven.plugins.annotations.Mojo;
     28  
     import org.apache.maven.plugins.annotations.ResolutionScope;
     29  
     import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
     30  
     import org.owasp.dependencycheck.utils.Settings;
     31  
     
     32  
     /**
     33  
      * Maven Plugin that checks the project dependencies to see if they have any known published vulnerabilities.
     34  
      *
     35  
      * @author Jeremy Long
     36  
      */
     37  
     @Mojo(
     38  
             name = "update-only",
     39  
             defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
     40  
             threadSafe = true,
     41  
             requiresDependencyResolution = ResolutionScope.NONE,
     42  
             requiresOnline = true
     43  
     )
     44  0
     public class UpdateMojo extends BaseDependencyCheckMojo {
     45  
     
     46  
         /**
     47  
          * Logger field reference.
     48  
          */
     49  0
         private static final Logger LOGGER = Logger.getLogger(UpdateMojo.class.getName());
     50  
     
     51  
         /**
     52  
          * Returns false; this mojo cannot generate a report.
     53  
          *
     54  
          * @return <code>false</code>
     55  
          */
     56  
         @Override
     57  
         public boolean canGenerateReport() {
     58  0
             return false;
     59  
         }
     60  
     
     61  
         /**
     62  
          * Executes the dependency-check engine on the project's dependencies and generates the report.
     63  
          *
     64  
          * @throws MojoExecutionException thrown if there is an exception executing the goal
     65  
          * @throws MojoFailureException thrown if dependency-check is configured to fail the build
     66  
          */
     67  
         @Override
     68  
         public void runCheck() throws MojoExecutionException, MojoFailureException {
     69  
             final Engine engine;
     70  
             try {
     71  0
                 engine = initializeEngine();
     72  0
                 engine.update();
     73  0
             } catch (DatabaseException ex) {
     74  0
                 LOGGER.log(Level.FINE, "Database connection error", ex);
     75  0
                 throw new MojoExecutionException("An exception occured connecting to the local database. Please see the log file for more details.", ex);
     76  0
             }
     77  0
             engine.cleanup();
     78  0
             Settings.cleanup();
     79  0
         }
     80  
     
     81  
         /**
     82  
          * Returns the report name.
     83  
          *
     84  
          * @param locale the location
     85  
          * @return the report name
     86  
          */
     87  
         public String getName(Locale locale) {
     88  0
             return "dependency-check-update";
     89  
         }
     90  
     
     91  
         /**
     92  
          * Gets the description of the Dependency-Check report to be displayed in the Maven Generated Reports page.
     93  
          *
     94  
          * @param locale The Locale to get the description for
     95  
          * @return the description
     96  
          */
     97  
         public String getDescription(Locale locale) {
     98  0
             return "Updates the local cache of the NVD data from NIST.";
     99  
         }
     100  
     
     101  
     }
    + + + + diff --git a/dependency-check-maven/configuration.html b/dependency-check-maven/configuration.html index 8c5fb8aab..2debd9a59 100644 --- a/dependency-check-maven/configuration.html +++ b/dependency-check-maven/configuration.html @@ -1,13 +1,13 @@ - + dependency-check-maven - Goals @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@

    org.apache.maven:maven-plugin-api

    - + @@ -534,13 +537,16 @@ -
    Status No newer versions available.
     There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Id org.apache.maven
    Typejar
    +jar + +Newer versions +3.3.1 Next Minor

    org.apache.maven:maven-settings

    - + @@ -558,7 +564,10 @@ -
    Status No newer versions available.
     There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Id org.apache.maven
    Typejar
    +jar + +Newer versions +3.3.1 Next Minor

    org.apache.maven.plugin-testing:maven-plugin-testing-harness

    @@ -693,7 +702,7 @@ - + @@ -705,7 +714,7 @@ -
    jmockit
    Current Version1.15
    1.16
    Scope test
    jar
    Newer versions1.16-beta1 Next Incremental
    1.16-beta2 Latest Incremental
    +1.17-beta1 Next Incremental

    org.owasp:dependency-check-core

    @@ -720,7 +729,7 @@ - + @@ -744,7 +753,7 @@ - + diff --git a/dependency-check-maven/findbugs.html b/dependency-check-maven/findbugs.html index 8dc9f163a..b8eb27666 100644 --- a/dependency-check-maven/findbugs.html +++ b/dependency-check-maven/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-maven - FindBugs Bug Detector Report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ - +
    dependency-check-core
    Current Version1.2.9
    1.2.10
    Scope compile
    dependency-check-utils
    Current Version1.2.9
    1.2.10
    Scope compile
    Errors Missing Classes
    56 1 0 0
    @@ -279,7 +279,7 @@ The class name org.owasp.dependencycheck.maven.Engine shadows the simple name of the superclass org.owasp.dependencycheck.Engine BAD_PRACTICE NM_SAME_SIMPLE_NAME_AS_SUPERCLASS -40-221 +40-225 High diff --git a/dependency-check-maven/help-mojo.html b/dependency-check-maven/help-mojo.html index 2c3a6d93b..4e7f8d8b9 100644 --- a/dependency-check-maven/help-mojo.html +++ b/dependency-check-maven/help-mojo.html @@ -1,13 +1,13 @@ - + dependency-check-maven - dependency-check:help @@ -20,7 +20,7 @@ - + @@ -43,7 +43,7 @@
    diff --git a/dependency-check-maven/taglist.html b/dependency-check-maven/taglist.html index 1271fd612..622248127 100644 --- a/dependency-check-maven/taglist.html +++ b/dependency-check-maven/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-maven - Tag List report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +1020 + +org.owasp.dependencycheck.maven.BaseDependencyCheckMojoTest +Line + +get this to work under JDK 1.8 +66 diff --git a/dependency-check-maven/team-list.html b/dependency-check-maven/team-list.html index 94551a7b2..b60d8ddb1 100644 --- a/dependency-check-maven/team-list.html +++ b/dependency-check-maven/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-maven - Team list @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +https://www.owasp.org/ +developer

    Contributors

    The following additional people have contributed to this project through the way of suggestions, patches or documentation.

    - -
    + + + + + + + + + + + + + + + Fork me on GitHub + + + + + +
    + + + + + +
    +
    + +
    + + +
    + + + +
    +

    dependency-check:update-only

    + +

    Note:This goal should be used as a Maven report.

    + +

    Full name:

    + +

    org.owasp:dependency-check-maven:1.2.10:update-only

    + +

    Description:

    + +
    Maven Plugin that checks the project dependencies to see if they +have any known published vulnerabilities.
    + +

    Attributes:

    + +
      + +
    • Requires a Maven project to be executed.
    • + +
    • The goal is thread-safe and supports parallel builds.
    • + +
    • Binds by default to the lifecycle phase: generate-resources.
    • + +
    • Requires that Maven runs in online mode.
    • +
    + +
    +

    Required Parameters

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameTypeSinceDescription
    autoUpdateboolean-Sets whether auto-updating of the NVD CVE/CPE data is enabled. It +is not recommended that this be turned to false. Default is true.
    Default value is: true.
    User property is: autoupdate.
    dataFileNameString-Sets whether or not the external report format should be used.
    Default value is: dependency-check.ser.
    User property is: metaFileName.
    failBuildOnCVSSfloat-Specifies if the build should be failed if a CVSS score above a +specified level is identified. The default is 11 which means since +the CVSS scores are 0-10, by default the build will never fail.
    Default value is: 11.
    User property is: failBuildOnCVSS.
    formatString-The report format to be generated (HTML, XML, VULN, ALL). This +configuration option has no affect if using this within the Site +plug-in unless the externalReport is set to true. Default is HTML.
    Default value is: HTML.
    User property is: format.
    outputDirectoryFile-The output directory. This generally maps to "target".
    Default value is: ${project.build.directory}.
    reportOutputDirectoryFile-Specifies the destination directory for the generated +Dependency-Check report. This generally maps to "target/site".
    User property is: project.reporting.outputDirectory.
    +
    + +
    +

    Optional Parameters

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameTypeSinceDescription
    aggregateboolean-Deprecated. use the aggregate goal instead
    Default value is: false.
    User property is: aggregate.
    archiveAnalyzerEnabledboolean-Whether or not the Archive Analyzer is enabled.
    Default value is: true.
    User property is: archiveAnalyzerEnabled.
    assemblyAnalyzerEnabledboolean-Whether or not the .NET Assembly Analyzer is enabled.
    Default value is: true.
    User property is: assemblyAnalyzerEnabled.
    centralAnalyzerEnabledboolean-Whether or not the Central Analyzer is enabled.
    Default value is: true.
    User property is: centralAnalyzerEnabled.
    connectionStringString-The database connection string.
    User property is: connectionString.
    connectionTimeoutString-The Connection Timeout.
    User property is: connectionTimeout.
    cveUrl12BaseString-Base Data Mirror URL for CVE 1.2.
    User property is: cveUrl12Base.
    cveUrl12ModifiedString-Data Mirror URL for CVE 1.2.
    User property is: cveUrl12Modified.
    cveUrl20BaseString-Data Mirror URL for CVE 2.0.
    User property is: cveUrl20Base.
    cveUrl20ModifiedString-Data Mirror URL for CVE 2.0.
    User property is: cveUrl20Modified.
    dataDirectoryString-The data directory, hold DC SQL DB.
    User property is: dataDirectory.
    databaseDriverNameString-The database driver name. An example would be org.h2.Driver.
    User property is: databaseDriverName.
    databaseDriverPathString-The path to the database driver if it is not on the class path.
    User property is: databaseDriverPath.
    databasePasswordString-The password to use when connecting to the database.
    User property is: databasePassword.
    databaseUserString-The database user name.
    User property is: databaseUser.
    externalReportString-Deprecated. the internal report is no longer supported
    User property is: externalReport.
    jarAnalyzerEnabledboolean-Whether or not the Jar Analyzer is enabled.
    Default value is: true.
    User property is: jarAnalyzerEnabled.
    logFileString-The path to the verbose log.
    User property is: logFile.
    mavenSettingsSettings-The Maven settings.
    Default value is: ${settings}.
    User property is: mavenSettings.
    mavenSettingsProxyIdString-The maven settings proxy id.
    User property is: mavenSettingsProxyId.
    nexusAnalyzerEnabledboolean-Whether or not the Nexus Analyzer is enabled.
    Default value is: true.
    User property is: nexusAnalyzerEnabled.
    nexusUrlString-The URL of a Nexus Pro server.
    User property is: nexusUrl.
    nexusUsesProxyboolean-Whether or not the configured proxy is used to connect to Nexus.
    Default value is: true.
    User property is: nexusUsesProxy.
    nuspecAnalyzerEnabledboolean-Whether or not the .NET Nuspec Analyzer is enabled.
    Default value is: true.
    User property is: nuspecAnalyzerEnabled.
    pathToMonoString-The path to mono for .NET Assembly analysis on non-windows systems.
    User property is: pathToMono.
    proxyUrlString-Deprecated. Please use mavenSettings instead
    User property is: proxyUrl.
    showSummaryboolean-Flag indicating whether or not to show a summary in the output.
    Default value is: true.
    User property is: showSummary.
    skipProvidedScopeboolean-Skip Analysis for Provided Scope Dependencies.
    Default value is: false.
    User property is: skipProvidedScope.
    skipRuntimeScopeboolean-Skip Analysis for Runtime Scope Dependencies.
    Default value is: false.
    User property is: skipRuntimeScope.
    skipTestScopeboolean-Skip Analysis for Test Scope Dependencies.
    Default value is: true.
    User property is: skipTestScope.
    suppressionFileString-The path to the suppression file.
    User property is: suppressionFile.
    zipExtensionsString-A comma-separated list of file extensions to add to analysis next +to jar, zip, ....
    User property is: zipExtensions.
    +
    + +
    +

    Parameter Details

    + +

    aggregate:

    + +
    Deprecated. use the aggregate goal instead
    + +
    Generate aggregate reports in multi-module projects.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: aggregate
    • + +
    • Default: false
    • +

    +

    archiveAnalyzerEnabled:

    + +
    Whether or not the Archive Analyzer is enabled.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: archiveAnalyzerEnabled
    • + +
    • Default: true
    • +

    +

    assemblyAnalyzerEnabled:

    + +
    Whether or not the .NET Assembly Analyzer is enabled.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: assemblyAnalyzerEnabled
    • + +
    • Default: true
    • +

    +

    autoUpdate:

    + +
    Sets whether auto-updating of the NVD CVE/CPE data is enabled. It +is not recommended that this be turned to false. Default is true.
    + +
      + +
    • Type: boolean
    • + +
    • Required: Yes
    • + +
    • User Property: autoupdate
    • + +
    • Default: true
    • +

    +

    centralAnalyzerEnabled:

    + +
    Whether or not the Central Analyzer is enabled.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: centralAnalyzerEnabled
    • + +
    • Default: true
    • +

    +

    connectionString:

    + +
    The database connection string.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: connectionString
    • +

    +

    connectionTimeout:

    + +
    The Connection Timeout.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: connectionTimeout
    • +

    +

    cveUrl12Base:

    + +
    Base Data Mirror URL for CVE 1.2.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: cveUrl12Base
    • +

    +

    cveUrl12Modified:

    + +
    Data Mirror URL for CVE 1.2.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: cveUrl12Modified
    • +

    +

    cveUrl20Base:

    + +
    Data Mirror URL for CVE 2.0.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: cveUrl20Base
    • +

    +

    cveUrl20Modified:

    + +
    Data Mirror URL for CVE 2.0.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: cveUrl20Modified
    • +

    +

    dataDirectory:

    + +
    The data directory, hold DC SQL DB.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: dataDirectory
    • +

    +

    dataFileName:

    + +
    Sets whether or not the external report format should be used.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: Yes
    • + +
    • User Property: metaFileName
    • + +
    • Default: dependency-check.ser
    • +

    +

    databaseDriverName:

    + +
    The database driver name. An example would be org.h2.Driver.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: databaseDriverName
    • +

    +

    databaseDriverPath:

    + +
    The path to the database driver if it is not on the class path.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: databaseDriverPath
    • +

    +

    databasePassword:

    + +
    The password to use when connecting to the database.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: databasePassword
    • +

    +

    databaseUser:

    + +
    The database user name.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: databaseUser
    • +

    +

    externalReport:

    + +
    Deprecated. the internal report is no longer supported
    + +
    Sets whether or not the external report format should be used.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: externalReport
    • +

    +

    failBuildOnCVSS:

    + +
    Specifies if the build should be failed if a CVSS score above a +specified level is identified. The default is 11 which means since +the CVSS scores are 0-10, by default the build will never fail.
    + +
      + +
    • Type: float
    • + +
    • Required: Yes
    • + +
    • User Property: failBuildOnCVSS
    • + +
    • Default: 11
    • +

    +

    format:

    + +
    The report format to be generated (HTML, XML, VULN, ALL). This +configuration option has no affect if using this within the Site +plug-in unless the externalReport is set to true. Default is HTML.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: Yes
    • + +
    • User Property: format
    • + +
    • Default: HTML
    • +

    +

    jarAnalyzerEnabled:

    + +
    Whether or not the Jar Analyzer is enabled.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: jarAnalyzerEnabled
    • + +
    • Default: true
    • +

    +

    logFile:

    + +
    The path to the verbose log.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: logFile
    • +

    +

    mavenSettings:

    + +
    The Maven settings.
    + +
      + +
    • Type: org.apache.maven.settings.Settings
    • + +
    • Required: No
    • + +
    • User Property: mavenSettings
    • + +
    • Default: ${settings}
    • +

    +

    mavenSettingsProxyId:

    + +
    The maven settings proxy id.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: mavenSettingsProxyId
    • +

    +

    nexusAnalyzerEnabled:

    + +
    Whether or not the Nexus Analyzer is enabled.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: nexusAnalyzerEnabled
    • + +
    • Default: true
    • +

    +

    nexusUrl:

    + +
    The URL of a Nexus Pro server.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: nexusUrl
    • +

    +

    nexusUsesProxy:

    + +
    Whether or not the configured proxy is used to connect to Nexus.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: nexusUsesProxy
    • + +
    • Default: true
    • +

    +

    nuspecAnalyzerEnabled:

    + +
    Whether or not the .NET Nuspec Analyzer is enabled.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: nuspecAnalyzerEnabled
    • + +
    • Default: true
    • +

    +

    outputDirectory:

    + +
    The output directory. This generally maps to "target".
    + +
      + +
    • Type: java.io.File
    • + +
    • Required: Yes
    • + +
    • Default: ${project.build.directory}
    • +

    +

    pathToMono:

    + +
    The path to mono for .NET Assembly analysis on non-windows systems.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: pathToMono
    • +

    +

    proxyUrl:

    + +
    Deprecated. Please use mavenSettings instead
    + +
    The Proxy URL.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: proxyUrl
    • +

    +

    reportOutputDirectory:

    + +
    Specifies the destination directory for the generated +Dependency-Check report. This generally maps to "target/site".
    + +
      + +
    • Type: java.io.File
    • + +
    • Required: Yes
    • + +
    • User Property: project.reporting.outputDirectory
    • +

    +

    showSummary:

    + +
    Flag indicating whether or not to show a summary in the output.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: showSummary
    • + +
    • Default: true
    • +

    +

    skipProvidedScope:

    + +
    Skip Analysis for Provided Scope Dependencies.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: skipProvidedScope
    • + +
    • Default: false
    • +

    +

    skipRuntimeScope:

    + +
    Skip Analysis for Runtime Scope Dependencies.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: skipRuntimeScope
    • + +
    • Default: false
    • +

    +

    skipTestScope:

    + +
    Skip Analysis for Test Scope Dependencies.
    + +
      + +
    • Type: boolean
    • + +
    • Required: No
    • + +
    • User Property: skipTestScope
    • + +
    • Default: true
    • +

    +

    suppressionFile:

    + +
    The path to the suppression file.
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: suppressionFile
    • +

    +

    zipExtensions:

    + +
    A comma-separated list of file extensions to add to analysis next +to jar, zip, ....
    + +
      + +
    • Type: java.lang.String
    • + +
    • Required: No
    • + +
    • User Property: zipExtensions
    • +
    +
    +
    + + +
    +
    +
    + +
    + +
    +
    +
    +

    Copyright © 2013–2015 + OWASP. + All rights reserved. + +

    +
    + + + +
    +
    + + diff --git a/dependency-check-maven/usage.html b/dependency-check-maven/usage.html index 18b418ddb..a20e2a9a5 100644 --- a/dependency-check-maven/usage.html +++ b/dependency-check-maven/usage.html @@ -1,13 +1,13 @@ - + dependency-check-maven - Usage @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@
    +
    +

    Example 6:

    +

    Update the local cache of the NVD data from NIST without analyzing the dependencies.

    + +
    +
    <project>
    +    ...
    +    <build>
    +        ...
    +        <plugins>
    +            ...
    +            <plugin>
    +                <groupId>org.owasp</groupId>
    +                <artifactId>dependency-check-maven</artifactId>
    +                <version>1.2.10</version>
    +                <executions>
    +                    <execution>
    +                        <goals>
    +                            <goal>update-only</goal>
    +                        </goals>
    +                    </execution>
    +                </executions>
    +            </plugin>
    +            ...
    +        </plugins>
    +        ...
    +    </build>
    +    ...
    +</project>
     
    diff --git a/dependency-check-maven/xref-test/index.html b/dependency-check-maven/xref-test/index.html index ded03351c..224648264 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.2.9 Reference + Dependency-Check Maven Plugin 1.2.10 Reference diff --git a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.html b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.html index 53e3915c1..b6234a629 100644 --- a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.html +++ b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.html @@ -48,75 +48,90 @@ 40 41 /** 42 * -43 * @author Jeremy Long <jeremy.long@owasp.org> +43 * @author Jeremy Long 44 */ 45 public class BaseDependencyCheckMojoTest extends BaseTest { 46 47 /** -48 * Test of scanArtifacts method, of class BaseDependencyCheckMojo. -49 */ -50 @Test -51 public void testScanArtifacts() throws DatabaseException, InvalidSettingException { -52 MavenProject project = new MockUp<MavenProject>() { -53 @Mock -54 public Set<Artifact> getArtifacts() { -55 Set<Artifact> artifacts = new HashSet<Artifact>(); -56 Artifact a = new ArtifactStub(); -57 try { -58 File file = new File(Test.class.getProtectionDomain().getCodeSource().getLocation().toURI()); -59 a.setFile(file); -60 artifacts.add(a); -61 } catch (URISyntaxException ex) { -62 Logger.getLogger(BaseDependencyCheckMojoTest.class.getName()).log(Level.SEVERE, null, ex); -63 } -64 //File file = new File(this.getClass().getClassLoader().getResource("daytrader-ear-2.1.7.ear").getPath()); -65 -66 return artifacts; -67 } -68 -69 @Mock -70 public String getName() { -71 return "test-project"; -72 } -73 }.getMockInstance(); -74 -75 boolean autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE); -76 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); -77 Engine engine = new Engine(null, null); -78 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate); -79 -80 assertTrue(engine.getDependencies().isEmpty()); -81 BaseDependencyCheckMojoImpl instance = new BaseDependencyCheckMojoImpl(); -82 instance.scanArtifacts(project, engine); -83 assertFalse(engine.getDependencies().isEmpty()); -84 engine.cleanup(); -85 } -86 -87 public class BaseDependencyCheckMojoImpl extends BaseDependencyCheckMojo { -88 -89 @Override -90 public void runCheck() throws MojoExecutionException, MojoFailureException { -91 throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -92 } -93 -94 @Override -95 public String getName(Locale locale) { -96 return "test implementation"; -97 } -98 -99 @Override -100 public String getDescription(Locale locale) { -101 return "test implementation"; -102 } +48 * Checks if the test can be run. The test in this class fail, presumable due to jmockit, if the JDK is 1.8+. +49 * +50 * @return true if the JDK is below 1.8. +51 */ +52 public boolean canRun() { +53 String version = System.getProperty("java.version"); +54 int length = version.indexOf(".", version.indexOf(".") + 1); +55 version = version.substring(0, length); +56 +57 double v = Double.parseDouble(version); +58 return v < 1.8; +59 } +60 +61 /** +62 * Test of scanArtifacts method, of class BaseDependencyCheckMojo. +63 */ +64 @Test +65 public void testScanArtifacts() throws DatabaseException, InvalidSettingException { +66 //TODO get this to work under JDK 1.8 +67 if (canRun()) { +68 MavenProject project = new MockUp<MavenProject>() { +69 @Mock +70 public Set<Artifact> getArtifacts() { +71 Set<Artifact> artifacts = new HashSet<Artifact>(); +72 Artifact a = new ArtifactStub(); +73 try { +74 File file = new File(Test.class.getProtectionDomain().getCodeSource().getLocation().toURI()); +75 a.setFile(file); +76 artifacts.add(a); +77 } catch (URISyntaxException ex) { +78 Logger.getLogger(BaseDependencyCheckMojoTest.class.getName()).log(Level.SEVERE, null, ex); +79 } +80 //File file = new File(this.getClass().getClassLoader().getResource("daytrader-ear-2.1.7.ear").getPath()); +81 +82 return artifacts; +83 } +84 +85 @Mock +86 public String getName() { +87 return "test-project"; +88 } +89 }.getMockInstance(); +90 +91 boolean autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE); +92 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); +93 Engine engine = new Engine(null, null); +94 Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate); +95 +96 assertTrue(engine.getDependencies().isEmpty()); +97 BaseDependencyCheckMojoImpl instance = new BaseDependencyCheckMojoImpl(); +98 instance.scanArtifacts(project, engine); +99 assertFalse(engine.getDependencies().isEmpty()); +100 engine.cleanup(); +101 } +102 } 103 -104 @Override -105 public boolean canGenerateReport() { -106 throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -107 } -108 -109 } +104 public class BaseDependencyCheckMojoImpl extends BaseDependencyCheckMojo { +105 +106 @Override +107 public void runCheck() throws MojoExecutionException, MojoFailureException { +108 throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. +109 } 110 -111 } +111 @Override +112 public String getName(Locale locale) { +113 return "test implementation"; +114 } +115 +116 @Override +117 public String getDescription(Locale locale) { +118 return "test implementation"; +119 } +120 +121 @Override +122 public boolean canGenerateReport() { +123 throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. +124 } +125 } +126 }
    diff --git a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseTest.html b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseTest.html index bffbdbf98..02ce711a5 100644 --- a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseTest.html +++ b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/BaseTest.html @@ -32,7 +32,7 @@ 24 25 /** 26 * -27 * @author Jeremy Long <jeremy.long@owasp.org> +27 * @author Jeremy Long 28 */ 29 public class BaseTest { 30 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 c684cdd85..b50d77873 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.2.9 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.2.10 Reference Package org.owasp.dependencycheck.maven diff --git a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-summary.html b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-summary.html index 6b2f2f04e..54c041b94 100644 --- a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-summary.html +++ b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.2.9 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.2.10 Reference Package org.owasp.dependencycheck.maven diff --git a/dependency-check-maven/xref-test/overview-frame.html b/dependency-check-maven/xref-test/overview-frame.html index 092524fd3..4806a9b8f 100644 --- a/dependency-check-maven/xref-test/overview-frame.html +++ b/dependency-check-maven/xref-test/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.2.9 Reference + Dependency-Check Maven Plugin 1.2.10 Reference diff --git a/dependency-check-maven/xref-test/overview-summary.html b/dependency-check-maven/xref-test/overview-summary.html index e31c04df8..ea3f3a806 100644 --- a/dependency-check-maven/xref-test/overview-summary.html +++ b/dependency-check-maven/xref-test/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.2.9 Reference + Dependency-Check Maven Plugin 1.2.10 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check Maven Plugin 1.2.9 Reference

    +

    Dependency-Check Maven Plugin 1.2.10 Reference

    diff --git a/dependency-check-maven/xref/allclasses-frame.html b/dependency-check-maven/xref/allclasses-frame.html index f860e297d..04dad6c97 100644 --- a/dependency-check-maven/xref/allclasses-frame.html +++ b/dependency-check-maven/xref/allclasses-frame.html @@ -25,6 +25,9 @@
  • HelpMojo +
  • +
  • + UpdateMojo
  • diff --git a/dependency-check-maven/xref/index.html b/dependency-check-maven/xref/index.html index ded03351c..224648264 100644 --- a/dependency-check-maven/xref/index.html +++ b/dependency-check-maven/xref/index.html @@ -4,7 +4,7 @@ - Dependency-Check Maven Plugin 1.2.9 Reference + Dependency-Check Maven Plugin 1.2.10 Reference diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/AggregateMojo.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/AggregateMojo.html index a41043ba4..594258c62 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/AggregateMojo.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/AggregateMojo.html @@ -51,7 +51,7 @@ 43 * Maven Plugin that checks project dependencies and the dependencies of all child modules to see if they have any known published44 * vulnerabilities.45 * -46 * @author Jeremy Long <jeremy.long@owasp.org> +46 * @author Jeremy Long47 */48 @Mojo( 49 name = "aggregate", diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html index d33809aa5..e24a71a8f 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html @@ -69,7 +69,7 @@ 6162/**63 * -64 * @author Jeremy Long <jeremy.long@owasp.org> +64 * @author Jeremy Long65 */66publicabstractclassBaseDependencyCheckMojoextends AbstractMojo implements MavenReport { 67 @@ -389,7 +389,7 @@ 381 * @param sink the sink to write the report to382 * @param locale the locale to use when generating the report383 * @throws MavenReportException if a maven report exception occurs -384 * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale) instead. +384 * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead.385 */386 @Deprecated 387publicfinalvoid generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException { diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/CheckMojo.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/CheckMojo.html index a0560617e..c30123e2f 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/CheckMojo.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/CheckMojo.html @@ -40,7 +40,7 @@ 32/**33 * Maven Plugin that checks the project dependencies to see if they have any known published vulnerabilities.34 * -35 * @author Jeremy Long <jeremy.long@owasp.org> +35 * @author Jeremy Long36 */37 @Mojo( 38 name = "check", diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/Engine.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/Engine.html index 472a36f47..0fb22cb38 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/Engine.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/Engine.html @@ -35,10 +35,10 @@ 27import org.owasp.dependencycheck.utils.Settings; 2829/** -30 * A modified version of the core engine specifically designed to persist some -31 * data between multiple executions of a multi-module Maven project. +30 * A modified version of the core engine specifically designed to persist some data between multiple executions of a multi-module +31 * Maven project.32 * -33 * @author Jeremy Long <jeremy.long@owasp.org> +33 * @author Jeremy Long34 */35publicclassEngineextends org.owasp.dependencycheck.Engine { 36 @@ -59,175 +59,179 @@ 51 */52private List<MavenProject> reactorProjects; 53/** -54 * Key used in the MavenProject context values to note whether or not an -55 * update has been executed. -56 */ -57publicstaticfinal String UPDATE_EXECUTED_FLAG = "dependency-check-update-executed"; -58 -59/** -60 * Creates a new Engine to perform anyalsis on dependencies. -61 * -62 * @param project the current Maven project -63 * @param reactorProjects the reactor projects for the current Maven -64 * execution -65 * @throws DatabaseException thrown if there is an issue connecting to the -66 * database -67 */ -68publicEngine(MavenProject project, List<MavenProject> reactorProjects) throws DatabaseException { -69this.currentProject = project; -70this.reactorProjects = reactorProjects; -71 initializeEngine(); -72 } -73 -74/** -75 * Runs the analyzers against all of the dependencies. -76 */ -77 @Override -78publicvoid analyzeDependencies() { -79final MavenProject root = getExecutionRoot(); -80if (root != null) { -81 LOGGER.fine(String.format("Checking root project, %s, if updates have already been completed", root.getArtifactId())); -82 } else { -83 LOGGER.fine("Checking root project, null, if updates have already been completed"); +54 * Key used in the MavenProject context values to note whether or not an update has been executed. +55 */ +56publicstaticfinal String UPDATE_EXECUTED_FLAG = "dependency-check-update-executed"; +57 +58/** +59 * Creates a new Engine to perform anyalsis on dependencies. +60 * +61 * @param project the current Maven project +62 * @param reactorProjects the reactor projects for the current Maven execution +63 * @throws DatabaseException thrown if there is an issue connecting to the database +64 */ +65publicEngine(MavenProject project, List<MavenProject> reactorProjects) throws DatabaseException { +66this.currentProject = project; +67this.reactorProjects = reactorProjects; +68 initializeEngine(); +69 } +70 +71/** +72 * Runs the analyzers against all of the dependencies. +73 */ +74 @Override +75publicvoid analyzeDependencies() { +76final MavenProject root = getExecutionRoot(); +77if (root != null) { +78 LOGGER.fine(String.format("Checking root project, %s, if updates have already been completed", root.getArtifactId())); +79 } else { +80 LOGGER.fine("Checking root project, null, if updates have already been completed"); +81 } +82if (root != null && root.getContextValue(UPDATE_EXECUTED_FLAG) != null) { +83 System.setProperty(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE.toString()); 84 } -85if (root != null && root.getContextValue(UPDATE_EXECUTED_FLAG) != null) { -86 System.setProperty(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE.toString()); -87 } -88super.analyzeDependencies(); -89if (root != null) { -90 root.setContextValue(UPDATE_EXECUTED_FLAG, Boolean.TRUE); -91 } -92 } -93 -94/** -95 * This constructor should not be called. Use Engine(MavenProject) instead. -96 * -97 * @throws DatabaseException thrown if there is an issue connecting to the -98 * database -99 */ -100privateEngine() throws DatabaseException { -101 } -102 -103/** -104 * Initializes the given analyzer. This skips the initialization of the -105 * CPEAnalyzer if it has been initialized by a previous execution. -106 * -107 * @param analyzer the analyzer to initialize -108 * @return the initialized analyzer -109 */ -110 @Override -111protected Analyzer initializeAnalyzer(Analyzer analyzer) { -112if ((analyzer instanceof CPEAnalyzer)) { -113 CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer(); -114if (cpe != null) { -115return cpe; -116 } -117 cpe = (CPEAnalyzer) super.initializeAnalyzer(analyzer); -118 storeCPEAnalyzer(cpe); -119 } -120returnsuper.initializeAnalyzer(analyzer); -121 } -122 -123/** -124 * Releases resources used by the analyzers by calling close() on each -125 * analyzer. -126 */ -127 @Override -128publicvoid cleanup() { -129super.cleanup(); -130if (currentProject == null || reactorProjects == null) { -131return; -132 } -133if (this.currentProject == reactorProjects.get(reactorProjects.size() - 1)) { -134final CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer(); -135if (cpe != null) { -136 cpe.close(); -137 } +85super.analyzeDependencies(); +86if (root != null) { +87 root.setContextValue(UPDATE_EXECUTED_FLAG, Boolean.TRUE); +88 } +89 } +90 +91/** +92 * Runs the update steps of dependency-check. +93 */ +94publicvoid update() { +95final MavenProject root = getExecutionRoot(); +96if (root != null && root.getContextValue(UPDATE_EXECUTED_FLAG) != null) { +97 System.setProperty(Settings.KEYS.AUTO_UPDATE, Boolean.FALSE.toString()); +98 } +99this.doUpdates(); +100 } +101 +102/** +103 * This constructor should not be called. Use Engine(MavenProject) instead. +104 * +105 * @throws DatabaseException thrown if there is an issue connecting to the database +106 */ +107privateEngine() throws DatabaseException { +108 } +109 +110/** +111 * Initializes the given analyzer. This skips the initialization of the CPEAnalyzer if it has been initialized by a previous +112 * execution. +113 * +114 * @param analyzer the analyzer to initialize +115 * @return the initialized analyzer +116 */ +117 @Override +118protected Analyzer initializeAnalyzer(Analyzer analyzer) { +119if ((analyzer instanceof CPEAnalyzer)) { +120 CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer(); +121if (cpe != null) { +122return cpe; +123 } +124 cpe = (CPEAnalyzer) super.initializeAnalyzer(analyzer); +125 storeCPEAnalyzer(cpe); +126 } +127returnsuper.initializeAnalyzer(analyzer); +128 } +129 +130/** +131 * Releases resources used by the analyzers by calling close() on each analyzer. +132 */ +133 @Override +134publicvoid cleanup() { +135super.cleanup(); +136if (currentProject == null || reactorProjects == null) { +137return; 138 } -139 } -140 -141/** -142 * Closes the given analyzer. This skips closing the CPEAnalyzer. -143 * -144 * @param analyzer the analyzer to close -145 */ -146 @Override -147protectedvoid closeAnalyzer(Analyzer analyzer) { -148if ((analyzer instanceof CPEAnalyzer)) { -149if (getPreviouslyLoadedCPEAnalyzer() == null) { -150super.closeAnalyzer(analyzer); -151 } -152 } else { -153super.closeAnalyzer(analyzer); -154 } -155 } -156 -157/** -158 * Gets the CPEAnalyzer from the root Maven Project. -159 * -160 * @return an initialized CPEAnalyzer -161 */ -162private CPEAnalyzer getPreviouslyLoadedCPEAnalyzer() { -163 CPEAnalyzer cpe = null; -164final MavenProject project = getExecutionRoot(); -165if (project != null) { -166final Object obj = project.getContextValue(CPE_ANALYZER_KEY); -167if (obj != null && obj instanceof CPEAnalyzer) { -168 cpe = (CPEAnalyzer) project.getContextValue(CPE_ANALYZER_KEY); -169 } -170 } -171return cpe; -172 } -173 -174/** -175 * Stores a CPEAnalyzer in the root Maven Project. -176 * -177 * @param cpe the CPEAnalyzer to store -178 */ -179privatevoid storeCPEAnalyzer(CPEAnalyzer cpe) { -180final MavenProject p = getExecutionRoot(); -181if (p != null) { -182 p.setContextValue(CPE_ANALYZER_KEY, cpe); -183 } -184 } -185 -186/** -187 * Returns the root Maven Project. -188 * -189 * @return the root Maven Project -190 */ -191private MavenProject getExecutionRoot() { -192if (reactorProjects == null) { -193returnnull; -194 } -195for (MavenProject p : reactorProjects) { -196if (p.isExecutionRoot()) { -197return p; -198 } -199 } -200//the following should never run, but leaving it as a failsafe. -201if (this.currentProject == null) { -202returnnull; -203 } -204 MavenProject p = this.currentProject; -205while (p.getParent() != null) { -206 p = p.getParent(); -207 } -208return p; -209 } -210 -211/** -212 * Resets the file type analyzers so that they can be re-used to scan -213 * additional directories. Without the reset the analyzer might be disabled -214 * because the first scan/analyze did not identify any files that could be -215 * processed by the analyzer. -216 */ -217publicvoid resetFileTypeAnalyzers() { -218for (FileTypeAnalyzer a : getFileTypeAnalyzers()) { -219 a.reset(); -220 } -221 } -222 } +139if (this.currentProject == reactorProjects.get(reactorProjects.size() - 1)) { +140final CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer(); +141if (cpe != null) { +142 cpe.close(); +143 } +144 } +145 } +146 +147/** +148 * Closes the given analyzer. This skips closing the CPEAnalyzer. +149 * +150 * @param analyzer the analyzer to close +151 */ +152 @Override +153protectedvoid closeAnalyzer(Analyzer analyzer) { +154if ((analyzer instanceof CPEAnalyzer)) { +155if (getPreviouslyLoadedCPEAnalyzer() == null) { +156super.closeAnalyzer(analyzer); +157 } +158 } else { +159super.closeAnalyzer(analyzer); +160 } +161 } +162 +163/** +164 * Gets the CPEAnalyzer from the root Maven Project. +165 * +166 * @return an initialized CPEAnalyzer +167 */ +168private CPEAnalyzer getPreviouslyLoadedCPEAnalyzer() { +169 CPEAnalyzer cpe = null; +170final MavenProject project = getExecutionRoot(); +171if (project != null) { +172final Object obj = project.getContextValue(CPE_ANALYZER_KEY); +173if (obj != null && obj instanceof CPEAnalyzer) { +174 cpe = (CPEAnalyzer) project.getContextValue(CPE_ANALYZER_KEY); +175 } +176 } +177return cpe; +178 } +179 +180/** +181 * Stores a CPEAnalyzer in the root Maven Project. +182 * +183 * @param cpe the CPEAnalyzer to store +184 */ +185privatevoid storeCPEAnalyzer(CPEAnalyzer cpe) { +186final MavenProject p = getExecutionRoot(); +187if (p != null) { +188 p.setContextValue(CPE_ANALYZER_KEY, cpe); +189 } +190 } +191 +192/** +193 * Returns the root Maven Project. +194 * +195 * @return the root Maven Project +196 */ +197private MavenProject getExecutionRoot() { +198if (reactorProjects == null) { +199returnnull; +200 } +201for (MavenProject p : reactorProjects) { +202if (p.isExecutionRoot()) { +203return p; +204 } +205 } +206//the following should never run, but leaving it as a failsafe. +207if (this.currentProject == null) { +208returnnull; +209 } +210 MavenProject p = this.currentProject; +211while (p.getParent() != null) { +212 p = p.getParent(); +213 } +214return p; +215 } +216 +217/** +218 * Resets the file type analyzers so that they can be re-used to scan additional directories. Without the reset the analyzer +219 * might be disabled because the first scan/analyze did not identify any files that could be processed by the analyzer. +220 */ +221publicvoid resetFileTypeAnalyzers() { +222for (FileTypeAnalyzer a : getFileTypeAnalyzers()) { +223 a.reset(); +224 } +225 } +226 }
    diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/UpdateMojo.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/UpdateMojo.html new file mode 100644 index 000000000..77ef142f6 --- /dev/null +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/UpdateMojo.html @@ -0,0 +1,114 @@ + + + +UpdateMojo xref + + + +
    +1   /*
    +2    * This file is part of dependency-check-maven.
    +3    *
    +4    * Licensed under the Apache License, Version 2.0 (the "License");
    +5    * you may not use this file except in compliance with the License.
    +6    * You may obtain a copy of the License at
    +7    *
    +8    *     http://www.apache.org/licenses/LICENSE-2.0
    +9    *
    +10   * Unless required by applicable law or agreed to in writing, software
    +11   * distributed under the License is distributed on an "AS IS" BASIS,
    +12   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    +13   * See the License for the specific language governing permissions and
    +14   * limitations under the License.
    +15   *
    +16   * Copyright (c) 2013 Jeremy Long. All Rights Reserved.
    +17   */
    +18  package org.owasp.dependencycheck.maven;
    +19  
    +20  import java.util.Locale;
    +21  import java.util.logging.Level;
    +22  import java.util.logging.Logger;
    +23  import org.apache.maven.artifact.Artifact;
    +24  import org.apache.maven.plugin.MojoExecutionException;
    +25  import org.apache.maven.plugin.MojoFailureException;
    +26  import org.apache.maven.plugins.annotations.LifecyclePhase;
    +27  import org.apache.maven.plugins.annotations.Mojo;
    +28  import org.apache.maven.plugins.annotations.ResolutionScope;
    +29  import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
    +30  import org.owasp.dependencycheck.utils.Settings;
    +31  
    +32  /**
    +33   * Maven Plugin that checks the project dependencies to see if they have any known published vulnerabilities.
    +34   *
    +35   * @author Jeremy Long
    +36   */
    +37  @Mojo(
    +38          name = "update-only",
    +39          defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
    +40          threadSafe = true,
    +41          requiresDependencyResolution = ResolutionScope.NONE,
    +42          requiresOnline = true
    +43  )
    +44  public class UpdateMojo extends BaseDependencyCheckMojo {
    +45  
    +46      /**
    +47       * Logger field reference.
    +48       */
    +49      private static final Logger LOGGER = Logger.getLogger(UpdateMojo.class.getName());
    +50  
    +51      /**
    +52       * Returns false; this mojo cannot generate a report.
    +53       *
    +54       * @return <code>false</code>
    +55       */
    +56      @Override
    +57      public boolean canGenerateReport() {
    +58          return false;
    +59      }
    +60  
    +61      /**
    +62       * Executes the dependency-check engine on the project's dependencies and generates the report.
    +63       *
    +64       * @throws MojoExecutionException thrown if there is an exception executing the goal
    +65       * @throws MojoFailureException thrown if dependency-check is configured to fail the build
    +66       */
    +67      @Override
    +68      public void runCheck() throws MojoExecutionException, MojoFailureException {
    +69          final Engine engine;
    +70          try {
    +71              engine = initializeEngine();
    +72              engine.update();
    +73          } catch (DatabaseException ex) {
    +74              LOGGER.log(Level.FINE, "Database connection error", ex);
    +75              throw new MojoExecutionException("An exception occured connecting to the local database. Please see the log file for more details.", ex);
    +76          }
    +77          engine.cleanup();
    +78          Settings.cleanup();
    +79      }
    +80  
    +81      /**
    +82       * Returns the report name.
    +83       *
    +84       * @param locale the location
    +85       * @return the report name
    +86       */
    +87      public String getName(Locale locale) {
    +88          return "dependency-check-update";
    +89      }
    +90  
    +91      /**
    +92       * Gets the description of the Dependency-Check report to be displayed in the Maven Generated Reports page.
    +93       *
    +94       * @param locale The Locale to get the description for
    +95       * @return the description
    +96       */
    +97      public String getDescription(Locale locale) {
    +98          return "Updates the local cache of the NVD data from NIST.";
    +99      }
    +100 
    +101 }
    +
    +
    + + + 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 2923e87a5..db3204b2c 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.2.9 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.2.10 Reference Package org.owasp.dependencycheck.maven @@ -29,6 +29,9 @@
  • HelpMojo +
  • +
  • + UpdateMojo
  • diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-summary.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-summary.html index 8b207aaf3..92cd5619c 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-summary.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.2.9 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.2.10 Reference Package org.owasp.dependencycheck.maven @@ -59,6 +59,11 @@ + + +
    HelpMojo
    + UpdateMojo +
    diff --git a/dependency-check-maven/xref/overview-frame.html b/dependency-check-maven/xref/overview-frame.html index 092524fd3..4806a9b8f 100644 --- a/dependency-check-maven/xref/overview-frame.html +++ b/dependency-check-maven/xref/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.2.9 Reference + Dependency-Check Maven Plugin 1.2.10 Reference diff --git a/dependency-check-maven/xref/overview-summary.html b/dependency-check-maven/xref/overview-summary.html index e31c04df8..ea3f3a806 100644 --- a/dependency-check-maven/xref/overview-summary.html +++ b/dependency-check-maven/xref/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.2.9 Reference + Dependency-Check Maven Plugin 1.2.10 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check Maven Plugin 1.2.9 Reference

    +

    Dependency-Check Maven Plugin 1.2.10 Reference

    diff --git a/dependency-check-utils/apidocs/allclasses-frame.html b/dependency-check-utils/apidocs/allclasses-frame.html index 517e88792..17cbf1b28 100644 --- a/dependency-check-utils/apidocs/allclasses-frame.html +++ b/dependency-check-utils/apidocs/allclasses-frame.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Utils 1.2.9 API) - +All Classes (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/allclasses-noframe.html b/dependency-check-utils/apidocs/allclasses-noframe.html index 3cf9ff55f..f5eca9115 100644 --- a/dependency-check-utils/apidocs/allclasses-noframe.html +++ b/dependency-check-utils/apidocs/allclasses-noframe.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Utils 1.2.9 API) - +All Classes (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/constant-values.html b/dependency-check-utils/apidocs/constant-values.html index 85dfa5802..4d1313a03 100644 --- a/dependency-check-utils/apidocs/constant-values.html +++ b/dependency-check-utils/apidocs/constant-values.html @@ -2,16 +2,16 @@ - + -Constant Field Values (Dependency-Check Utils 1.2.9 API) - +Constant Field Values (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/deprecated-list.html b/dependency-check-utils/apidocs/deprecated-list.html index 8c4b744de..4c68466a2 100644 --- a/dependency-check-utils/apidocs/deprecated-list.html +++ b/dependency-check-utils/apidocs/deprecated-list.html @@ -2,16 +2,16 @@ - + -Deprecated List (Dependency-Check Utils 1.2.9 API) - +Deprecated List (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/help-doc.html b/dependency-check-utils/apidocs/help-doc.html index d3f539a73..ebdc5c734 100644 --- a/dependency-check-utils/apidocs/help-doc.html +++ b/dependency-check-utils/apidocs/help-doc.html @@ -2,16 +2,16 @@ - + -API Help (Dependency-Check Utils 1.2.9 API) - +API Help (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/index-all.html b/dependency-check-utils/apidocs/index-all.html index 8e953c718..3044b52ad 100644 --- a/dependency-check-utils/apidocs/index-all.html +++ b/dependency-check-utils/apidocs/index-all.html @@ -2,16 +2,16 @@ - + -Index (Dependency-Check Utils 1.2.9 API) - +Index (Dependency-Check Utils 1.2.10 API) + @@ -398,13 +398,13 @@
    CVE_MODIFIED_12_URL - Static variable in class org.owasp.dependencycheck.utils.Settings.KEYS
    -
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using - the 1.2 schema.
    +
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 1.2 + schema.
    CVE_MODIFIED_20_URL - Static variable in class org.owasp.dependencycheck.utils.Settings.KEYS
    -
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using - the 2.0 schema.
    +
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 2.0 + schema.
    CVE_MODIFIED_VALID_FOR_DAYS - Static variable in class org.owasp.dependencycheck.utils.Settings.KEYS
    @@ -888,8 +888,8 @@
    getDataDirectory() - Static method in class org.owasp.dependencycheck.utils.Settings
    -
    Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory - for the embedded H2 database.
    +
    Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the + embedded H2 database.
    getDataFile(String) - Static method in class org.owasp.dependencycheck.utils.Settings
    @@ -1667,75 +1667,35 @@
    org.owasp.dependencycheck.org.apache.tools.ant - package org.owasp.dependencycheck.org.apache.tools.ant
    -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.launch - package org.owasp.dependencycheck.org.apache.tools.ant.launch
    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.launch - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - package org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition
    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types - package org.owasp.dependencycheck.org.apache.tools.ant.types
    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources - package org.owasp.dependencycheck.org.apache.tools.ant.types.resources
    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - package org.owasp.dependencycheck.org.apache.tools.ant.types.selectors
    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.util - package org.owasp.dependencycheck.org.apache.tools.ant.util
    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.util - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.utils - package org.owasp.dependencycheck.utils
    -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    Os - Class in org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition
    diff --git a/dependency-check-utils/apidocs/index.html b/dependency-check-utils/apidocs/index.html index 24728ff81..f91defe6c 100644 --- a/dependency-check-utils/apidocs/index.html +++ b/dependency-check-utils/apidocs/index.html @@ -2,9 +2,9 @@ - + -Dependency-Check Utils 1.2.9 API +Dependency-Check Utils 1.2.10 API diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/DirectoryScanner.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/DirectoryScanner.html index 6d7511836..613d74f9e 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/DirectoryScanner.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/DirectoryScanner.html @@ -2,16 +2,16 @@ - + -DirectoryScanner (Dependency-Check Utils 1.2.9 API) - +DirectoryScanner (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/FileScanner.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/FileScanner.html index 6cd25d382..f3cebf4d7 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/FileScanner.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/FileScanner.html @@ -2,16 +2,16 @@ - + -FileScanner (Dependency-Check Utils 1.2.9 API) - +FileScanner (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/Location.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/Location.html index 46191bac2..368fdec99 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/Location.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/Location.html @@ -2,16 +2,16 @@ - + -Location (Dependency-Check Utils 1.2.9 API) - +Location (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/PathTokenizer.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/PathTokenizer.html index 6f1bde977..abd25fe74 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/PathTokenizer.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/PathTokenizer.html @@ -2,16 +2,16 @@ - + -PathTokenizer (Dependency-Check Utils 1.2.9 API) - +PathTokenizer (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/ProjectComponent.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/ProjectComponent.html index 720ece5ad..d7afcba5e 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/ProjectComponent.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/ProjectComponent.html @@ -2,16 +2,16 @@ - + -ProjectComponent (Dependency-Check Utils 1.2.9 API) - +ProjectComponent (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/BuildException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/BuildException.html index a9b4feeea..6c9b194cc 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/BuildException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/BuildException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.BuildException (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.BuildException (Dependency-Check Utils 1.2.10 API) + @@ -79,34 +79,19 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/DirectoryScanner.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/DirectoryScanner.html index 892e6548e..46e745440 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/DirectoryScanner.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/DirectoryScanner.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.DirectoryScanner (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.DirectoryScanner (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/FileScanner.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/FileScanner.html index 7806a13a6..30040629a 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/FileScanner.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/FileScanner.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.FileScanner (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.FileScanner (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/Location.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/Location.html index 25ddef2a0..d3435108c 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/Location.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/Location.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.Location (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.Location (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/PathTokenizer.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/PathTokenizer.html index 63837f62f..83ccd08ed 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/PathTokenizer.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/PathTokenizer.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.PathTokenizer (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.PathTokenizer (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/ProjectComponent.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/ProjectComponent.html index 6dd89123a..9f80c92ea 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/ProjectComponent.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/class-use/ProjectComponent.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.ProjectComponent (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.ProjectComponent (Dependency-Check Utils 1.2.10 API) + @@ -79,23 +79,13 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/Locator.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/Locator.html index baf7c8289..aa2cc0437 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/Locator.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/Locator.html @@ -2,16 +2,16 @@ - + -Locator (Dependency-Check Utils 1.2.9 API) - +Locator (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/class-use/Locator.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/class-use/Locator.html index 85176869b..97c4175fa 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/class-use/Locator.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/class-use/Locator.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.launch.Locator (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.launch.Locator (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-frame.html index 2da2f3db1..7cf2728e9 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.launch (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.launch (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-summary.html index cf32c37a6..3ff733d80 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.launch (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.launch (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant.launch

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.launch - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.

    See: Description

    @@ -100,17 +95,9 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant.launch Description

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.launch - - - This is a copy of classes within Apache Ant. The DirectoryScanner - is needed by dependency-check. However, we did not want to make - Ant a dependency. As such, a few files were copied and slightly - modified to remove any references to the Ant Project class. - -
    +
    This is a copy of classes within Apache Ant. The DirectoryScanner is needed by dependency-check. However, we did not want to + make Ant a dependency. As such, a few files were copied and slightly modified to remove any references to the Ant Project + class.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-tree.html index d2d44d6d0..14c1ca323 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.launch Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.launch Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-use.html index 47f5f3e7b..2a672d83f 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/launch/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.launch (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.launch (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-frame.html index 4420d0162..8c189578b 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-summary.html index 439dbeb97..5c002c047 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@ @@ -154,17 +149,9 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant Description

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant. The DirectoryScanner - is needed by dependency-check. However, we did not want to make - Ant a dependency. As such, a few files were copied and slightly - modified to remove any references to the Ant Project class. - -
    +
    This is a copy of classes within Apache Ant. The DirectoryScanner is needed by dependency-check. However, we did not want to + make Ant a dependency. As such, a few files were copied and slightly modified to remove any references to the Ant Project + class.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-tree.html index 952e5963a..9eee0bdb5 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-use.html index 5109f1924..1a7fec3da 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.org.apache.tools.ant (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.org.apache.tools.ant (Dependency-Check Utils 1.2.10 API) + @@ -79,56 +79,31 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Condition.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Condition.html index cc1d5fb28..132da4059 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Condition.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Condition.html @@ -2,16 +2,16 @@ - + -Condition (Dependency-Check Utils 1.2.9 API) - +Condition (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Os.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Os.html index 2ba0cf42b..d54dc3948 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Os.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/Os.html @@ -2,16 +2,16 @@ - + -Os (Dependency-Check Utils 1.2.9 API) - +Os (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Condition.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Condition.html index 900e8b022..7864d7326 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Condition.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Condition.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Condition (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Condition (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Os.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Os.html index 1df35efcf..b07152076 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Os.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/class-use/Os.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Os (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Os (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-frame.html index 393b6d9ad..4e6473791 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-summary.html index f64ad8a31..ec1b6fbc6 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@ @@ -116,17 +111,9 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition Description

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - - - This is a copy of classes within Apache Ant. The DirectoryScanner - is needed by dependency-check. However, we did not want to make - Ant a dependency. As such, a few files were copied and slightly - modified to remove any references to the Ant Project class. - -
    +
    This is a copy of classes within Apache Ant. The DirectoryScanner is needed by dependency-check. However, we did not want to + make Ant a dependency. As such, a few files were copied and slightly modified to remove any references to the Ant Project + class.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-tree.html index 466e4eee7..9e3657f9e 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-use.html index 8361763b7..ecef4298a 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/taskdefs/condition/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/DataType.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/DataType.html index 143bf1768..1ae0fda6b 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/DataType.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/DataType.html @@ -2,16 +2,16 @@ - + -DataType (Dependency-Check Utils 1.2.9 API) - +DataType (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Reference.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Reference.html index f47853f06..e10fccd68 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Reference.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Reference.html @@ -2,16 +2,16 @@ - + -Reference (Dependency-Check Utils 1.2.9 API) - +Reference (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Resource.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Resource.html index c84cb2feb..02af9c891 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Resource.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/Resource.html @@ -2,16 +2,16 @@ - + -Resource (Dependency-Check Utils 1.2.9 API) - +Resource (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceCollection.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceCollection.html index 4fc136e12..7d38383ae 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceCollection.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceCollection.html @@ -2,16 +2,16 @@ - + -ResourceCollection (Dependency-Check Utils 1.2.9 API) - +ResourceCollection (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceFactory.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceFactory.html index 300fd58e6..1af40f9a9 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceFactory.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/ResourceFactory.html @@ -2,16 +2,16 @@ - + -ResourceFactory (Dependency-Check Utils 1.2.9 API) - +ResourceFactory (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/DataType.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/DataType.html index a85d445c1..32ed33e40 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/DataType.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/DataType.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.DataType (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.DataType (Dependency-Check Utils 1.2.10 API) + @@ -79,23 +79,13 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Reference.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Reference.html index 2a5c41c9d..95abda208 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Reference.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Reference.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.Reference (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.Reference (Dependency-Check Utils 1.2.10 API) + @@ -79,23 +79,13 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Resource.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Resource.html index 02094db67..703683beb 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Resource.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/Resource.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.Resource (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.Resource (Dependency-Check Utils 1.2.10 API) + @@ -79,45 +79,25 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceCollection.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceCollection.html index 3fa268bf9..d7be06520 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceCollection.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceCollection.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceCollection (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceCollection (Dependency-Check Utils 1.2.10 API) + @@ -79,23 +79,13 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceFactory.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceFactory.html index 37c9da4d7..35c35a9d5 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceFactory.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/class-use/ResourceFactory.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceFactory (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceFactory (Dependency-Check Utils 1.2.10 API) + @@ -79,23 +79,13 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-frame.html index 589f66f3a..295a97c6e 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-summary.html index 9ed692964..422275374 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@ @@ -135,17 +130,9 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant.types Description

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant. The DirectoryScanner - is needed by dependency-check. However, we did not want to make - Ant a dependency. As such, a few files were copied and slightly - modified to remove any references to the Ant Project class. - -
    +
    This is a copy of classes within Apache Ant. The DirectoryScanner is needed by dependency-check. However, we did not want to + make Ant a dependency. As such, a few files were copied and slightly modified to remove any references to the Ant Project + class.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-tree.html index eafe54173..ee1ddc490 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-use.html index af94257fb..64d0311c1 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.types (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.types (Dependency-Check Utils 1.2.10 API) + @@ -79,45 +79,25 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Appendable.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Appendable.html index 1332ff942..72e2ce28c 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Appendable.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Appendable.html @@ -2,16 +2,16 @@ - + -Appendable (Dependency-Check Utils 1.2.9 API) - +Appendable (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileProvider.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileProvider.html index 467f97cfc..c73f8144b 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileProvider.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileProvider.html @@ -2,16 +2,16 @@ - + -FileProvider (Dependency-Check Utils 1.2.9 API) - +FileProvider (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileResource.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileResource.html index 3d5ae5c7f..f27594495 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileResource.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/FileResource.html @@ -2,16 +2,16 @@ - + -FileResource (Dependency-Check Utils 1.2.9 API) - +FileResource (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Touchable.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Touchable.html index 883eeb674..20b644920 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Touchable.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/Touchable.html @@ -2,16 +2,16 @@ - + -Touchable (Dependency-Check Utils 1.2.9 API) - +Touchable (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Appendable.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Appendable.html index 5cd39a509..1fe6dcf5b 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Appendable.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Appendable.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Appendable (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Appendable (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileProvider.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileProvider.html index b799f82c6..5c0fe57d6 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileProvider.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileProvider.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileProvider (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileProvider (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileResource.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileResource.html index 3219576cd..688746c06 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileResource.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/FileResource.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileResource (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileResource (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Touchable.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Touchable.html index b45012228..6e04efab3 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Touchable.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/class-use/Touchable.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Touchable (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Touchable (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-frame.html index 347ed2084..cc16c9409 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types.resources (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types.resources (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-summary.html index 9bf6849a3..1fd05e18e 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types.resources (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types.resources (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@ @@ -129,17 +124,9 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant.types.resources Description

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant. The DirectoryScanner - is needed by dependency-check. However, we did not want to make - Ant a dependency. As such, a few files were copied and slightly - modified to remove any references to the Ant Project class. - -
    +
    This is a copy of classes within Apache Ant. The DirectoryScanner is needed by dependency-check. However, we did not want to + make Ant a dependency. As such, a few files were copied and slightly modified to remove any references to the Ant Project + class.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-tree.html index 25243a517..7d4f92dce 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types.resources Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types.resources Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-use.html index a3c76fc86..1989f1581 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/resources/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.types.resources (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.types.resources (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/FileSelector.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/FileSelector.html index c4789adaa..e924febc9 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/FileSelector.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/FileSelector.html @@ -2,16 +2,16 @@ - + -FileSelector (Dependency-Check Utils 1.2.9 API) - +FileSelector (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorScanner.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorScanner.html index e452caf55..5bf03eb20 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorScanner.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorScanner.html @@ -2,16 +2,16 @@ - + -SelectorScanner (Dependency-Check Utils 1.2.9 API) - +SelectorScanner (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorUtils.html index 30879f1cc..338b00934 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/SelectorUtils.html @@ -2,16 +2,16 @@ - + -SelectorUtils (Dependency-Check Utils 1.2.9 API) - +SelectorUtils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPath.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPath.html index e9fc120f8..523106d27 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPath.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPath.html @@ -2,16 +2,16 @@ - + -TokenizedPath (Dependency-Check Utils 1.2.9 API) - +TokenizedPath (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPattern.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPattern.html index 1b0aa1744..383815427 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPattern.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/TokenizedPattern.html @@ -2,16 +2,16 @@ - + -TokenizedPattern (Dependency-Check Utils 1.2.9 API) - +TokenizedPattern (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/FileSelector.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/FileSelector.html index 552b71810..d15ce055b 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/FileSelector.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/FileSelector.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.FileSelector (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.FileSelector (Dependency-Check Utils 1.2.10 API) + @@ -79,23 +79,13 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorScanner.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorScanner.html index a477cd391..729d7d41a 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorScanner.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorScanner.html @@ -2,16 +2,16 @@ - + -Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorScanner (Dependency-Check Utils 1.2.9 API) - +Uses of Interface org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorScanner (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorUtils.html index aef5d7659..68293e165 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/SelectorUtils.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorUtils (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorUtils (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPath.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPath.html index b6476a887..acfb3f633 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPath.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPath.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPath (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPath (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPattern.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPattern.html index 3d8589ff8..b2a43b80f 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPattern.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/class-use/TokenizedPattern.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPattern (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPattern (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-frame.html index cbb44603d..eeab263d2 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types.selectors (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types.selectors (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-summary.html index 8698097ba..d317bde13 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types.selectors (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types.selectors (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@ @@ -135,17 +130,9 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant.types.selectors Description

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant. The DirectoryScanner - is needed by dependency-check. However, we did not want to make - Ant a dependency. As such, a few files were copied and slightly - modified to remove any references to the Ant Project class. - -
    +
    This is a copy of classes within Apache Ant. The DirectoryScanner is needed by dependency-check. However, we did not want to + make Ant a dependency. As such, a few files were copied and slightly modified to remove any references to the Ant Project + class.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-tree.html index 7c8de1680..4205cd855 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.types.selectors Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.types.selectors Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-use.html index 58c91fc48..5ac0661ca 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/types/selectors/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.types.selectors (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.types.selectors (Dependency-Check Utils 1.2.10 API) + @@ -79,23 +79,13 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.EmptyEnumeration.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.EmptyEnumeration.html index da0e58862..1ef9efb22 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.EmptyEnumeration.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.EmptyEnumeration.html @@ -2,16 +2,16 @@ - + -CollectionUtils.EmptyEnumeration (Dependency-Check Utils 1.2.9 API) - +CollectionUtils.EmptyEnumeration (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.html index ac5a70972..eeb33ea33 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/CollectionUtils.html @@ -2,16 +2,16 @@ - + -CollectionUtils (Dependency-Check Utils 1.2.9 API) - +CollectionUtils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/FileUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/FileUtils.html index 98d8c2a19..c706633e6 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/FileUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/FileUtils.html @@ -2,16 +2,16 @@ - + -FileUtils (Dependency-Check Utils 1.2.9 API) - +FileUtils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/SymbolicLinkUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/SymbolicLinkUtils.html index 40f0f37fa..b6ec82d5f 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/SymbolicLinkUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/SymbolicLinkUtils.html @@ -2,16 +2,16 @@ - + -SymbolicLinkUtils (Dependency-Check Utils 1.2.9 API) - +SymbolicLinkUtils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/VectorSet.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/VectorSet.html index 2fb271844..279748923 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/VectorSet.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/VectorSet.html @@ -2,16 +2,16 @@ - + -VectorSet (Dependency-Check Utils 1.2.9 API) - +VectorSet (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.EmptyEnumeration.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.EmptyEnumeration.html index 4b30315b7..1975913ce 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.EmptyEnumeration.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.EmptyEnumeration.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils.EmptyEnumeration (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils.EmptyEnumeration (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.html index 9e7c4e832..96a9a0301 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/CollectionUtils.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/FileUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/FileUtils.html index 406db2972..c87b6b017 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/FileUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/FileUtils.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.FileUtils (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.FileUtils (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/SymbolicLinkUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/SymbolicLinkUtils.html index 76659e64b..a4eafd00f 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/SymbolicLinkUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/SymbolicLinkUtils.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.SymbolicLinkUtils (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.SymbolicLinkUtils (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/VectorSet.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/VectorSet.html index 295d41558..a7d8b72fd 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/VectorSet.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/class-use/VectorSet.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.VectorSet (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.org.apache.tools.ant.util.VectorSet (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-frame.html index b7128d3f7..9be59ddf1 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.util (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.util (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-summary.html index 70b9555cd..e9738b002 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.util (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.util (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@ @@ -127,17 +122,9 @@

    Package org.owasp.dependencycheck.org.apache.tools.ant.util Description

    -
    - - org.owasp.dependencycheck.org.apache.tools.ant.util - - - This is a copy of classes within Apache Ant. The DirectoryScanner - is needed by dependency-check. However, we did not want to make - Ant a dependency. As such, a few files were copied and slightly - modified to remove any references to the Ant Project class. - -
    +
    This is a copy of classes within Apache Ant. The DirectoryScanner is needed by dependency-check. However, we did not want to + make Ant a dependency. As such, a few files were copied and slightly modified to remove any references to the Ant Project + class.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-tree.html index bdebb3632..916c5a282 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.org.apache.tools.ant.util Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.org.apache.tools.ant.util Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-use.html index b88cd34f0..8f4a8036a 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/org/apache/tools/ant/util/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.util (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.org.apache.tools.ant.util (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Checksum.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Checksum.html index 19295a7c7..07288256b 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Checksum.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Checksum.html @@ -2,16 +2,16 @@ - + -Checksum (Dependency-Check Utils 1.2.9 API) - +Checksum (Dependency-Check Utils 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    Includes methods to generate the MD5 and SHA1 checksum.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html index fcedcce19..5aa1b55ad 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/DownloadFailedException.html @@ -2,16 +2,16 @@ - + -DownloadFailedException (Dependency-Check Utils 1.2.9 API) - +DownloadFailedException (Dependency-Check Utils 1.2.10 API) + @@ -120,7 +120,7 @@ extends IOException
    An exception used when a download fails.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Downloader.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Downloader.html index f7a6bab05..1da0d3c67 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Downloader.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Downloader.html @@ -2,16 +2,16 @@ - + -Downloader (Dependency-Check Utils 1.2.9 API) - +Downloader (Dependency-Check Utils 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    A utility to download files from the Internet.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html index d789520ab..425bd6deb 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/ExtractionException.html @@ -2,16 +2,16 @@ - + -ExtractionException (Dependency-Check Utils 1.2.9 API) - +ExtractionException (Dependency-Check Utils 1.2.10 API) + @@ -120,7 +120,7 @@ extends IOException
    An exception used when a file is unable to be un-zipped.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/FileUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/FileUtils.html index e8baa2a49..10093e395 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/FileUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/FileUtils.html @@ -2,16 +2,16 @@ - + -FileUtils (Dependency-Check Utils 1.2.9 API) - +FileUtils (Dependency-Check Utils 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    A collection of utilities for processing information about files.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html index 0b9fbae96..6617b1abd 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/InvalidSettingException.html @@ -2,16 +2,16 @@ - + -InvalidSettingException (Dependency-Check Utils 1.2.9 API) - +InvalidSettingException (Dependency-Check Utils 1.2.10 API) + @@ -120,7 +120,7 @@ extends IOException
    An exception used when an error occurs reading a setting.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogFilter.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogFilter.html index f598435e5..64a3f8fb2 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogFilter.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogFilter.html @@ -2,16 +2,16 @@ - + -LogFilter (Dependency-Check Utils 1.2.9 API) - +LogFilter (Dependency-Check Utils 1.2.10 API) + @@ -107,7 +107,7 @@ implements A simple log filter to limit the entries written to the verbose log file. The verbose log file uses the root logger as I couldn't get anything else to work; as such, this filter limits the log entries to specific classes.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogUtils.html index 9ba2fcd5e..9c01bf1da 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/LogUtils.html @@ -2,16 +2,16 @@ - + -LogUtils (Dependency-Check Utils 1.2.9 API) - +LogUtils (Dependency-Check Utils 1.2.10 API) + @@ -101,7 +101,7 @@ extends
    Object
    A utility class to aide in the setup of the logging mechanism.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html index 08beca9ca..daead328c 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.KEYS.html @@ -2,16 +2,16 @@ - + -Settings.KEYS (Dependency-Check Utils 1.2.9 API) - +Settings.KEYS (Dependency-Check Utils 1.2.10 API) + @@ -227,15 +227,15 @@ extends @@ -594,8 +594,8 @@ extends

    CVE_MODIFIED_20_URL

    public static final String CVE_MODIFIED_20_URL
    -
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using - the 2.0 schema.
    +
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 2.0 + schema.
    See Also:
    Constant Field Values
    @@ -606,8 +606,8 @@ extends

    CVE_MODIFIED_12_URL

    public static final String CVE_MODIFIED_12_URL
    -
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using - the 1.2 schema.
    +
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 1.2 + schema.
    See Also:
    Constant Field Values
    @@ -629,8 +629,8 @@ extends

    CVE_START_YEAR

    public static final String CVE_START_YEAR
    -
    The properties key for the telling us how many cve.url.* URLs exists. This is used in combination with - CVE_BASE_URL to be able to retrieve the URLs for all of the files that make up the NVD CVE listing.
    +
    The properties key for the telling us how many cve.url.* URLs exists. This is used in combination with CVE_BASE_URL to + be able to retrieve the URLs for all of the files that make up the NVD CVE listing.
    See Also:
    Constant Field Values
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.html index 3f92dcd9f..50c531fc1 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/Settings.html @@ -2,16 +2,16 @@ - + -Settings (Dependency-Check Utils 1.2.9 API) - +Settings (Dependency-Check Utils 1.2.10 API) + @@ -101,7 +101,7 @@ extends Object
    A simple settings container that wraps the dependencycheck.properties file.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    @@ -177,8 +177,8 @@ extends @@ -322,8 +322,8 @@ 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.
    +
    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.
    @@ -333,8 +333,8 @@ extends

    initialize

    public static void initialize(String propertiesFilePath)
    -
    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.
    +
    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.
    Parameters:
    propertiesFilePath - the path to the base properties file to load
    @@ -414,8 +414,8 @@ extends File filePath) throws FileNotFoundException, IOException -
    Merges a new properties file into the current properties. This method allows for the loading of a user provided - properties file.

    +
    Merges a new properties file into the current properties. This method allows for the loading of a user provided properties + file.

    Note: even if using this method - system properties will be loaded before properties loaded from files.
    Parameters:
    filePath - the path to the properties file to merge.
    Throws:
    @@ -432,8 +432,8 @@ extends String filePath) throws FileNotFoundException, IOException -
    Merges a new properties file into the current properties. This method allows for the loading of a user provided - properties file.

    +
    Merges a new properties file into the current properties. This method allows for the loading of a user provided properties + file.

    Note: even if using this method - system properties will be loaded before properties loaded from files.
    Parameters:
    filePath - the path to the properties file to merge.
    Throws:
    @@ -449,8 +449,8 @@ extends InputStream stream) throws IOException -
    Merges a new properties file into the current properties. This method allows for the loading of a user provided - properties file.

    +
    Merges a new properties file into the current properties. This method allows for the loading of a user provided properties + file.

    Note: even if using this method - system properties will be loaded before properties loaded from files.
    Parameters:
    stream - an Input Stream pointing at a properties file to merge
    Throws:
    @@ -464,9 +464,9 @@ extends

    getFile

    public static File getFile(String key)
    -
    Returns a value from the properties file as a File object. If the value was specified as a system property or - passed in via the -Dprop=value argument - this method will return the value from the system properties before the - values in the contained configuration file.
    +
    Returns a value from the properties file as a File object. If the value was specified as a system property or passed in via + the -Dprop=value argument - this method will return the value from the system properties before the values in the contained + configuration file.
    Parameters:
    key - the key to lookup within the properties file
    Returns:
    the property from the properties file converted to a File object
    @@ -478,13 +478,13 @@ extends

    getDataFile

    protected static File getDataFile(String key)
    -
    Returns a value from the properties file as a File object. If the value was specified as a system property or - passed in via the -Dprop=value argument - this method will return the value from the system properties before the - values in the contained configuration file. +
    Returns a value from the properties file as a File object. If the value was specified as a system property or passed in via + the -Dprop=value argument - this method will return the value from the system properties before the values in the contained + configuration file. - This method will check the configured base directory and will use this as the base of the file path. - Additionally, if the base directory begins with a leading "[JAR]\" sequence with the path to the folder - containing the JAR file containing this class.
    + This method will check the configured base directory and will use this as the base of the file path. Additionally, if the + base directory begins with a leading "[JAR]\" sequence with the path to the folder containing the JAR file containing this + class.
    Parameters:
    key - the key to lookup within the properties file
    Returns:
    the property from the properties file converted to a File object
    @@ -497,9 +497,9 @@ extends String getString(String key, String defaultValue) -
    Returns a value from the properties file. If the value was specified as a system property or passed in via the - -Dprop=value argument - this method will return the value from the system properties before the values in the - contained configuration file.
    +
    Returns a value from the properties file. If the value was specified as a system property or passed in via the -Dprop=value + argument - this method will return the value from the system properties before the values in the contained configuration + file.
    Parameters:
    key - the key to lookup within the properties file
    defaultValue - the default value for the requested property
    Returns:
    the property from the properties file
    @@ -525,9 +525,9 @@ extends

    getString

    public static String getString(String key)
    -
    Returns a value from the properties file. If the value was specified as a system property or passed in via the - -Dprop=value argument - this method will return the value from the system properties before the values in the - contained configuration file.
    +
    Returns a value from the properties file. If the value was specified as a system property or passed in via the -Dprop=value + argument - this method will return the value from the system properties before the values in the contained configuration + file.
    Parameters:
    key - the key to lookup within the properties file
    Returns:
    the property from the properties file
    @@ -551,9 +551,9 @@ extends String key) throws InvalidSettingException -
    Returns an int value from the properties file. If the value was specified as a system property or passed in via - the -Dprop=value argument - this method will return the value from the system properties before the values in the - contained configuration file.
    +
    Returns an int value from the properties file. If the value was specified as a system property or passed in via the + -Dprop=value argument - this method will return the value from the system properties before the values in the contained + configuration file.
    Parameters:
    key - the key to lookup within the properties file
    Returns:
    the property from the properties file
    Throws:
    @@ -568,12 +568,12 @@ extends String key, int defaultValue) -
    Returns an int value from the properties file. If the value was specified as a system property or passed in via - the -Dprop=value argument - this method will return the value from the system properties before the values in the - contained configuration file.
    +
    Returns an int value from the properties file. If the value was specified as a system property or passed in via the + -Dprop=value argument - this method will return the value from the system properties before the values in the contained + configuration file.
    Parameters:
    key - the key to lookup within the properties file
    defaultValue - the default value to return
    -
    Returns:
    the property from the properties file or the defaultValue if the property does not exist or cannot be - converted to an integer
    +
    Returns:
    the property from the properties file or the defaultValue if the property does not exist or cannot be converted to + an integer
    @@ -584,9 +584,9 @@ extends String key) throws InvalidSettingException -
    Returns a long value from the properties file. If the value was specified as a system property or passed in via - the -Dprop=value argument - this method will return the value from the system properties before the values in the - contained configuration file.
    +
    Returns a long value from the properties file. If the value was specified as a system property or passed in via the + -Dprop=value argument - this method will return the value from the system properties before the values in the contained + configuration file.
    Parameters:
    key - the key to lookup within the properties file
    Returns:
    the property from the properties file
    Throws:
    @@ -601,9 +601,9 @@ extends String key) throws InvalidSettingException -
    Returns a boolean value from the properties file. If the value was specified as a system property or passed in - via the -Dprop=value argument this method will return the value from the system properties before - the values in the contained configuration file.
    +
    Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the + -Dprop=value argument this method will return the value from the system properties before the values in the + contained configuration file.
    Parameters:
    key - the key to lookup within the properties file
    Returns:
    the property from the properties file
    Throws:
    @@ -619,9 +619,9 @@ extends String key, boolean defaultValue) throws InvalidSettingException -
    Returns a boolean value from the properties file. If the value was specified as a system property or passed in - via the -Dprop=value argument this method will return the value from the system properties before - the values in the contained configuration file.
    +
    Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the + -Dprop=value argument this method will return the value from the system properties before the values in the + contained configuration file.
    Parameters:
    key - the key to lookup within the properties file
    defaultValue - the default value to return if the setting does not exist
    Returns:
    the property from the properties file
    Throws:
    @@ -639,9 +639,9 @@ extends String dbVersionKey) throws IOException, InvalidSettingException -
    Returns a connection string from the configured properties. If the connection string contains a %s, this method - will determine the 'data' directory and replace the %s with the path to the data directory. If the data directory - does not exists it will be created.
    +
    Returns a connection string from the configured properties. If the connection string contains a %s, this method will + determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not + exists it will be created.
    Parameters:
    connectionStringKey - the property file key for the connection string
    dbFileNameKey - the settings key for the db filename
    dbVersionKey - the settings key for the dbVersion
    Returns:
    the connection string
    Throws:
    @@ -657,8 +657,8 @@ extends File getDataDirectory() throws IOException -
    Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory - for the embedded H2 database. This is public solely for some unit tests; otherwise this should be private.
    +
    Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the + embedded H2 database. This is public solely for some unit tests; otherwise this should be private.
    Returns:
    the data directory to store data files
    Throws:
    IOException - is thrown if an IOException occurs of course...
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html index eb04be278..54f885c30 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFactory.html @@ -2,16 +2,16 @@ - + -URLConnectionFactory (Dependency-Check Utils 1.2.9 API) - +URLConnectionFactory (Dependency-Check Utils 1.2.10 API) + @@ -102,7 +102,7 @@ extends A URLConnection Factory to create new connections. This encapsulates several configuration checks to ensure that the connection uses the correct proxy settings.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFailureException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFailureException.html index 60e75be3d..da90a0ddd 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFailureException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/URLConnectionFailureException.html @@ -2,16 +2,16 @@ - + -URLConnectionFailureException (Dependency-Check Utils 1.2.9 API) - +URLConnectionFailureException (Dependency-Check Utils 1.2.10 API) + @@ -120,7 +120,7 @@ extends IOException
    An exception used when the creation of an URLConnection fails.
    Author:
    -
    Jeremy Long
    +
    Jeremy Long
    See Also:
    Serialized Form
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Checksum.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Checksum.html index 407d8b1d8..c93abe8c9 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Checksum.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Checksum.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.Checksum (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.Checksum (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/DownloadFailedException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/DownloadFailedException.html index fcc0e9f70..05702db46 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/DownloadFailedException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/DownloadFailedException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.DownloadFailedException (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.DownloadFailedException (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html index 8f167c58b..1bae690e3 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.Downloader (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.Downloader (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/ExtractionException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/ExtractionException.html index 9fbccc53c..287571d75 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/ExtractionException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/ExtractionException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.ExtractionException (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.ExtractionException (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/FileUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/FileUtils.html index 24390f2ee..72cfd3eac 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/FileUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/FileUtils.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.FileUtils (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.FileUtils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/InvalidSettingException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/InvalidSettingException.html index 87d93081b..fff2d074f 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/InvalidSettingException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/InvalidSettingException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.InvalidSettingException (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.InvalidSettingException (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogFilter.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogFilter.html index 334a10fc7..31b952c80 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogFilter.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogFilter.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.LogFilter (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.LogFilter (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogUtils.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogUtils.html index 10e76c1fb..80b29e8af 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogUtils.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/LogUtils.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.LogUtils (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.LogUtils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.KEYS.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.KEYS.html index 5357fe1d6..7d8e5db7f 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.KEYS.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.KEYS.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.Settings.KEYS (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.Settings.KEYS (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.html index 34323a792..bddce2fe8 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/Settings.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.Settings (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.Settings (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html index 5c5d5e0dd..97346b21e 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFactory.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.URLConnectionFactory (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.URLConnectionFactory (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFailureException.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFailureException.html index 6183dee1f..8b30f0b3f 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFailureException.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/class-use/URLConnectionFailureException.html @@ -2,16 +2,16 @@ - + -Uses of Class org.owasp.dependencycheck.utils.URLConnectionFailureException (Dependency-Check Utils 1.2.9 API) - +Uses of Class org.owasp.dependencycheck.utils.URLConnectionFailureException (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@ diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-frame.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-frame.html index 16a5fb870..853e7bc17 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-frame.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-frame.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.utils (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.utils (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-summary.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-summary.html index 53dcbbe7f..4d0aa6c9b 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-summary.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-summary.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.utils (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.utils (Dependency-Check Utils 1.2.10 API) + @@ -66,12 +66,7 @@

    Package org.owasp.dependencycheck.utils

    -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.

    See: Description

    @@ -176,14 +171,7 @@

    Package org.owasp.dependencycheck.utils Description

    -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc. - -
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-tree.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-tree.html index 693a448e2..c1d63098d 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-tree.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-tree.html @@ -2,16 +2,16 @@ - + -org.owasp.dependencycheck.utils Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +org.owasp.dependencycheck.utils Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-use.html b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-use.html index 3a0c6e873..609e9b1a7 100644 --- a/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-use.html +++ b/dependency-check-utils/apidocs/org/owasp/dependencycheck/utils/package-use.html @@ -2,16 +2,16 @@ - + -Uses of Package org.owasp.dependencycheck.utils (Dependency-Check Utils 1.2.9 API) - +Uses of Package org.owasp.dependencycheck.utils (Dependency-Check Utils 1.2.10 API) + @@ -79,12 +79,7 @@
    diff --git a/dependency-check-utils/apidocs/overview-frame.html b/dependency-check-utils/apidocs/overview-frame.html index 27d2a6d87..755d11b4d 100644 --- a/dependency-check-utils/apidocs/overview-frame.html +++ b/dependency-check-utils/apidocs/overview-frame.html @@ -2,10 +2,10 @@ - + -Overview List (Dependency-Check Utils 1.2.9 API) - +Overview List (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/overview-summary.html b/dependency-check-utils/apidocs/overview-summary.html index 7af864904..9533c2a51 100644 --- a/dependency-check-utils/apidocs/overview-summary.html +++ b/dependency-check-utils/apidocs/overview-summary.html @@ -2,16 +2,16 @@ - + -Overview (Dependency-Check Utils 1.2.9 API) - +Overview (Dependency-Check Utils 1.2.10 API) + @@ -64,7 +64,7 @@
    -

    Dependency-Check Utils 1.2.9 API

    +

    Dependency-Check Utils 1.2.10 API

    org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition -
    - - org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition -
    - - org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition -
    - - org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition -
    - - org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.util -
    - - org.owasp.dependencycheck.org.apache.tools.ant.util - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.util -
    - - org.owasp.dependencycheck.org.apache.tools.ant.util - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.util -
    - - org.owasp.dependencycheck.org.apache.tools.ant.util - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    static String CVE_MODIFIED_12_URL -
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using - the 1.2 schema.
    +
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 1.2 + schema.
    static String CVE_MODIFIED_20_URL -
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using - the 2.0 schema.
    +
    The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 2.0 + schema.
    static File getDataDirectory() -
    Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory - for the embedded H2 database.
    +
    Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the + embedded H2 database.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    @@ -77,89 +77,49 @@ diff --git a/dependency-check-utils/apidocs/overview-tree.html b/dependency-check-utils/apidocs/overview-tree.html index 0ed3f1a45..6142797f6 100644 --- a/dependency-check-utils/apidocs/overview-tree.html +++ b/dependency-check-utils/apidocs/overview-tree.html @@ -2,16 +2,16 @@ - + -Class Hierarchy (Dependency-Check Utils 1.2.9 API) - +Class Hierarchy (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/apidocs/serialized-form.html b/dependency-check-utils/apidocs/serialized-form.html index 8b8f1f4b1..c3ed6baae 100644 --- a/dependency-check-utils/apidocs/serialized-form.html +++ b/dependency-check-utils/apidocs/serialized-form.html @@ -2,16 +2,16 @@ - + -Serialized Form (Dependency-Check Utils 1.2.9 API) - +Serialized Form (Dependency-Check Utils 1.2.10 API) + diff --git a/dependency-check-utils/checkstyle.html b/dependency-check-utils/checkstyle.html index 4e4d3c14b..dbbbe6823 100644 --- a/dependency-check-utils/checkstyle.html +++ b/dependency-check-utils/checkstyle.html @@ -1,13 +1,13 @@ - + dependency-check-ant - Checkstyle Results @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@
    org.owasp.dependencycheck.org.apache.tools.ant -
    - - org.owasp.dependencycheck.org.apache.tools.ant - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.launch -
    - - org.owasp.dependencycheck.org.apache.tools.ant.launch - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition -
    - - org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.resources - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors -
    - - org.owasp.dependencycheck.org.apache.tools.ant.types.selectors - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.org.apache.tools.ant.util -
    - - org.owasp.dependencycheck.org.apache.tools.ant.util - - - This is a copy of classes within Apache Ant.
    +
    This is a copy of classes within Apache Ant.
    org.owasp.dependencycheck.utils -
    - - org.owasp.dependencycheck.utils - - - Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    +
    Includes various utility classes such as a Settings wrapper, utilities to make URL Connections, etc.
    - +
    Package # Classes Line Coverage Branch Coverage Complexity
    org.owasp.dependencycheck.utils13
    30%
    149/487
    22%
    36/158
    3.072
    org.owasp.dependencycheck.utils13
    30%
    149/490
    22%
    36/158
    3.072
    - + diff --git a/dependency-check-utils/cobertura/frame-summary.html b/dependency-check-utils/cobertura/frame-summary.html index e9547ff46..62fdd7d2f 100644 --- a/dependency-check-utils/cobertura/frame-summary.html +++ b/dependency-check-utils/cobertura/frame-summary.html @@ -16,7 +16,7 @@ - + @@ -24,7 +24,7 @@ - +
    Package # Classes Line Coverage Branch Coverage Complexity
    All Packages49
    28%
    667/2373
    21%
    317/1478
    3.051
    All Packages49
    28%
    667/2376
    21%
    317/1478
    3.051
    org.owasp.dependencycheck.org.apache.tools.ant6
    35%
    216/606
    25%
    101/402
    2.992
    org.owasp.dependencycheck.org.apache.tools.ant.launch2
    0%
    0/174
    0%
    0/92
    5.846
    org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition2
    58%
    40/68
    38%
    39/102
    3.846
    org.owasp.dependencycheck.org.apache.tools.ant.types.resources4
    0%
    0/84
    0%
    0/56
    2.286
    org.owasp.dependencycheck.org.apache.tools.ant.types.selectors5
    50%
    170/335
    38%
    100/258
    4.18
    org.owasp.dependencycheck.org.apache.tools.ant.util11
    18%
    92/508
    11%
    41/348
    3
    org.owasp.dependencycheck.utils13
    30%
    149/487
    22%
    36/158
    3.072
    org.owasp.dependencycheck.utils13
    30%
    149/490
    22%
    36/158
    3.072
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.BuildException.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.BuildException.html index 02cde162a..784ca3b2b 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.BuildException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.BuildException.html @@ -302,6 +302,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.DirectoryScanner.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.DirectoryScanner.html index 3169161e9..918bab807 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.DirectoryScanner.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.DirectoryScanner.html @@ -3154,6 +3154,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.FileScanner.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.FileScanner.html index 704f25702..2e91bd2be 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.FileScanner.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.FileScanner.html @@ -335,6 +335,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.Location.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.Location.html index 46235d723..7e8be2f5c 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.Location.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.Location.html @@ -341,6 +341,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.PathTokenizer.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.PathTokenizer.html index bd36664c8..3ce0bff55 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.PathTokenizer.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.PathTokenizer.html @@ -311,6 +311,6 @@
     
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.ProjectComponent.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.ProjectComponent.html index 891eeb0d9..a319f639b 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.ProjectComponent.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.ProjectComponent.html @@ -327,6 +327,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.launch.Locator.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.launch.Locator.html index c31009715..749346287 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.launch.Locator.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.launch.Locator.html @@ -906,6 +906,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Condition.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Condition.html index 6371feb69..b366a3555 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Condition.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Condition.html @@ -89,6 +89,6 @@
     
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Os.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Os.html index aa58306db..81ec323c7 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Os.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.taskdefs.condition.Os.html @@ -593,6 +593,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.DataType.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.DataType.html index a37220e5a..103e334e7 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.DataType.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.DataType.html @@ -698,6 +698,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Reference.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Reference.html index d3bea14c2..5349ccaff 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Reference.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Reference.html @@ -263,6 +263,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Resource.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Resource.html index d16821029..023af9131 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Resource.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.Resource.html @@ -869,6 +869,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceCollection.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceCollection.html index ac5830dff..59d0ed8cf 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceCollection.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceCollection.html @@ -119,6 +119,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceFactory.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceFactory.html index 5e8980c49..086b89fe7 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceFactory.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.ResourceFactory.html @@ -95,6 +95,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Appendable.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Appendable.html index 9dc290d12..4c6882213 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Appendable.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Appendable.html @@ -89,6 +89,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileProvider.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileProvider.html index 466332023..04eb499a9 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileProvider.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileProvider.html @@ -91,6 +91,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileResource.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileResource.html index ed3592d09..81ceb2733 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileResource.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.FileResource.html @@ -763,6 +763,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Touchable.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Touchable.html index a5c0db9b6..1d7b21889 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Touchable.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.resources.Touchable.html @@ -83,6 +83,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.FileSelector.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.FileSelector.html index fcbc6794f..cc942e6e6 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.FileSelector.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.FileSelector.html @@ -115,6 +115,6 @@
     
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorScanner.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorScanner.html index a6a01f36c..d00e33559 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorScanner.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorScanner.html @@ -117,6 +117,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorUtils.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorUtils.html index 046b623ff..4d9270baa 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorUtils.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.SelectorUtils.html @@ -1178,6 +1178,6 @@
     
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPath.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPath.html index e8999de47..64f0f4060 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPath.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPath.html @@ -394,6 +394,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPattern.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPattern.html index 3e5fbb015..d21ecc6c2 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPattern.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.types.selectors.TokenizedPattern.html @@ -332,6 +332,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils.html index 4716d848c..3a13eaa4b 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.CollectionUtils.html @@ -486,6 +486,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.FileUtils.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.FileUtils.html index e636d2072..1d3dddfa5 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.FileUtils.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.FileUtils.html @@ -3041,6 +3041,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.SymbolicLinkUtils.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.SymbolicLinkUtils.html index 4817f0eb1..c02c02c6d 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.SymbolicLinkUtils.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.SymbolicLinkUtils.html @@ -584,6 +584,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.VectorSet.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.VectorSet.html index dab9953c4..c8b9eca2b 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.VectorSet.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.org.apache.tools.ant.util.VectorSet.html @@ -398,6 +398,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Checksum.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Checksum.html index 7be67f4e1..1056576b5 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Checksum.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Checksum.html @@ -82,7 +82,7 @@  32  
      *
     33   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     34  
      *
     35   @@ -241,7 +241,7 @@  126  
          */
     127   -
         private static final String HEXES = "0123456789ABCDEF";
    +
         private static final String HEXES = "0123456789abcdef";
     128  
     
     129   @@ -284,6 +284,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html index dcd104590..69954d8a7 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27   @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Downloader.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Downloader.html index 7442bda49..a90ebdf4f 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Downloader.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Downloader.html @@ -12,7 +12,7 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    Downloader
    6%
    8/123
    2%
    1/42
    9.6
    Downloader
    6%
    8/126
    2%
    1/42
    9.6
     
    @@ -90,7 +90,7 @@  36  
      *
     37   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     38  
      */
     39   @@ -105,321 +105,330 @@
          */
     44  1
         private static final Logger LOGGER = Logger.getLogger(Downloader.class.getName());
     45   -
     
    +
         /**
     46   -
         /**
    +
          * The maximum number of redirects that will be followed when attempting to download a file.
     47   -
          * Private constructor for utility class.
    +
          */
     48   -
          */
    -  49  0
         private Downloader() {
    -  50  0
         }
    +
         private static final int MAX_REDIRECT_ATTEMPTS = 5;
    +  49   +
     
    +  50   +
         /**
     51   -
     
    +
          * Private constructor for utility class.
     52   -
         /**
    -  53   -
          * Retrieves a file from a given URL and saves it to the outputPath.
    -  54   -
          *
    +
          */
    +  53  0
         private Downloader() {
    +  54  0
         }
     55   -
          * @param url the URL of the file to download
    +
     
     56   -
          * @param outputPath the path to the save the file to
    +
         /**
     57   -
          * @throws DownloadFailedException is thrown if there is an error downloading the file
    -  58   -
          */
    -  59   -
         public static void fetchFile(URL url, File outputPath) throws DownloadFailedException {
    -  60  0
             fetchFile(url, outputPath, true);
    -  61  0
         }
    -  62   -
     
    -  63   -
         /**
    -  64  
          * Retrieves a file from a given URL and saves it to the outputPath.
    -  65   +  58  
          *
    -  66   +  59  
          * @param url the URL of the file to download
    -  67   +  60  
          * @param outputPath the path to the save the file to
    -  68   -
          * @param useProxy whether to use the configured proxy when downloading files
    -  69   +  61  
          * @throws DownloadFailedException is thrown if there is an error downloading the file
    +  62   +
          */
    +  63   +
         public static void fetchFile(URL url, File outputPath) throws DownloadFailedException {
    +  64  0
             fetchFile(url, outputPath, true);
    +  65  0
         }
    +  66   +
     
    +  67   +
         /**
    +  68   +
          * Retrieves a file from a given URL and saves it to the outputPath.
    +  69   +
          *
     70   -
          */
    +
          * @param url the URL of the file to download
     71   -
         public static void fetchFile(URL url, File outputPath, boolean useProxy) throws DownloadFailedException {
    -  72  0
             if ("file".equalsIgnoreCase(url.getProtocol())) {
    +
          * @param outputPath the path to the save the file to
    +  72   +
          * @param useProxy whether to use the configured proxy when downloading files
     73   -
                 File file;
    +
          * @throws DownloadFailedException is thrown if there is an error downloading the file
     74   +
          */
    +  75   +
         public static void fetchFile(URL url, File outputPath, boolean useProxy) throws DownloadFailedException {
    +  76  0
             if ("file".equalsIgnoreCase(url.getProtocol())) {
    +  77   +
                 File file;
    +  78  
                 try {
    -  75  0
                     file = new File(url.toURI());
    -  76  0
                 } catch (URISyntaxException ex) {
    -  77  0
                     final String msg = String.format("Download failed, unable to locate '%s'", url.toString());
    -  78  0
                     throw new DownloadFailedException(msg);
    -  79  0
                 }
    -  80  0
                 if (file.exists()) {
    -  81   +  79  0
                     file = new File(url.toURI());
    +  80  0
                 } catch (URISyntaxException ex) {
    +  81  0
                     final String msg = String.format("Download failed, unable to locate '%s'", url.toString());
    +  82  0
                     throw new DownloadFailedException(msg);
    +  83  0
                 }
    +  84  0
                 if (file.exists()) {
    +  85  
                     try {
    -  82  0
                         org.apache.commons.io.FileUtils.copyFile(file, outputPath);
    -  83  0
                     } catch (IOException ex) {
    -  84  0
                         final String msg = String.format("Download failed, unable to copy '%s' to '%s'", url.toString(), outputPath.getAbsolutePath());
    -  85  0
                         throw new DownloadFailedException(msg);
    -  86  0
                     }
    -  87   +  86  0
                         org.apache.commons.io.FileUtils.copyFile(file, outputPath);
    +  87  0
                     } catch (IOException ex) {
    +  88  0
                         final String msg = String.format("Download failed, unable to copy '%s' to '%s'", url.toString(), outputPath.getAbsolutePath());
    +  89  0
                         throw new DownloadFailedException(msg);
    +  90  0
                     }
    +  91  
                 } else {
    -  88  0
                     final String msg = String.format("Download failed, file ('%s') does not exist", url.toString());
    -  89  0
                     throw new DownloadFailedException(msg);
    -  90   +  92  0
                     final String msg = String.format("Download failed, file ('%s') does not exist", url.toString());
    +  93  0
                     throw new DownloadFailedException(msg);
    +  94  
                 }
    -  91  0
             } else {
    -  92  0
                 HttpURLConnection conn = null;
    -  93   +  95  0
             } else {
    +  96  0
                 HttpURLConnection conn = null;
    +  97  
                 try {
    -  94  0
                     conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
    -  95  0
                     conn.setRequestProperty("Accept-Encoding", "gzip, deflate");
    -  96  0
                     conn.connect();
    -  97  0
                     int status = conn.getResponseCode();
    -  98  0
                     if (status != HttpURLConnection.HTTP_OK) {
    -  99  0
                         if (status == HttpURLConnection.HTTP_MOVED_TEMP
    -  100   -
                                 || status == HttpURLConnection.HTTP_MOVED_PERM
    -  101   -
                                 || status == HttpURLConnection.HTTP_SEE_OTHER) {
    -  102  0
                             final String location = conn.getHeaderField("Location");
    -  103   -
                             try {
    -  104  0
                                 conn.disconnect();
    +  98  0
                     LOGGER.fine(String.format("Attempting download of %s", url.toString()));
    +  99  0
                     conn = URLConnectionFactory.createHttpURLConnection(url, useProxy);
    +  100  0
                     conn.setRequestProperty("Accept-Encoding", "gzip, deflate");
    +  101  0
                     conn.connect();
    +  102  0
                     int status = conn.getResponseCode();
    +  103  0
                     int redirectCount = 0;
    +  104  0
                     while ((status == HttpURLConnection.HTTP_MOVED_TEMP
     105   -
                             } finally {
    -  106  0
                                 conn = null;
    -  107  0
                             }
    -  108  0
                             LOGGER.fine(String.format("Download is being redirected from %s to %s", url.toString(), location));
    -  109  0
                             conn = URLConnectionFactory.createHttpURLConnection(new URL(location), useProxy);
    -  110  0
                             conn.setRequestProperty("Accept-Encoding", "gzip, deflate");
    -  111  0
                             conn.connect();
    -  112  0
                             status = conn.getResponseCode();
    -  113   -
                         }
    -  114   -
                     }
    -  115  0
                     if (status != 200) {
    -  116   +
                             || status == HttpURLConnection.HTTP_MOVED_PERM
    +  106   +
                             || status == HttpURLConnection.HTTP_SEE_OTHER)
    +  107   +
                             && MAX_REDIRECT_ATTEMPTS > redirectCount++) {
    +  108  0
                         final String location = conn.getHeaderField("Location");
    +  109  
                         try {
    -  117  0
                             conn.disconnect();
    -  118   +  110  0
                             conn.disconnect();
    +  111  
                         } finally {
    -  119  0
                             conn = null;
    -  120  0
                         }
    -  121  0
                         final String msg = String.format("Error downloading file %s; received response code %s.", url.toString(), status);
    -  122  0
                         throw new DownloadFailedException(msg);
    +  112  0
                             conn = null;
    +  113  0
                         }
    +  114  0
                         LOGGER.fine(String.format("Download is being redirected from %s to %s", url.toString(), location));
    +  115  0
                         conn = URLConnectionFactory.createHttpURLConnection(new URL(location), useProxy);
    +  116  0
                         conn.setRequestProperty("Accept-Encoding", "gzip, deflate");
    +  117  0
                         conn.connect();
    +  118  0
                         status = conn.getResponseCode();
    +  119  0
                     }
    +  120  0
                     if (status != 200) {
    +  121   +
                         try {
    +  122  0
                             conn.disconnect();
     123   -
     
    -  124   -
                     }
    -  125  0
                 } catch (IOException ex) {
    -  126   -
                     try {
    -  127  0
                         if (conn != null) {
    -  128  0
                             conn.disconnect();
    -  129   -
                         }
    -  130   -
                     } finally {
    -  131  0
                         conn = null;
    -  132  0
                     }
    -  133  0
                     final String msg = String.format("Error downloading file %s; unable to connect.", url.toString());
    -  134  0
                     throw new DownloadFailedException(msg, ex);
    -  135  0
                 }
    -  136   -
     
    -  137  0
                 final String encoding = conn.getContentEncoding();
    -  138  0
                 BufferedOutputStream writer = null;
    -  139  0
                 InputStream reader = null;
    -  140   -
                 try {
    -  141  0
                     if (encoding != null && "gzip".equalsIgnoreCase(encoding)) {
    -  142  0
                         reader = new GZIPInputStream(conn.getInputStream());
    -  143  0
                     } else if (encoding != null && "deflate".equalsIgnoreCase(encoding)) {
    -  144  0
                         reader = new InflaterInputStream(conn.getInputStream());
    -  145   -
                     } else {
    -  146  0
                         reader = conn.getInputStream();
    -  147   -
                     }
    -  148   -
     
    -  149  0
                     writer = new BufferedOutputStream(new FileOutputStream(outputPath));
    -  150  0
                     final byte[] buffer = new byte[4096];
    -  151   -
                     int bytesRead;
    -  152  0
                     while ((bytesRead = reader.read(buffer)) > 0) {
    -  153  0
                         writer.write(buffer, 0, bytesRead);
    -  154   -
                     }
    -  155  0
                 } catch (IOException ex) {
    -  156  0
                     analyzeException(ex);
    -  157  0
                     final String msg = String.format("Error saving '%s' to file '%s'%nConnection Timeout: %d%nEncoding: %s%n",
    -  158   -
                             url.toString(), outputPath.getAbsolutePath(), conn.getConnectTimeout(), encoding);
    -  159  0
                     throw new DownloadFailedException(msg, ex);
    -  160  0
                 } catch (Throwable ex) {
    -  161  0
                     final String msg = String.format("Unexpected exception saving '%s' to file '%s'%nConnection Timeout: %d%nEncoding: %s%n",
    -  162   -
                             url.toString(), outputPath.getAbsolutePath(), conn.getConnectTimeout(), encoding);
    -  163  0
                     throw new DownloadFailedException(msg, ex);
    -  164   -
                 } finally {
    -  165  0
                     if (writer != null) {
    -  166   -
                         try {
    -  167  0
                             writer.close();
    -  168  0
                         } catch (IOException ex) {
    -  169  0
                             LOGGER.log(Level.FINEST, "Error closing the writer in Downloader.", ex);
    -  170  0
                         }
    -  171   -
                     }
    -  172  0
                     if (reader != null) {
    -  173   -
                         try {
    -  174  0
                             reader.close();
    -  175  0
                         } catch (IOException ex) {
    -  176  0
                             LOGGER.log(Level.FINEST, "Error closing the reader in Downloader.", ex);
    -  177  0
                         }
    -  178   -
                     }
    -  179   -
                     try {
    -  180  0
                         conn.disconnect();
    -  181   -
                     } finally {
    -  182  0
                         conn = null;
    -  183  0
                     }
    -  184  0
                 }
    -  185   -
             }
    -  186  0
         }
    -  187   -
     
    -  188   -
         /**
    -  189   -
          * Makes an HTTP Head request to retrieve the last modified date of the given URL. If the file:// protocol is specified, then
    -  190   -
          * the lastTimestamp of the file is returned.
    -  191   -
          *
    -  192   -
          * @param url the URL to retrieve the timestamp from
    -  193   -
          * @return an epoch timestamp
    -  194   -
          * @throws DownloadFailedException is thrown if an exception occurs making the HTTP request
    -  195   -
          */
    -  196   -
         public static long getLastModified(URL url) throws DownloadFailedException {
    -  197  1
             long timestamp = 0;
    -  198   -
             //TODO add the FTP protocol?
    -  199  1
             if ("file".equalsIgnoreCase(url.getProtocol())) {
    -  200   -
                 File lastModifiedFile;
    -  201   -
                 try {
    -  202  1
                     lastModifiedFile = new File(url.toURI());
    -  203  0
                 } catch (URISyntaxException ex) {
    -  204  0
                     final String msg = String.format("Unable to locate '%s'", url.toString());
    -  205  0
                     throw new DownloadFailedException(msg);
    -  206  1
                 }
    -  207  1
                 timestamp = lastModifiedFile.lastModified();
    -  208  1
             } else {
    -  209  0
                 HttpURLConnection conn = null;
    -  210   -
                 try {
    -  211  0
                     conn = URLConnectionFactory.createHttpURLConnection(url);
    -  212  0
                     conn.setRequestMethod("HEAD");
    -  213  0
                     conn.connect();
    -  214  0
                     final int t = conn.getResponseCode();
    -  215  0
                     if (t >= 200 && t < 300) {
    -  216  0
                         timestamp = conn.getLastModified();
    -  217   -
                     } else {
    -  218  0
                         throw new DownloadFailedException("HEAD request returned a non-200 status code");
    -  219   -
                     }
    -  220  0
                 } catch (URLConnectionFailureException ex) {
    -  221  0
                     throw new DownloadFailedException("Error creating URL Connection for HTTP HEAD request.", ex);
    -  222  0
                 } catch (IOException ex) {
    -  223  0
                     analyzeException(ex);
    -  224  0
                     throw new DownloadFailedException("Error making HTTP HEAD request.", ex);
    -  225   -
                 } finally {
    -  226  0
                     if (conn != null) {
    -  227   -
                         try {
    -  228  0
                             conn.disconnect();
    -  229  
                         } finally {
    -  230  0
                             conn = null;
    -  231  0
                         }
    -  232   -
                     }
    -  233   -
                 }
    -  234   -
             }
    -  235  1
             return timestamp;
    -  236   -
         }
    -  237   +  124  0
                             conn = null;
    +  125  0
                         }
    +  126  0
                         final String msg = String.format("Error downloading file %s; received response code %s.", url.toString(), status);
    +  127  0
                         throw new DownloadFailedException(msg);
    +  128  
     
    -  238   -
         /**
    -  239   -
          * Analyzes the IOException, logs the appropriate information for debugging purposes, and then throws a
    -  240   -
          * DownloadFailedException that wraps the IO Exception.
    -  241   -
          *
    -  242   -
          * @param ex the original exception
    -  243   -
          * @throws DownloadFailedException a wrapper exception that contains the original exception as the cause
    -  244   -
          */
    -  245   -
         protected static void analyzeException(IOException ex) throws DownloadFailedException {
    -  246  0
             Throwable cause = ex;
    -  247  0
             while (cause != null) {
    -  248  0
                 if (cause instanceof InvalidAlgorithmParameterException) {
    -  249  0
                     final String keystore = System.getProperty("javax.net.ssl.keyStore");
    -  250  0
                     final String version = System.getProperty("java.version");
    -  251  0
                     final String vendor = System.getProperty("java.vendor");
    -  252  0
                     LOGGER.info("Error making HTTPS request - InvalidAlgorithmParameterException");
    -  253  0
                     LOGGER.info("There appears to be an issue with the installation of Java and the cacerts."
    -  254   -
                             + "See closed issue #177 here: https://github.com/jeremylong/DependencyCheck/issues/177");
    -  255  0
                     LOGGER.info(String.format("Java Info:%njavax.net.ssl.keyStore='%s'%njava.version='%s'%njava.vendor='%s'",
    -  256   -
                             keystore, version, vendor));
    -  257  0
                     throw new DownloadFailedException("Error making HTTPS request. Please see the log for more details.");
    -  258   -
                 }
    -  259  0
                 cause = cause.getCause();
    -  260   +  129   +
                     }
    +  130  0
                 } catch (IOException ex) {
    +  131   +
                     try {
    +  132  0
                         if (conn != null) {
    +  133  0
                             conn.disconnect();
    +  134   +
                         }
    +  135   +
                     } finally {
    +  136  0
                         conn = null;
    +  137  0
                     }
    +  138  0
                     final String msg = String.format("Error downloading file %s; unable to connect.", url.toString());
    +  139  0
                     throw new DownloadFailedException(msg, ex);
    +  140  0
                 }
    +  141   +
     
    +  142  0
                 final String encoding = conn.getContentEncoding();
    +  143  0
                 BufferedOutputStream writer = null;
    +  144  0
                 InputStream reader = null;
    +  145   +
                 try {
    +  146  0
                     if (encoding != null && "gzip".equalsIgnoreCase(encoding)) {
    +  147  0
                         reader = new GZIPInputStream(conn.getInputStream());
    +  148  0
                     } else if (encoding != null && "deflate".equalsIgnoreCase(encoding)) {
    +  149  0
                         reader = new InflaterInputStream(conn.getInputStream());
    +  150   +
                     } else {
    +  151  0
                         reader = conn.getInputStream();
    +  152   +
                     }
    +  153   +
     
    +  154  0
                     writer = new BufferedOutputStream(new FileOutputStream(outputPath));
    +  155  0
                     final byte[] buffer = new byte[4096];
    +  156   +
                     int bytesRead;
    +  157  0
                     while ((bytesRead = reader.read(buffer)) > 0) {
    +  158  0
                         writer.write(buffer, 0, bytesRead);
    +  159   +
                     }
    +  160  0
                     LOGGER.fine(String.format("Download of %s complete", url.toString()));
    +  161  0
                 } catch (IOException ex) {
    +  162  0
                     analyzeException(ex);
    +  163  0
                     final String msg = String.format("Error saving '%s' to file '%s'%nConnection Timeout: %d%nEncoding: %s%n",
    +  164   +
                             url.toString(), outputPath.getAbsolutePath(), conn.getConnectTimeout(), encoding);
    +  165  0
                     throw new DownloadFailedException(msg, ex);
    +  166  0
                 } catch (Throwable ex) {
    +  167  0
                     final String msg = String.format("Unexpected exception saving '%s' to file '%s'%nConnection Timeout: %d%nEncoding: %s%n",
    +  168   +
                             url.toString(), outputPath.getAbsolutePath(), conn.getConnectTimeout(), encoding);
    +  169  0
                     throw new DownloadFailedException(msg, ex);
    +  170   +
                 } finally {
    +  171  0
                     if (writer != null) {
    +  172   +
                         try {
    +  173  0
                             writer.close();
    +  174  0
                         } catch (IOException ex) {
    +  175  0
                             LOGGER.log(Level.FINEST, "Error closing the writer in Downloader.", ex);
    +  176  0
                         }
    +  177   +
                     }
    +  178  0
                     if (reader != null) {
    +  179   +
                         try {
    +  180  0
                             reader.close();
    +  181  0
                         } catch (IOException ex) {
    +  182  0
                             LOGGER.log(Level.FINEST, "Error closing the reader in Downloader.", ex);
    +  183  0
                         }
    +  184   +
                     }
    +  185   +
                     try {
    +  186  0
                         conn.disconnect();
    +  187   +
                     } finally {
    +  188  0
                         conn = null;
    +  189  0
                     }
    +  190  0
                 }
    +  191  
             }
    -  261  0
         }
    +  192  0
         }
    +  193   +
     
    +  194   +
         /**
    +  195   +
          * Makes an HTTP Head request to retrieve the last modified date of the given URL. If the file:// protocol is specified, then
    +  196   +
          * the lastTimestamp of the file is returned.
    +  197   +
          *
    +  198   +
          * @param url the URL to retrieve the timestamp from
    +  199   +
          * @return an epoch timestamp
    +  200   +
          * @throws DownloadFailedException is thrown if an exception occurs making the HTTP request
    +  201   +
          */
    +  202   +
         public static long getLastModified(URL url) throws DownloadFailedException {
    +  203  1
             long timestamp = 0;
    +  204   +
             //TODO add the FTP protocol?
    +  205  1
             if ("file".equalsIgnoreCase(url.getProtocol())) {
    +  206   +
                 File lastModifiedFile;
    +  207   +
                 try {
    +  208  1
                     lastModifiedFile = new File(url.toURI());
    +  209  0
                 } catch (URISyntaxException ex) {
    +  210  0
                     final String msg = String.format("Unable to locate '%s'", url.toString());
    +  211  0
                     throw new DownloadFailedException(msg);
    +  212  1
                 }
    +  213  1
                 timestamp = lastModifiedFile.lastModified();
    +  214  1
             } else {
    +  215  0
                 HttpURLConnection conn = null;
    +  216   +
                 try {
    +  217  0
                     conn = URLConnectionFactory.createHttpURLConnection(url);
    +  218  0
                     conn.setRequestMethod("HEAD");
    +  219  0
                     conn.connect();
    +  220  0
                     final int t = conn.getResponseCode();
    +  221  0
                     if (t >= 200 && t < 300) {
    +  222  0
                         timestamp = conn.getLastModified();
    +  223   +
                     } else {
    +  224  0
                         throw new DownloadFailedException("HEAD request returned a non-200 status code");
    +  225   +
                     }
    +  226  0
                 } catch (URLConnectionFailureException ex) {
    +  227  0
                     throw new DownloadFailedException("Error creating URL Connection for HTTP HEAD request.", ex);
    +  228  0
                 } catch (IOException ex) {
    +  229  0
                     analyzeException(ex);
    +  230  0
                     throw new DownloadFailedException("Error making HTTP HEAD request.", ex);
    +  231   +
                 } finally {
    +  232  0
                     if (conn != null) {
    +  233   +
                         try {
    +  234  0
                             conn.disconnect();
    +  235   +
                         } finally {
    +  236  0
                             conn = null;
    +  237  0
                         }
    +  238   +
                     }
    +  239   +
                 }
    +  240   +
             }
    +  241  1
             return timestamp;
    +  242   +
         }
    +  243   +
     
    +  244   +
         /**
    +  245   +
          * Analyzes the IOException, logs the appropriate information for debugging purposes, and then throws a
    +  246   +
          * DownloadFailedException that wraps the IO Exception.
    +  247   +
          *
    +  248   +
          * @param ex the original exception
    +  249   +
          * @throws DownloadFailedException a wrapper exception that contains the original exception as the cause
    +  250   +
          */
    +  251   +
         protected static void analyzeException(IOException ex) throws DownloadFailedException {
    +  252  0
             Throwable cause = ex;
    +  253  0
             while (cause != null) {
    +  254  0
                 if (cause instanceof InvalidAlgorithmParameterException) {
    +  255  0
                     final String keystore = System.getProperty("javax.net.ssl.keyStore");
    +  256  0
                     final String version = System.getProperty("java.version");
    +  257  0
                     final String vendor = System.getProperty("java.vendor");
    +  258  0
                     LOGGER.info("Error making HTTPS request - InvalidAlgorithmParameterException");
    +  259  0
                     LOGGER.info("There appears to be an issue with the installation of Java and the cacerts."
    +  260   +
                             + "See closed issue #177 here: https://github.com/jeremylong/DependencyCheck/issues/177");
    +  261  0
                     LOGGER.info(String.format("Java Info:%njavax.net.ssl.keyStore='%s'%njava.version='%s'%njava.vendor='%s'",
     262   +
                             keystore, version, vendor));
    +  263  0
                     throw new DownloadFailedException("Error making HTTPS request. Please see the log for more details.");
    +  264   +
                 }
    +  265  0
                 cause = cause.getCause();
    +  266   +
             }
    +  267  0
         }
    +  268  
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html index 0aa95631c..2bad3faea 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27   @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.FileUtils.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.FileUtils.html index b3a8f3c26..99f4ae2e2 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.FileUtils.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.FileUtils.html @@ -78,7 +78,7 @@  30  
      *
     31   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     32  
      */
     33   @@ -300,6 +300,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html index dc3f6c31f..323f34621 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27   @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogFilter.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogFilter.html index c3fe5b3b6..b4429b67c 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogFilter.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogFilter.html @@ -70,7 +70,7 @@  26  
      *
     27   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     28  
      */
     29  0
     public class LogFilter implements Filter {
    @@ -100,6 +100,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogUtils.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogUtils.html index 6a8397216..e19283e62 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogUtils.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.LogUtils.html @@ -80,7 +80,7 @@  31  
      *
     32   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     33  
      */
     34   @@ -196,6 +196,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Settings.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Settings.html index b8d7d8c15..358adcd16 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Settings.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Settings.html @@ -91,7 +91,7 @@  36  
      *
     37   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     38  
      */
     39   @@ -227,9 +227,9 @@  105  
             /**
     106   -
              * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using
    +
              * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 2.0
     107   -
              * the 2.0 schema.
    +
              * schema.
     108  
              */
     109   @@ -237,9 +237,9 @@  110  
             /**
     111   -
              * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using
    +
              * The properties key for the URL to retrieve the recently modified and added CVE entries (last 8 days) using the 1.2
     112   -
              * the 1.2 schema.
    +
              * schema.
     113  
              */
     114   @@ -255,9 +255,9 @@  119  
             /**
     120   -
              * The properties key for the telling us how many cve.url.* URLs exists. This is used in combination with
    +
              * The properties key for the telling us how many cve.url.* URLs exists. This is used in combination with CVE_BASE_URL to
     121   -
              * CVE_BASE_URL to be able to retrieve the URLs for all of the files that make up the NVD CVE listing.
    +
              * be able to retrieve the URLs for all of the files that make up the NVD CVE listing.
     122  
              */
     123   @@ -597,9 +597,9 @@  299  
         /**
     300   -
          * Initializes the thread local settings object. Note, to use the settings object you must call this method.
    +
          * Initializes the thread local settings object. Note, to use the settings object you must call this method. However, you must
     301   -
          * However, you must also call Settings.cleanup() to properly release resources.
    +
          * also call Settings.cleanup() to properly release resources.
     302  
          */
     303   @@ -611,9 +611,9 @@  307  
         /**
     308   -
          * Initializes the thread local settings object. Note, to use the settings object you must call this method.
    +
          * Initializes the thread local settings object. Note, to use the settings object you must call this method. However, you must
     309   -
          * However, you must also call Settings.cleanup() to properly release resources.
    +
          * also call Settings.cleanup() to properly release resources.
     310  
          *
     311   @@ -804,9 +804,9 @@  425  
         /**
     426   -
          * Merges a new properties file into the current properties. This method allows for the loading of a user provided
    +
          * Merges a new properties file into the current properties. This method allows for the loading of a user provided properties
     427   -
          * properties file.<br/><br/>
    +
          * file.<br/><br/>
     428  
          * Note: even if using this method - system properties will be loaded before properties loaded from files.
     429   @@ -845,9 +845,9 @@  450  
         /**
     451   -
          * Merges a new properties file into the current properties. This method allows for the loading of a user provided
    +
          * Merges a new properties file into the current properties. This method allows for the loading of a user provided properties
     452   -
          * properties file.<br/><br/>
    +
          * file.<br/><br/>
     453  
          * Note: even if using this method - system properties will be loaded before properties loaded from files.
     454   @@ -886,9 +886,9 @@  475  
         /**
     476   -
          * Merges a new properties file into the current properties. This method allows for the loading of a user provided
    +
          * Merges a new properties file into the current properties. This method allows for the loading of a user provided properties
     477   -
          * properties file.<br/><br/>
    +
          * file.<br/><br/>
     478  
          * Note: even if using this method - system properties will be loaded before properties loaded from files.
     479   @@ -909,11 +909,11 @@  488  
         /**
     489   -
          * Returns a value from the properties file as a File object. If the value was specified as a system property or
    +
          * Returns a value from the properties file as a File object. If the value was specified as a system property or passed in via
     490   -
          * passed in via the -Dprop=value argument - this method will return the value from the system properties before the
    +
          * the -Dprop=value argument - this method will return the value from the system properties before the values in the contained
     491   -
          * values in the contained configuration file.
    +
          * configuration file.
     492  
          *
     493   @@ -937,19 +937,19 @@  504  
         /**
     505   -
          * Returns a value from the properties file as a File object. If the value was specified as a system property or
    +
          * Returns a value from the properties file as a File object. If the value was specified as a system property or passed in via
     506   -
          * passed in via the -Dprop=value argument - this method will return the value from the system properties before the
    +
          * the -Dprop=value argument - this method will return the value from the system properties before the values in the contained
     507   -
          * values in the contained configuration file.
    +
          * configuration file.
     508  
          *
     509   -
          * This method will check the configured base directory and will use this as the base of the file path.
    +
          * This method will check the configured base directory and will use this as the base of the file path. Additionally, if the
     510   -
          * Additionally, if the base directory begins with a leading "[JAR]\" sequence with the path to the folder
    +
          * base directory begins with a leading "[JAR]\" sequence with the path to the folder containing the JAR file containing this
     511   -
          * containing the JAR file containing this class.
    +
          * class.
     512  
          *
     513   @@ -1017,11 +1017,11 @@  555  
         /**
     556   -
          * Returns a value from the properties file. If the value was specified as a system property or passed in via the
    +
          * Returns a value from the properties file. If the value was specified as a system property or passed in via the -Dprop=value
     557   -
          * -Dprop=value argument - this method will return the value from the system properties before the values in the
    +
          * argument - this method will return the value from the system properties before the values in the contained configuration
     558   -
          * contained configuration file.
    +
          * file.
     559  
          *
     560   @@ -1083,11 +1083,11 @@  593  
         /**
     594   -
          * Returns a value from the properties file. If the value was specified as a system property or passed in via the
    +
          * Returns a value from the properties file. If the value was specified as a system property or passed in via the -Dprop=value
     595   -
          * -Dprop=value argument - this method will return the value from the system properties before the values in the
    +
          * argument - this method will return the value from the system properties before the values in the contained configuration
     596   -
          * contained configuration file.
    +
          * file.
     597  
          *
     598   @@ -1122,11 +1122,11 @@  614  
         /**
     615   -
          * Returns an int value from the properties file. If the value was specified as a system property or passed in via
    +
          * Returns an int value from the properties file. If the value was specified as a system property or passed in via the
     616   -
          * the -Dprop=value argument - this method will return the value from the system properties before the values in the
    +
          * -Dprop=value argument - this method will return the value from the system properties before the values in the contained
     617   -
          * contained configuration file.
    +
          * configuration file.
     618  
          *
     619   @@ -1155,11 +1155,11 @@  633  
         /**
     634   -
          * Returns an int value from the properties file. If the value was specified as a system property or passed in via
    +
          * Returns an int value from the properties file. If the value was specified as a system property or passed in via the
     635   -
          * the -Dprop=value argument - this method will return the value from the system properties before the values in the
    +
          * -Dprop=value argument - this method will return the value from the system properties before the values in the contained
     636   -
          * contained configuration file.
    +
          * configuration file.
     637  
          *
     638   @@ -1167,9 +1167,9 @@  639  
          * @param defaultValue the default value to return
     640   -
          * @return the property from the properties file or the defaultValue if the property does not exist or cannot be
    +
          * @return the property from the properties file or the defaultValue if the property does not exist or cannot be converted to
     641   -
          * converted to an integer
    +
          * an integer
     642  
          */
     643   @@ -1192,11 +1192,11 @@  655  
         /**
     656   -
          * Returns a long value from the properties file. If the value was specified as a system property or passed in via
    +
          * Returns a long value from the properties file. If the value was specified as a system property or passed in via the
     657   -
          * the -Dprop=value argument - this method will return the value from the system properties before the values in the
    +
          * -Dprop=value argument - this method will return the value from the system properties before the values in the contained
     658   -
          * contained configuration file.
    +
          * configuration file.
     659  
          *
     660   @@ -1225,11 +1225,11 @@  674  
         /**
     675   -
          * Returns a boolean value from the properties file. If the value was specified as a system property or passed in
    +
          * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the
     676   -
          * via the <code>-Dprop=value</code> argument this method will return the value from the system properties before
    +
          * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the
     677   -
          * the values in the contained configuration file.
    +
          * contained configuration file.
     678  
          *
     679   @@ -1258,11 +1258,11 @@  693  
         /**
     694   -
          * Returns a boolean value from the properties file. If the value was specified as a system property or passed in
    +
          * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the
     695   -
          * via the <code>-Dprop=value</code> argument this method will return the value from the system properties before
    +
          * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the
     696   -
          * the values in the contained configuration file.
    +
          * contained configuration file.
     697  
          *
     698   @@ -1298,11 +1298,11 @@  717  
         /**
     718   -
          * Returns a connection string from the configured properties. If the connection string contains a %s, this method
    +
          * Returns a connection string from the configured properties. If the connection string contains a %s, this method will
     719   -
          * will determine the 'data' directory and replace the %s with the path to the data directory. If the data directory
    +
          * determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not
     720   -
          * does not exists it will be created.
    +
          * exists it will be created.
     721  
          *
     722   @@ -1381,9 +1381,9 @@  772  
         /**
     773   -
          * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory
    +
          * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the
     774   -
          * for the embedded H2 database. This is public solely for some unit tests; otherwise this should be private.
    +
          * embedded H2 database. This is public solely for some unit tests; otherwise this should be private.
     775  
          *
     776   @@ -1406,6 +1406,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html index 270544cda..fd435281c 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html @@ -83,7 +83,7 @@  32  
      *
     33   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     34  
      */
     35   @@ -157,7 +157,7 @@  78  0
                     conn = (HttpURLConnection) url.openConnection();
     79  
                 }
    -  80  0
                 final int timeout = Settings.getInt(Settings.KEYS.CONNECTION_TIMEOUT, 60000);
    +  80  0
                 final int timeout = Settings.getInt(Settings.KEYS.CONNECTION_TIMEOUT, 10000);
     81  0
                 conn.setConnectTimeout(timeout);
     82  0
                 conn.setInstanceFollowRedirects(true);
     83  0
             } catch (IOException ex) {
    @@ -206,7 +206,7 @@  110  
             try {
     111  0
                 conn = (HttpURLConnection) url.openConnection();
    -  112  0
                 final int timeout = Settings.getInt(Settings.KEYS.CONNECTION_TIMEOUT, 60000);
    +  112  0
                 final int timeout = Settings.getInt(Settings.KEYS.CONNECTION_TIMEOUT, 10000);
     113  0
                 conn.setConnectTimeout(timeout);
     114  0
                 conn.setInstanceFollowRedirects(true);
     115  0
             } catch (IOException ioe) {
    @@ -219,6 +219,6 @@
     }
    - + diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html index 031f3b941..6599918e8 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html @@ -66,7 +66,7 @@  24  
      *
     25   -
      * @author Jeremy Long <jeremy.long@owasp.org>
    +
      * @author Jeremy Long
     26  
      */
     27   @@ -147,6 +147,6 @@
     }
    - + diff --git a/dependency-check-utils/cpd.html b/dependency-check-utils/cpd.html index 605ee34d5..fa0c65816 100644 --- a/dependency-check-utils/cpd.html +++ b/dependency-check-utils/cpd.html @@ -1,13 +1,13 @@ - + dependency-check-ant - CPD Results @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +1.17-beta1 Next Incremental diff --git a/dependency-check-utils/findbugs.html b/dependency-check-utils/findbugs.html index 9c51cd262..27d9e9bde 100644 --- a/dependency-check-utils/findbugs.html +++ b/dependency-check-utils/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-ant - FindBugs Bug Detector Report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +0
    diff --git a/dependency-check-utils/taglist.html b/dependency-check-utils/taglist.html index 643de4ca7..8fecd3dd4 100644 --- a/dependency-check-utils/taglist.html +++ b/dependency-check-utils/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-ant - Tag List report @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +204 diff --git a/dependency-check-utils/team-list.html b/dependency-check-utils/team-list.html index 8fc20889a..b1908253d 100644 --- a/dependency-check-utils/team-list.html +++ b/dependency-check-utils/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-ant - Team list @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ +https://www.owasp.org/ +developer

    Contributors

    The following additional people have contributed to this project through the way of suggestions, patches or documentation.

    - -