diff --git a/analyzers/archive-analyzer.html b/analyzers/archive-analyzer.html index 419d8a0a3..e4e382572 100644 --- a/analyzers/archive-analyzer.html +++ b/analyzers/archive-analyzer.html @@ -1,13 +1,13 @@ - + dependency-check – Archive Analyzer @@ -59,9 +59,9 @@
  • Archive Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/assembly-analyzer.html b/analyzers/assembly-analyzer.html index 0a7ec2968..7c932bc4e 100644 --- a/analyzers/assembly-analyzer.html +++ b/analyzers/assembly-analyzer.html @@ -1,13 +1,13 @@ - + dependency-check – Assembly Analyzer @@ -59,9 +59,9 @@
  • Assembly Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/autoconf.html b/analyzers/autoconf.html index befb3eaec..42beebf99 100644 --- a/analyzers/autoconf.html +++ b/analyzers/autoconf.html @@ -1,13 +1,13 @@ - + dependency-check – Autoconf Analyzer @@ -59,9 +59,9 @@
  • Autoconf Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/central-analyzer.html b/analyzers/central-analyzer.html index 4ee996e78..d23e68a95 100644 --- a/analyzers/central-analyzer.html +++ b/analyzers/central-analyzer.html @@ -1,13 +1,13 @@ - + dependency-check – Central Analyzer @@ -59,9 +59,9 @@
  • Central Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/cmake.html b/analyzers/cmake.html index 8693fa50a..483fa395f 100644 --- a/analyzers/cmake.html +++ b/analyzers/cmake.html @@ -1,13 +1,13 @@ - + dependency-check – CMake Analyzer @@ -59,9 +59,9 @@
  • CMake Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/composer-lock.html b/analyzers/composer-lock.html index 458470a5e..68f0a8eff 100644 --- a/analyzers/composer-lock.html +++ b/analyzers/composer-lock.html @@ -1,13 +1,13 @@ - + dependency-check – Composer Lock Analyzer @@ -59,9 +59,9 @@
  • Composer Lock Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/index.html b/analyzers/index.html index b8c42595d..34a7c0ff5 100644 --- a/analyzers/index.html +++ b/analyzers/index.html @@ -1,13 +1,13 @@ - + dependency-check – File Type Analyzers @@ -59,9 +59,9 @@
  • File Type Analyzers
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/jar-analyzer.html b/analyzers/jar-analyzer.html index 94fdb7b16..0856efeee 100644 --- a/analyzers/jar-analyzer.html +++ b/analyzers/jar-analyzer.html @@ -1,13 +1,13 @@ - + dependency-check – Jar Analyzer @@ -59,9 +59,9 @@
  • Jar Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/nexus-analyzer.html b/analyzers/nexus-analyzer.html index 082714538..03be2f67a 100644 --- a/analyzers/nexus-analyzer.html +++ b/analyzers/nexus-analyzer.html @@ -1,13 +1,13 @@ - + dependency-check – Nexus Analyzer @@ -59,9 +59,9 @@
  • Nexus Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/nodejs.html b/analyzers/nodejs.html index e9fdd967a..e8edb969f 100644 --- a/analyzers/nodejs.html +++ b/analyzers/nodejs.html @@ -1,13 +1,13 @@ - + dependency-check – Node.js Analyzer @@ -59,9 +59,9 @@
  • Node.js Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/nuspec-analyzer.html b/analyzers/nuspec-analyzer.html index abe8c4b72..40eaa89cd 100644 --- a/analyzers/nuspec-analyzer.html +++ b/analyzers/nuspec-analyzer.html @@ -1,13 +1,13 @@ - + dependency-check – Nuspec Analyzer @@ -59,9 +59,9 @@
  • Nuspec Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/openssl.html b/analyzers/openssl.html index 256aba4ff..c8ed29d4f 100644 --- a/analyzers/openssl.html +++ b/analyzers/openssl.html @@ -1,13 +1,13 @@ - + dependency-check – OpenSSL Analyzer @@ -59,9 +59,9 @@
  • OpenSSL Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/python.html b/analyzers/python.html index 6bbe2ed5f..404df18df 100644 --- a/analyzers/python.html +++ b/analyzers/python.html @@ -1,13 +1,13 @@ - + dependency-check – Python Analyzer @@ -59,9 +59,9 @@
  • Python Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/analyzers/ruby-gemspec.html b/analyzers/ruby-gemspec.html index 16aa75e87..0987bc144 100644 --- a/analyzers/ruby-gemspec.html +++ b/analyzers/ruby-gemspec.html @@ -1,13 +1,13 @@ - + dependency-check – Ruby Gemspec Analyzer @@ -59,9 +59,9 @@
  • Ruby Gemspec Analyzer
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/current.txt b/current.txt index aaf8be715..6f96ed081 100644 --- a/current.txt +++ b/current.txt @@ -1 +1 @@ -1.3.5 \ No newline at end of file +1.3.6 \ No newline at end of file diff --git a/data/cachenvd.html b/data/cachenvd.html index e7f302bc2..748f2218d 100644 --- a/data/cachenvd.html +++ b/data/cachenvd.html @@ -1,13 +1,13 @@ - + dependency-check – Snapshotting the NVD @@ -59,9 +59,9 @@
  • Snapshotting the NVD
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/data/database.html b/data/database.html index ea3d9402b..79da60df3 100644 --- a/data/database.html +++ b/data/database.html @@ -1,13 +1,13 @@ - + dependency-check – Using a Database Server @@ -59,9 +59,9 @@
  • Using a Database Server
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/data/index.html b/data/index.html index d34e4b453..a57833e7e 100644 --- a/data/index.html +++ b/data/index.html @@ -1,13 +1,13 @@ - + dependency-check – Internet Access Required @@ -59,9 +59,9 @@
  • Internet Access Required
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/data/mirrornvd.html b/data/mirrornvd.html index 0942af311..c596de8ed 100644 --- a/data/mirrornvd.html +++ b/data/mirrornvd.html @@ -1,13 +1,13 @@ - + dependency-check – Mirroring the NVD from NIST @@ -59,9 +59,9 @@
  • Mirroring the NVD from NIST
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/data/proxy.html b/data/proxy.html index 7ec5e6e36..c56d41c50 100644 --- a/data/proxy.html +++ b/data/proxy.html @@ -1,13 +1,13 @@ - + dependency-check – Proxy Configuration @@ -59,9 +59,9 @@
  • Proxy Configuration
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/data/upgrade.html b/data/upgrade.html index 5d08c755f..c8c2b03ce 100644 --- a/data/upgrade.html +++ b/data/upgrade.html @@ -1,13 +1,13 @@ - + dependency-check – Database Upgrades @@ -59,9 +59,9 @@
  • Database Upgrades
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/dependency-analysis.html b/dependency-analysis.html index d792745fa..5583fe7a6 100644 --- a/dependency-analysis.html +++ b/dependency-analysis.html @@ -1,13 +1,13 @@ - + dependency-check – @@ -59,9 +59,9 @@
  • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/dependency-check-ant/apidocs/allclasses-frame.html b/dependency-check-ant/apidocs/allclasses-frame.html index 41582f29d..99504f9aa 100644 --- a/dependency-check-ant/apidocs/allclasses-frame.html +++ b/dependency-check-ant/apidocs/allclasses-frame.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Ant Task 1.3.5 API) - +All Classes (Dependency-Check Ant Task 1.3.6 API) + diff --git a/dependency-check-ant/apidocs/allclasses-noframe.html b/dependency-check-ant/apidocs/allclasses-noframe.html index 3f79fa0de..357f618dc 100644 --- a/dependency-check-ant/apidocs/allclasses-noframe.html +++ b/dependency-check-ant/apidocs/allclasses-noframe.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Ant Task 1.3.5 API) - +All Classes (Dependency-Check Ant Task 1.3.6 API) + diff --git a/dependency-check-ant/apidocs/constant-values.html b/dependency-check-ant/apidocs/constant-values.html index 9d23e44c8..15587ed4a 100644 --- a/dependency-check-ant/apidocs/constant-values.html +++ b/dependency-check-ant/apidocs/constant-values.html @@ -2,10 +2,10 @@ - + -Constant Field Values (Dependency-Check Ant Task 1.3.5 API) - +Constant Field Values (Dependency-Check Ant Task 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-ant/apidocs/org/owasp/dependencycheck/ant/logging/package-summary.html b/dependency-check-ant/apidocs/org/owasp/dependencycheck/ant/logging/package-summary.html index 66ad13be6..25265e3a0 100644 --- a/dependency-check-ant/apidocs/org/owasp/dependencycheck/ant/logging/package-summary.html +++ b/dependency-check-ant/apidocs/org/owasp/dependencycheck/ant/logging/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.ant.logging (Dependency-Check Ant Task 1.3.5 API) - +org.owasp.dependencycheck.ant.logging (Dependency-Check Ant Task 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 652047745..a32293378 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,10 +2,10 @@ - + -org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.3.5 API) - +org.owasp.dependencycheck.taskdefs (Dependency-Check Ant Task 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-ant/apidocs/org/slf4j/impl/package-summary.html b/dependency-check-ant/apidocs/org/slf4j/impl/package-summary.html index c4b1da345..b12aa57a4 100644 --- a/dependency-check-ant/apidocs/org/slf4j/impl/package-summary.html +++ b/dependency-check-ant/apidocs/org/slf4j/impl/package-summary.html @@ -2,10 +2,10 @@ - + -org.slf4j.impl (Dependency-Check Ant Task 1.3.5 API) - +org.slf4j.impl (Dependency-Check Ant Task 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-ant/apidocs/overview-summary.html b/dependency-check-ant/apidocs/overview-summary.html index c92d654f8..4b48d1be7 100644 --- a/dependency-check-ant/apidocs/overview-summary.html +++ b/dependency-check-ant/apidocs/overview-summary.html @@ -2,10 +2,10 @@ - + -Overview (Dependency-Check Ant Task 1.3.5 API) - +Overview (Dependency-Check Ant Task 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    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 b108ce4b6..7176677af 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 @@ -42,6 +42,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/frame-summary-org.slf4j.impl.html b/dependency-check-ant/cobertura/frame-summary-org.slf4j.impl.html index 4e13da75e..fa1c11415 100644 --- a/dependency-check-ant/cobertura/frame-summary-org.slf4j.impl.html +++ b/dependency-check-ant/cobertura/frame-summary-org.slf4j.impl.html @@ -37,6 +37,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/frame-summary.html b/dependency-check-ant/cobertura/frame-summary.html index b473257e3..107b27518 100644 --- a/dependency-check-ant/cobertura/frame-summary.html +++ b/dependency-check-ant/cobertura/frame-summary.html @@ -16,8 +16,8 @@ - - + + @@ -27,6 +27,6 @@ var packageTable = new SortableTable(document.getElementById("packageResults"), ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerAdapter.html b/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerAdapter.html index 8b75ccf99..2aab2fefb 100644 --- a/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerAdapter.html +++ b/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerAdapter.html @@ -12,7 +12,7 @@
     
    Package # Classes Line Coverage Branch Coverage Complexity
    All Packages7
    46%
    219/468
    42%
    55/130
    		1.573
    org.owasp.dependencycheck.ant.logging2
    37%
    39/104
    28%
    14/50
    		1.735
    All Packages7
    46%
    217/468
    41%
    54/130
    		1.573
    org.owasp.dependencycheck.ant.logging2
    35%
    37/104
    26%
    13/50
    		1.735
    org.owasp.dependencycheck.taskdefs4
    47%
    167/351
    51%
    41/80
    		1.548
    org.slf4j.impl1
    100%
    13/13
    N/A
    N/A
    		1
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    AntLoggerAdapter
    35%
    35/100
    28%
    14/50
    		1.781
    AntLoggerAdapter
    33%
    33/100
    26%
    13/50
    		1.781
     
    @@ -164,12 +164,12 @@ 
         @Override
     80   
         public void trace(String format, Object arg1, Object arg2) {
    -  81  13 
             if (task != null) {
    +  81  0 
             if (task != null) {
     82  0 
                 final FormattingTuple tp = MessageFormatter.format(format, arg1, arg2);
     83  0 
                 task.log(tp.getMessage(), Project.MSG_VERBOSE);
     84   
             }
    -  85  13 
         }
    +  85  0 
         }
     86   
     
     87   @@ -465,6 +465,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerFactory.html b/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerFactory.html index 362a7a783..06199530c 100644 --- a/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerFactory.html +++ b/dependency-check-ant/cobertura/org.owasp.dependencycheck.ant.logging.AntLoggerFactory.html @@ -127,6 +127,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Check.html b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Check.html index d22cc4b73..e0727cc24 100644 --- a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Check.html +++ b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Check.html @@ -1717,6 +1717,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Purge.html b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Purge.html index ebfd4283a..2e8b98fd9 100644 --- a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Purge.html +++ b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Purge.html @@ -235,6 +235,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Update.html b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Update.html index 5c817cfb3..484e6c84c 100644 --- a/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Update.html +++ b/dependency-check-ant/cobertura/org.owasp.dependencycheck.taskdefs.Update.html @@ -815,6 +815,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/cobertura/org.slf4j.impl.StaticLoggerBinder.html b/dependency-check-ant/cobertura/org.slf4j.impl.StaticLoggerBinder.html index 068087b55..fdd8e0a27 100644 --- a/dependency-check-ant/cobertura/org.slf4j.impl.StaticLoggerBinder.html +++ b/dependency-check-ant/cobertura/org.slf4j.impl.StaticLoggerBinder.html @@ -212,6 +212,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:28 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:11 PM.
    diff --git a/dependency-check-ant/config-purge.html b/dependency-check-ant/config-purge.html index 5887796f0..59119b05f 100644 --- a/dependency-check-ant/config-purge.html +++ b/dependency-check-ant/config-purge.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Configuration @@ -52,7 +52,7 @@ diff --git a/dependency-check-ant/config-update.html b/dependency-check-ant/config-update.html index 2480d25f6..4135946a2 100644 --- a/dependency-check-ant/config-update.html +++ b/dependency-check-ant/config-update.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Configuration @@ -52,7 +52,7 @@ diff --git a/dependency-check-ant/configuration.html b/dependency-check-ant/configuration.html index 28560b044..0ea4d3453 100644 --- a/dependency-check-ant/configuration.html +++ b/dependency-check-ant/configuration.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Configuration @@ -52,7 +52,7 @@ diff --git a/dependency-check-ant/dependency-analysis.html b/dependency-check-ant/dependency-analysis.html index b15738b66..7d24864ed 100644 --- a/dependency-check-ant/dependency-analysis.html +++ b/dependency-check-ant/dependency-analysis.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Dependencies Report @@ -52,7 +52,7 @@ @@ -242,7 +242,7 @@ org.owasp dependency-check-core -1.3.5 +1.3.6 compile jar @@ -250,7 +250,7 @@ org.owasp dependency-check-utils -1.3.5 +1.3.6 compile jar @@ -258,7 +258,7 @@ org.owasp dependency-check-core -1.3.5 +1.3.6 test tests test-jar @@ -301,7 +301,7 @@ org.slf4j slf4j-api -1.7.16 +1.7.21 compile jar diff --git a/dependency-check-ant/dependency-updates-report.html b/dependency-check-ant/dependency-updates-report.html index 0a7e89e2c..28c9a7891 100644 --- a/dependency-check-ant/dependency-updates-report.html +++ b/dependency-check-ant/dependency-updates-report.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Dependency Updates Report @@ -52,7 +52,7 @@ @@ -233,7 +233,7 @@ # of dependencies using the latest version available -18 +23 # of dependencies where the next version available is smaller than an incremental version update @@ -241,15 +241,15 @@ # of dependencies where the next version available is an incremental version update -7 +3 # of dependencies where the next version available is a minor version update -8 +6 # of dependencies where the next version available is a major version update -0 +1

    Dependency Management

    @@ -266,27 +266,27 @@ - + - + - + - + - + - + @@ -338,6 +338,18 @@ + + + + + + + + + + + + @@ -349,7 +361,7 @@ - + @@ -361,7 +373,7 @@ - + @@ -373,7 +385,7 @@ - + @@ -385,11 +397,11 @@ - + - + @@ -397,7 +409,7 @@ - + @@ -409,7 +421,7 @@ - + @@ -421,7 +433,7 @@ - + @@ -433,7 +445,7 @@ - + @@ -445,7 +457,7 @@ - + @@ -457,7 +469,7 @@ - + @@ -469,7 +481,7 @@ - + @@ -481,7 +493,7 @@ - + @@ -493,7 +505,7 @@ - + @@ -505,7 +517,7 @@ - + @@ -517,18 +529,6 @@ - - - - - - - - - - - - @@ -578,16 +578,16 @@ - + - + - + @@ -602,27 +602,27 @@ - + - + - + - + - + - + @@ -668,7 +668,7 @@ - + @@ -680,7 +680,7 @@ - + @@ -708,7 +708,7 @@
    Next Minor Next Major
    ch.qos.logback logback-classic1.1.51.1.7 jar 1.1.6
    ch.qos.logback logback-core1.1.51.1.7 jar 1.1.6
    commons-collectionscommons-collections3.2.2jar20030418.083655
    commons-io commons-io
    junit junit
    org.apache.ant ant
    org.apache.ant ant-testutil
    org.apache.commons commons-compress1.101.11 jar
    org.apache.commons commons-lang3 3.4
    org.apache.lucene lucene-analyzers-common 4.8.0 5.0.0
    org.apache.lucene lucene-core 4.8.0 5.0.0
    org.apache.lucene lucene-queryparser 4.8.0 5.0.0
    org.apache.lucene lucene-test-framework 4.8.0 5.0.0
    org.apache.maven maven-core3.3.9
    org.apache.maven maven-plugin-api3.3.9
    org.apache.maven maven-settings3.3.9
    org.apache.maven.plugin-testing maven-plugin-testing-harness
    org.apache.maven.plugin-tools maven-plugin-annotations
    org.apache.maven.pluginsmaven-site-plugin3.4jar3.5
    org.apache.maven.reporting
    org.jmockit jmockit1.211.22 test jar 1.22
    org.slf4j slf4j-api1.7.161.7.21 jar 1.7.18
    org.slf4j slf4j-simple1.7.161.7.21 jar 1.7.18
    org.owasp dependency-check-core1.3.51.3.6 compile jar org.owasp dependency-check-utils1.3.51.3.6 compile jar
    - + @@ -717,7 +717,7 @@ - + @@ -726,16 +726,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-classic
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    ch.qos.logback:logback-core

    - + @@ -744,7 +741,7 @@ - + @@ -753,10 +750,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-core
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    com.google.code.findbugs:annotations

    @@ -857,6 +851,33 @@
    Type jar
    +

    commons-collections:commons-collections

    + + + + + + + + + + + + + + + + + + + + + + + + +
    Status There is at least one newer major version available. Major updates are rarely passive.
    Group Idcommons-collections
    Artifact Idcommons-collections
    Current Version3.2.2
    Scope
    Classifier
    Typejar
    Newer versions20030418.083655 Next Major
    20031027.000000
    20040102.233541
    20040616 Latest Major
    +

    commons-io:commons-io

    @@ -966,7 +987,7 @@ - + @@ -1029,7 +1050,7 @@ -
    commons-compress
    Current Version1.10
    1.11
    Scope
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-core

    @@ -1056,7 +1077,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-queryparser

    @@ -1083,7 +1104,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-test-framework

    @@ -1110,7 +1131,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.maven:maven-core

    @@ -1241,33 +1262,6 @@
    Type jar
    -

    org.apache.maven.plugins:maven-site-plugin

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Idorg.apache.maven.plugins
    Artifact Idmaven-site-plugin
    Current Version3.4
    Scope
    Classifier
    Typejar
    Newer versions3.5 Next Minor
    -

    org.apache.maven.reporting:maven-reporting-api

    @@ -1368,7 +1362,7 @@
    - + @@ -1377,7 +1371,7 @@ - + @@ -1386,10 +1380,7 @@ - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
     No newer versions available.
    Group Id org.jmockit
    jmockit
    Current Version1.21
    1.22
    Scope test
    Typejar
    Newer versions1.22 Next Minor
    +jar

    org.jsoup:jsoup

    @@ -1428,7 +1419,7 @@ - + @@ -1452,7 +1443,7 @@ - + @@ -1467,7 +1458,7 @@
    dependency-check-core
    Current Version1.3.5
    1.3.6
    Scope compile
    dependency-check-utils
    Current Version1.3.5
    1.3.6
    Scope compile
    - + @@ -1476,7 +1467,7 @@ - + @@ -1485,16 +1476,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-api
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.slf4j:slf4j-simple

    - + @@ -1503,7 +1491,7 @@ - + @@ -1512,10 +1500,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-simple
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.sonatype.plexus:plexus-sec-dispatcher

    diff --git a/dependency-check-ant/findbugs.html b/dependency-check-ant/findbugs.html index 183fe58ef..7b7545826 100644 --- a/dependency-check-ant/findbugs.html +++ b/dependency-check-ant/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-ant – FindBugs Bug Detector Report @@ -52,7 +52,7 @@ diff --git a/dependency-check-ant/index.html b/dependency-check-ant/index.html index 6dcfbb7db..bfa37045e 100644 --- a/dependency-check-ant/index.html +++ b/dependency-check-ant/index.html @@ -1,13 +1,13 @@ - + dependency-check-ant – About @@ -52,7 +52,7 @@ @@ -153,7 +153,7 @@
      -
    1. Download dependency-check-ant from bintray here.
      2. +
    2. Download dependency-check-ant from bintray here.
    3. Unzip the archive
      4. diff --git a/dependency-check-ant/integration.html b/dependency-check-ant/integration.html index 41fac745a..bcc02fc93 100644 --- a/dependency-check-ant/integration.html +++ b/dependency-check-ant/integration.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Continuous Integration + dependency-check-ant – CI Management @@ -52,7 +52,7 @@ @@ -104,14 +104,14 @@
    4. - Continuous Integration + CI Management
    5. - + - Project Summary + Summary
    6. @@ -123,30 +123,30 @@
    7. - + - Issue Tracking + Issue Management
    8. - + - Project Team + Team
    9. - + - Source Repository + Source Code Management
    10. - + - Project License + Licenses
      11. diff --git a/dependency-check-ant/issue-tracking.html b/dependency-check-ant/issue-tracking.html index 25d5014c1..bd01a77bf 100644 --- a/dependency-check-ant/issue-tracking.html +++ b/dependency-check-ant/issue-tracking.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Issue Tracking + dependency-check-ant – Issue Management @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
    11. - + - Continuous Integration + CI Management
    12. - + - Project Summary + Summary
    13. @@ -125,28 +125,28 @@
    14. - Issue Tracking + Issue Management
    15. - + - Project Team + Team
    16. - + - Source Repository + Source Code Management
    17. - + - Project License + Licenses
      18. @@ -202,8 +202,8 @@

      Overview

      This project uses github to manage its issues.

      -

      Issue Tracking

      -

      Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.

      +

      Issue Management

      +

      Issues, bugs, and feature requests should be submitted to the following issue management system for this project.

      https://github.com/jeremylong/DependencyCheck/issues
      diff --git a/dependency-check-ant/license.html b/dependency-check-ant/license.html index a257aaf1c..eb42d8fa3 100644 --- a/dependency-check-ant/license.html +++ b/dependency-check-ant/license.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Project License + dependency-check-ant – Project Licenses @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
    18. - + - Continuous Integration + CI Management
    19. - + - Project Summary + Summary
    20. @@ -125,28 +125,28 @@
    21. - + - Issue Tracking + Issue Management
    22. - + - Project Team + Team
    23. - + - Source Repository + Source Code Management
    24. - Project License + Licenses
      25. @@ -197,15 +197,15 @@
      -
      + +

      Overview

      Typically the licenses listed for the project are that of the project itself, and not of dependencies.

      -

      Project License

      +

      Project Licenses

      The Apache Software License, Version 2.0

      -
      -
      +
                                        Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/dependency-check-ant/mail-lists.html b/dependency-check-ant/mail-lists.html
index 11e1d6390..9667f4f5f 100644
--- a/dependency-check-ant/mail-lists.html
+++ b/dependency-check-ant/mail-lists.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-ant – Project Mailing Lists
     
@@ -52,7 +52,7 @@
         
        
               
                               
      • 
-                    
+                    
         
                     /
       
        • 
@@ -64,9 +64,9 @@
         
      • Project Mailing Lists
        • 
         
               
-                  
      • | Last Published: 2016-03-05
        • 
+                  
      • | Last Published: 2016-04-09
        • 
               
      • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
        • 
             
                             
      
@@ -104,16 +104,16 @@
                     
       
    25. 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
      26. 
                     
       
    26. 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
      27. 
                     
       
    27. 
@@ -123,30 +123,30 @@
                     
       
    28. 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
      29. 
                     
       
    29. 
   
-                          
+                          
           
-        Project Team
+        Team
             
      30. 
                     
       
    30. 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
      31. 
                     
       
    31. 
   
-                          
+                          
           
-        Project License
+        Licenses
             
      32. 
               
         
diff --git a/dependency-check-ant/plugin-updates-report.html b/dependency-check-ant/plugin-updates-report.html
index 040cfcff3..21a1d389d 100644
--- a/dependency-check-ant/plugin-updates-report.html
+++ b/dependency-check-ant/plugin-updates-report.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-ant – Plugin Updates Report
     
@@ -52,7 +52,7 @@
         
        
               
                               
      • 
-                    
+                    
         
                     /
       
        • 
@@ -64,9 +64,9 @@
         
      • Plugin Updates Report
        • 
         
               
-                  
      • | Last Published: 2016-03-05
        • 
+                  
      • | Last Published: 2016-04-09
        • 
               
      • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
        • 
             
                             
      
diff --git a/dependency-check-ant/project-info.html b/dependency-check-ant/project-info.html
index 6448c5138..0cfce4146 100644
--- a/dependency-check-ant/project-info.html
+++ b/dependency-check-ant/project-info.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-ant – Project Information
     
@@ -52,7 +52,7 @@
         
        
               
                               
      • 
-                    
+                    
         
                     /
       
        • 
@@ -64,9 +64,9 @@
         
      • Project Information
        • 
         
               
-                  
      • | Last Published: 2016-03-05
        • 
+                  
      • | Last Published: 2016-04-09
        • 
               
      • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
        • 
             
                             
      
@@ -102,16 +102,16 @@
                     
       
    32. 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
      33. 
                     
       
    33. 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
      34. 
                     
       
    34. 
@@ -123,30 +123,30 @@
                     
       
    35. 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
      36. 
                     
       
    36. 
   
-                          
+                          
           
-        Project Team
+        Team
             
      37. 
                     
       
    37. 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
      38. 
                     
       
    38. 
   
-                          
+                          
           
-        Project License
+        Licenses
             
      39. 
               
         
@@ -208,25 +208,25 @@
    - + - + - + - + - + - +
    Document Description
    Continuous IntegrationCI Management This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
    Project SummarySummary This document lists other related information of this project
    Mailing Lists This document provides subscription and archive information for this project's mailing lists.
    Issue TrackingIssue Management This document provides information on the issue management system used in this project.
    Project TeamTeam This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
    Source RepositorySource Code Management This document lists ways to access the online source repository.
    Project LicenseLicenses This document lists the project license(s).
    diff --git a/dependency-check-ant/project-reports.html b/dependency-check-ant/project-reports.html index f7b2a4381..b4575e012 100644 --- a/dependency-check-ant/project-reports.html +++ b/dependency-check-ant/project-reports.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Generated Reports @@ -52,7 +52,7 @@ diff --git a/dependency-check-ant/project-summary.html b/dependency-check-ant/project-summary.html index 113f85e98..b4282dd6f 100644 --- a/dependency-check-ant/project-summary.html +++ b/dependency-check-ant/project-summary.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Project Summary @@ -52,7 +52,7 @@ @@ -104,14 +104,14 @@
  • - + - Continuous Integration + CI Management
  • - Project Summary + Summary
  • @@ -123,30 +123,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -241,7 +241,7 @@ dependency-check-ant Version -1.3.5 +1.3.6 Type jar diff --git a/dependency-check-ant/source-repository.html b/dependency-check-ant/source-repository.html index e24dd2ccb..9b6ed3b5f 100644 --- a/dependency-check-ant/source-repository.html +++ b/dependency-check-ant/source-repository.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Source Repository + dependency-check-ant – Source Code Management @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-ant/surefire-report.html b/dependency-check-ant/surefire-report.html index dda1117b0..abb6db89a 100644 --- a/dependency-check-ant/surefire-report.html +++ b/dependency-check-ant/surefire-report.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Surefire Report @@ -52,7 +52,7 @@ @@ -262,7 +262,7 @@ function toggleDisplay(elementId) { 0 0 100% -19.809
    +18.409

    Note: failures are anticipated and checked for with assertions while errors are unanticipated.


    Package List

    @@ -283,7 +283,7 @@ function toggleDisplay(elementId) { 0 0 100% -19.809
    +18.409

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

    org.owasp.dependencycheck.taskdefs

    @@ -305,7 +305,7 @@ function toggleDisplay(elementId) { 0 0 100% -19.809

    +18.409

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -315,19 +315,19 @@ function toggleDisplay(elementId) { testGetFailBuildOnCVSS -0.569 +0.67 testAddDirSet -9.175 +8.209 testAddFileSet -5.838 +5.416 testAddFileList -4.122

    +3.989
    diff --git a/dependency-check-ant/taglist.html b/dependency-check-ant/taglist.html index a4661c006..f2850e0d0 100644 --- a/dependency-check-ant/taglist.html +++ b/dependency-check-ant/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Tag List report @@ -52,7 +52,7 @@ diff --git a/dependency-check-ant/team-list.html b/dependency-check-ant/team-list.html index 8355461ae..283691c53 100644 --- a/dependency-check-ant/team-list.html +++ b/dependency-check-ant/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Project Team @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -199,9 +199,9 @@
    -

    The Team

    +

    Project Team

    A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.

    -

    The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    +

    The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    Members

    The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.

    diff --git a/dependency-check-ant/xref-test/index.html b/dependency-check-ant/xref-test/index.html index 5b300b084..22912bedb 100644 --- a/dependency-check-ant/xref-test/index.html +++ b/dependency-check-ant/xref-test/index.html @@ -4,7 +4,7 @@ - Dependency-Check Ant Task 1.3.5 Reference + Dependency-Check Ant Task 1.3.6 Reference diff --git a/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html b/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html index 03d65f856..c0f72544b 100644 --- a/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html +++ b/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check Ant Task 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html b/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html index 519fc4511..9b5ccd6f1 100644 --- a/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html +++ b/dependency-check-ant/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check Ant Task 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/dependency-check-ant/xref-test/overview-frame.html b/dependency-check-ant/xref-test/overview-frame.html index 8caa3c46a..6c48cdd09 100644 --- a/dependency-check-ant/xref-test/overview-frame.html +++ b/dependency-check-ant/xref-test/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference + Dependency-Check Ant Task 1.3.6 Reference diff --git a/dependency-check-ant/xref-test/overview-summary.html b/dependency-check-ant/xref-test/overview-summary.html index ea8a7b15e..b0e51e6e5 100644 --- a/dependency-check-ant/xref-test/overview-summary.html +++ b/dependency-check-ant/xref-test/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference + Dependency-Check Ant Task 1.3.6 Reference @@ -24,7 +24,7 @@
    -

    Dependency-Check Ant Task 1.3.5 Reference

    +

    Dependency-Check Ant Task 1.3.6 Reference

    diff --git a/dependency-check-ant/xref/index.html b/dependency-check-ant/xref/index.html index 5b300b084..22912bedb 100644 --- a/dependency-check-ant/xref/index.html +++ b/dependency-check-ant/xref/index.html @@ -4,7 +4,7 @@ - Dependency-Check Ant Task 1.3.5 Reference + Dependency-Check Ant Task 1.3.6 Reference diff --git a/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-frame.html b/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-frame.html index f3fc588de..c157c645f 100644 --- a/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-frame.html +++ b/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.owasp.dependencycheck.ant.logging + Dependency-Check Ant Task 1.3.6 Reference Package org.owasp.dependencycheck.ant.logging diff --git a/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-summary.html b/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-summary.html index 4835d8c52..de31df2d0 100644 --- a/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-summary.html +++ b/dependency-check-ant/xref/org/owasp/dependencycheck/ant/logging/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.owasp.dependencycheck.ant.logging + Dependency-Check Ant Task 1.3.6 Reference Package org.owasp.dependencycheck.ant.logging diff --git a/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-frame.html b/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-frame.html index 0637546ca..2da99250a 100644 --- a/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-frame.html +++ b/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check Ant Task 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-summary.html b/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-summary.html index e53c35cf5..9bb3b2a16 100644 --- a/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-summary.html +++ b/dependency-check-ant/xref/org/owasp/dependencycheck/taskdefs/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check Ant Task 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/dependency-check-ant/xref/org/slf4j/impl/package-frame.html b/dependency-check-ant/xref/org/slf4j/impl/package-frame.html index dafbad831..c09b0bce6 100644 --- a/dependency-check-ant/xref/org/slf4j/impl/package-frame.html +++ b/dependency-check-ant/xref/org/slf4j/impl/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.slf4j.impl + Dependency-Check Ant Task 1.3.6 Reference Package org.slf4j.impl diff --git a/dependency-check-ant/xref/org/slf4j/impl/package-summary.html b/dependency-check-ant/xref/org/slf4j/impl/package-summary.html index cd86a649d..0a4e67614 100644 --- a/dependency-check-ant/xref/org/slf4j/impl/package-summary.html +++ b/dependency-check-ant/xref/org/slf4j/impl/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference Package org.slf4j.impl + Dependency-Check Ant Task 1.3.6 Reference Package org.slf4j.impl diff --git a/dependency-check-ant/xref/overview-frame.html b/dependency-check-ant/xref/overview-frame.html index 87c96853a..79914866d 100644 --- a/dependency-check-ant/xref/overview-frame.html +++ b/dependency-check-ant/xref/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference + Dependency-Check Ant Task 1.3.6 Reference diff --git a/dependency-check-ant/xref/overview-summary.html b/dependency-check-ant/xref/overview-summary.html index bd61260b0..dfd95093e 100644 --- a/dependency-check-ant/xref/overview-summary.html +++ b/dependency-check-ant/xref/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Ant Task 1.3.5 Reference + Dependency-Check Ant Task 1.3.6 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check Ant Task 1.3.5 Reference

    +

    Dependency-Check Ant Task 1.3.6 Reference

    diff --git a/dependency-check-cli/apidocs/allclasses-frame.html b/dependency-check-cli/apidocs/allclasses-frame.html index 45e6a4034..97f859e44 100644 --- a/dependency-check-cli/apidocs/allclasses-frame.html +++ b/dependency-check-cli/apidocs/allclasses-frame.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Command Line 1.3.5 API) - +All Classes (Dependency-Check Command Line 1.3.6 API) + diff --git a/dependency-check-cli/apidocs/allclasses-noframe.html b/dependency-check-cli/apidocs/allclasses-noframe.html index 1d9e50eb9..61a519b13 100644 --- a/dependency-check-cli/apidocs/allclasses-noframe.html +++ b/dependency-check-cli/apidocs/allclasses-noframe.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Command Line 1.3.5 API) - +All Classes (Dependency-Check Command Line 1.3.6 API) + diff --git a/dependency-check-cli/apidocs/constant-values.html b/dependency-check-cli/apidocs/constant-values.html index 5a1b16a41..e35cdbd0f 100644 --- a/dependency-check-cli/apidocs/constant-values.html +++ b/dependency-check-cli/apidocs/constant-values.html @@ -2,10 +2,10 @@ - + -Constant Field Values (Dependency-Check Command Line 1.3.5 API) - +Constant Field Values (Dependency-Check Command Line 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 833c5f16e..162cdf3fc 100644 --- a/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-summary.html +++ b/dependency-check-cli/apidocs/org/owasp/dependencycheck/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck (Dependency-Check Command Line 1.3.5 API) - +org.owasp.dependencycheck (Dependency-Check Command Line 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:27 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:10 PM.
    diff --git a/dependency-check-cli/cobertura/frame-summary.html b/dependency-check-cli/cobertura/frame-summary.html index e4c5cee25..1fd99115d 100644 --- a/dependency-check-cli/cobertura/frame-summary.html +++ b/dependency-check-cli/cobertura/frame-summary.html @@ -25,6 +25,6 @@ var packageTable = new SortableTable(document.getElementById("packageResults"), ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:27 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:10 PM.
    diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html index 43403747a..e7caecec0 100644 --- a/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html +++ b/dependency-check-cli/cobertura/org.owasp.dependencycheck.App.html @@ -648,6 +648,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:27 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:10 PM.
    diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html index ee723acb2..82bacb498 100644 --- a/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html +++ b/dependency-check-cli/cobertura/org.owasp.dependencycheck.CliParser.html @@ -2261,6 +2261,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:27 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:10 PM.
    diff --git a/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html b/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html index 206cef213..b025d6b30 100644 --- a/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html +++ b/dependency-check-cli/cobertura/org.owasp.dependencycheck.InvalidScanPathException.html @@ -143,6 +143,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:27 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:10 PM.
    diff --git a/dependency-check-cli/dependency-analysis.html b/dependency-check-cli/dependency-analysis.html index b4f2a0e2d..67c5c1374 100644 --- a/dependency-check-cli/dependency-analysis.html +++ b/dependency-check-cli/dependency-analysis.html @@ -1,13 +1,13 @@ - + dependency-check-cli – Dependencies Report @@ -52,7 +52,7 @@ @@ -257,7 +257,7 @@ org.owasp dependency-check-core -1.3.5 +1.3.6 compile jar @@ -265,7 +265,7 @@ org.owasp dependency-check-utils -1.3.5 +1.3.6 compile jar @@ -273,7 +273,7 @@ org.slf4j slf4j-api -1.7.16 +1.7.21 compile jar @@ -281,7 +281,7 @@ ch.qos.logback logback-core -1.1.5 +1.1.7 compile jar @@ -289,7 +289,7 @@ ch.qos.logback logback-classic -1.1.5 +1.1.7 compile jar diff --git a/dependency-check-cli/dependency-updates-report.html b/dependency-check-cli/dependency-updates-report.html index 84106c13a..662644371 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 @@ -52,7 +52,7 @@ @@ -240,7 +240,7 @@ # of dependencies using the latest version available -18 +23 # of dependencies where the next version available is smaller than an incremental version update @@ -248,15 +248,15 @@ # of dependencies where the next version available is an incremental version update -7 +3 # of dependencies where the next version available is a minor version update -8 +6 # of dependencies where the next version available is a major version update -0 +1

    Dependency Management

    @@ -273,27 +273,27 @@ - + - + - + - + - + - + @@ -345,6 +345,18 @@ + + + + + + + + + + + + @@ -356,7 +368,7 @@ - + @@ -368,7 +380,7 @@ - + @@ -380,7 +392,7 @@ - + @@ -392,11 +404,11 @@ - + - + @@ -404,7 +416,7 @@ - + @@ -416,7 +428,7 @@ - + @@ -428,7 +440,7 @@ - + @@ -440,7 +452,7 @@ - + @@ -452,7 +464,7 @@ - + @@ -464,7 +476,7 @@ - + @@ -476,7 +488,7 @@ - + @@ -488,7 +500,7 @@ - + @@ -500,7 +512,7 @@ - + @@ -512,7 +524,7 @@ - + @@ -524,18 +536,6 @@ - - - - - - - - - - - - @@ -585,16 +585,16 @@ - + - + - + @@ -609,27 +609,27 @@ - + - + - + - + - + - + @@ -675,7 +675,7 @@ - + @@ -687,7 +687,7 @@ - + @@ -715,7 +715,7 @@
    Next Minor Next Major
    ch.qos.logback logback-classic1.1.51.1.7 jar 1.1.6
    ch.qos.logback logback-core1.1.51.1.7 jar 1.1.6
    commons-collectionscommons-collections3.2.2jar20030418.083655
    commons-io commons-io
    junit junit
    org.apache.ant ant
    org.apache.ant ant-testutil
    org.apache.commons commons-compress1.101.11 jar
    org.apache.commons commons-lang3 3.4
    org.apache.lucene lucene-analyzers-common 4.8.0 5.0.0
    org.apache.lucene lucene-core 4.8.0 5.0.0
    org.apache.lucene lucene-queryparser 4.8.0 5.0.0
    org.apache.lucene lucene-test-framework 4.8.0 5.0.0
    org.apache.maven maven-core3.3.9
    org.apache.maven maven-plugin-api3.3.9
    org.apache.maven maven-settings3.3.9
    org.apache.maven.plugin-testing maven-plugin-testing-harness
    org.apache.maven.plugin-tools maven-plugin-annotations
    org.apache.maven.pluginsmaven-site-plugin3.4jar3.5
    org.apache.maven.reporting
    org.jmockit jmockit1.211.22 test jar 1.22
    org.slf4j slf4j-api1.7.161.7.21 jar 1.7.18
    org.slf4j slf4j-simple1.7.161.7.21 jar 1.7.18
    org.owasp dependency-check-core1.3.51.3.6 compile jar org.owasp dependency-check-utils1.3.51.3.6 compile jar
    - + @@ -724,7 +724,7 @@ - + @@ -733,16 +733,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-classic
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    ch.qos.logback:logback-core

    - + @@ -751,7 +748,7 @@ - + @@ -760,10 +757,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-core
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    com.google.code.findbugs:annotations

    @@ -864,6 +858,33 @@
    Type jar
    +

    commons-collections:commons-collections

    + + + + + + + + + + + + + + + + + + + + + + + + +
    Status There is at least one newer major version available. Major updates are rarely passive.
    Group Idcommons-collections
    Artifact Idcommons-collections
    Current Version3.2.2
    Scope
    Classifier
    Typejar
    Newer versions20030418.083655 Next Major
    20031027.000000
    20040102.233541
    20040616 Latest Major
    +

    commons-io:commons-io

    @@ -973,7 +994,7 @@ - + @@ -1036,7 +1057,7 @@ -
    commons-compress
    Current Version1.10
    1.11
    Scope
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-core

    @@ -1063,7 +1084,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-queryparser

    @@ -1090,7 +1111,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-test-framework

    @@ -1117,7 +1138,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.maven:maven-core

    @@ -1248,33 +1269,6 @@
    Type jar
    -

    org.apache.maven.plugins:maven-site-plugin

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Idorg.apache.maven.plugins
    Artifact Idmaven-site-plugin
    Current Version3.4
    Scope
    Classifier
    Typejar
    Newer versions3.5 Next Minor
    -

    org.apache.maven.reporting:maven-reporting-api

    @@ -1375,7 +1369,7 @@
    - + @@ -1384,7 +1378,7 @@ - + @@ -1393,10 +1387,7 @@ - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
     No newer versions available.
    Group Id org.jmockit
    jmockit
    Current Version1.21
    1.22
    Scope test
    Typejar
    Newer versions1.22 Next Minor
    +jar

    org.jsoup:jsoup

    @@ -1435,7 +1426,7 @@ - + @@ -1459,7 +1450,7 @@ - + @@ -1474,7 +1465,7 @@
    dependency-check-core
    Current Version1.3.5
    1.3.6
    Scope compile
    dependency-check-utils
    Current Version1.3.5
    1.3.6
    Scope compile
    - + @@ -1483,7 +1474,7 @@ - + @@ -1492,16 +1483,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-api
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.slf4j:slf4j-simple

    - + @@ -1510,7 +1498,7 @@ - + @@ -1519,10 +1507,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-simple
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.sonatype.plexus:plexus-sec-dispatcher

    diff --git a/dependency-check-cli/findbugs.html b/dependency-check-cli/findbugs.html index 3ddaf633c..7dc2ec137 100644 --- a/dependency-check-cli/findbugs.html +++ b/dependency-check-cli/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-cli – FindBugs Bug Detector Report @@ -52,7 +52,7 @@ diff --git a/dependency-check-cli/index.html b/dependency-check-cli/index.html index 680ec7c44..a7a7945c4 100644 --- a/dependency-check-cli/index.html +++ b/dependency-check-cli/index.html @@ -1,13 +1,13 @@ - + dependency-check-cli – About @@ -52,7 +52,7 @@ @@ -150,7 +150,7 @@

    About

    OWASP dependency-check-cli is an command line tool that uses dependency-check-core to detect publicly disclosed vulnerabilities associated with the scanned project dependencies. The tool will generate a report listing the dependency, any identified Common Platform Enumeration (CPE) identifiers, and the associated Common Vulnerability and Exposure (CVE) entries.

    Installation & Usage

    -

    Download the dependency-check command line tool here. Extract the zip file to a location on your computer and put the ‘bin’ directory into the path environment variable. On *nix systems you will likely need to make the shell script executable:

    +

    Download the dependency-check command line tool here. Extract the zip file to a location on your computer and put the ‘bin’ directory into the path environment variable. On *nix systems you will likely need to make the shell script executable:

    $ chmod +777 dependency-check.sh
diff --git a/dependency-check-cli/integration.html b/dependency-check-cli/integration.html
index 7b03248fe..dc34f8703 100644
--- a/dependency-check-cli/integration.html
+++ b/dependency-check-cli/integration.html
@@ -1,15 +1,15 @@
 
 
 
   
     
     
-    
+    
     
-    dependency-check-cli – Continuous Integration
+    dependency-check-cli – CI Management
     
     
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -61,12 +61,12 @@
         dependency-check
                     /
       
-        
    • Continuous Integration
      • 
+        
    • CI Management
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -104,14 +104,14 @@
                     
       
  • 
   
-            Continuous Integration
+            CI Management
           
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -123,30 +123,30 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
diff --git a/dependency-check-cli/issue-tracking.html b/dependency-check-cli/issue-tracking.html
index 23fb5a1a8..22f735e49 100644
--- a/dependency-check-cli/issue-tracking.html
+++ b/dependency-check-cli/issue-tracking.html
@@ -1,15 +1,15 @@
 
 
 
   
     
     
-    
+    
     
-    dependency-check-cli – Issue Tracking
+    dependency-check-cli – Issue Management
     
     
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -61,12 +61,12 @@
         dependency-check
                     /
       
-        
    • Issue Tracking
      • 
+        
    • Issue Management
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -104,16 +104,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -125,28 +125,28 @@
                     
       
  • 
   
-            Issue Tracking
+            Issue Management
           
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
@@ -202,8 +202,8 @@
 
    Overview
    
 
    This project uses github to manage its issues.
    -

    Issue Tracking

    -

    Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.

    +

    Issue Management

    +

    Issues, bugs, and feature requests should be submitted to the following issue management system for this project.

    https://github.com/jeremylong/DependencyCheck/issues
    diff --git a/dependency-check-cli/license.html b/dependency-check-cli/license.html index 53f5ab021..dc8d79f01 100644 --- a/dependency-check-cli/license.html +++ b/dependency-check-cli/license.html @@ -1,15 +1,15 @@ - + - dependency-check-cli – Project License + dependency-check-cli – Project Licenses @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - Project License + Licenses
    • @@ -197,15 +197,15 @@
    -
    + +

    Overview

    Typically the licenses listed for the project are that of the project itself, and not of dependencies.

    -

    Project License

    +

    Project Licenses

    The Apache Software License, Version 2.0

    -
    -
    +
                                      Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/dependency-check-cli/mail-lists.html b/dependency-check-cli/mail-lists.html
index 7fb9ebc82..fdd60e275 100644
--- a/dependency-check-cli/mail-lists.html
+++ b/dependency-check-cli/mail-lists.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-cli – Project Mailing Lists
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Project Mailing Lists
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -104,16 +104,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -123,30 +123,30 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
diff --git a/dependency-check-cli/plugin-updates-report.html b/dependency-check-cli/plugin-updates-report.html
index c54eb1779..7f14e7488 100644
--- a/dependency-check-cli/plugin-updates-report.html
+++ b/dependency-check-cli/plugin-updates-report.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-cli – Plugin Updates Report
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Plugin Updates Report
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
diff --git a/dependency-check-cli/pmd.html b/dependency-check-cli/pmd.html
index 40cff2dbd..07095226f 100644
--- a/dependency-check-cli/pmd.html
+++ b/dependency-check-cli/pmd.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-cli – PMD Results
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • PMD Results
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
diff --git a/dependency-check-cli/project-info.html b/dependency-check-cli/project-info.html
index e58599691..c4942a515 100644
--- a/dependency-check-cli/project-info.html
+++ b/dependency-check-cli/project-info.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-cli – Project Information
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Project Information
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -102,16 +102,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -123,30 +123,30 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
@@ -208,25 +208,25 @@
    - + - + - + - + - + - +
    Document Description
    Continuous IntegrationCI Management This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
    Project SummarySummary This document lists other related information of this project
    Mailing Lists This document provides subscription and archive information for this project's mailing lists.
    Issue TrackingIssue Management This document provides information on the issue management system used in this project.
    Project TeamTeam This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
    Source RepositorySource Code Management This document lists ways to access the online source repository.
    Project LicenseLicenses This document lists the project license(s).
    diff --git a/dependency-check-cli/project-reports.html b/dependency-check-cli/project-reports.html index b7eb0962b..57a6cf702 100644 --- a/dependency-check-cli/project-reports.html +++ b/dependency-check-cli/project-reports.html @@ -1,13 +1,13 @@ - + dependency-check-cli – Generated Reports @@ -52,7 +52,7 @@ diff --git a/dependency-check-cli/project-summary.html b/dependency-check-cli/project-summary.html index 42a147d97..beabd4792 100644 --- a/dependency-check-cli/project-summary.html +++ b/dependency-check-cli/project-summary.html @@ -1,13 +1,13 @@ - + dependency-check-cli – Project Summary @@ -52,7 +52,7 @@ @@ -104,14 +104,14 @@
  • - + - Continuous Integration + CI Management
  • - Project Summary + Summary
  • @@ -123,30 +123,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -241,7 +241,7 @@ dependency-check-cli Version -1.3.5 +1.3.6 Type jar diff --git a/dependency-check-cli/source-repository.html b/dependency-check-cli/source-repository.html index 46fbb812c..12c38f9fc 100644 --- a/dependency-check-cli/source-repository.html +++ b/dependency-check-cli/source-repository.html @@ -1,15 +1,15 @@ - + - dependency-check-cli – Source Repository + dependency-check-cli – Source Code Management @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-cli/surefire-report.html b/dependency-check-cli/surefire-report.html index ff8623108..fe7c0b550 100644 --- a/dependency-check-cli/surefire-report.html +++ b/dependency-check-cli/surefire-report.html @@ -1,13 +1,13 @@ - + dependency-check-cli – Surefire Report @@ -52,7 +52,7 @@ @@ -269,7 +269,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.656
    +0.468

    Note: failures are anticipated and checked for with assertions while errors are unanticipated.


    Package List

    @@ -290,7 +290,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.656
    +0.468

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

    org.owasp.dependencycheck

    @@ -312,7 +312,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.605 +0.424 CliParserTest @@ -321,7 +321,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.051

    +0.044

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -331,7 +331,7 @@ function toggleDisplay(elementId) { testEnsureCanonicalPath2 -0.465 +0.324 testEnsureCanonicalPath @@ -342,7 +342,7 @@ function toggleDisplay(elementId) { testParse_printHelp -0.04 +0.028 testParse_printVersionInfo @@ -350,31 +350,31 @@ function toggleDisplay(elementId) { testParse_help -0 +0.004 testParse_scan -0.001 +0 testParse -0.001 +0 testParse_unknown -0.001 +0 testParse_version -0.001 +0 testParse_scan_unknownFile -0.001 +0.004 testParse_scan_withFileExists -0.001

    +0
    diff --git a/dependency-check-cli/taglist.html b/dependency-check-cli/taglist.html index 440979c8f..d785c60a3 100644 --- a/dependency-check-cli/taglist.html +++ b/dependency-check-cli/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-cli – Tag List report @@ -52,7 +52,7 @@ diff --git a/dependency-check-cli/team-list.html b/dependency-check-cli/team-list.html index 59f11bbfa..a19058c81 100644 --- a/dependency-check-cli/team-list.html +++ b/dependency-check-cli/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-cli – Project Team @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -199,9 +199,9 @@
    -

    The Team

    +

    Project Team

    A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.

    -

    The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    +

    The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    Members

    The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.

    diff --git a/dependency-check-cli/xref-test/index.html b/dependency-check-cli/xref-test/index.html index 2ed6101ae..fd5c36ab1 100644 --- a/dependency-check-cli/xref-test/index.html +++ b/dependency-check-cli/xref-test/index.html @@ -4,7 +4,7 @@ - Dependency-Check Command Line 1.3.5 Reference + Dependency-Check Command Line 1.3.6 Reference diff --git a/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-frame.html b/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-frame.html index 93e0e0a58..da845dfde 100644 --- a/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-frame.html +++ b/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Command Line 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-summary.html b/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-summary.html index 5f18be7f5..8a8bb684f 100644 --- a/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-summary.html +++ b/dependency-check-cli/xref-test/org/owasp/dependencycheck/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Command Line 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-cli/xref-test/overview-frame.html b/dependency-check-cli/xref-test/overview-frame.html index 31ecfd0c3..8875adeb3 100644 --- a/dependency-check-cli/xref-test/overview-frame.html +++ b/dependency-check-cli/xref-test/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference + Dependency-Check Command Line 1.3.6 Reference diff --git a/dependency-check-cli/xref-test/overview-summary.html b/dependency-check-cli/xref-test/overview-summary.html index 48cd27e5a..b129042bf 100644 --- a/dependency-check-cli/xref-test/overview-summary.html +++ b/dependency-check-cli/xref-test/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference + Dependency-Check Command Line 1.3.6 Reference @@ -24,7 +24,7 @@
    -

    Dependency-Check Command Line 1.3.5 Reference

    +

    Dependency-Check Command Line 1.3.6 Reference

    diff --git a/dependency-check-cli/xref/index.html b/dependency-check-cli/xref/index.html index 2ed6101ae..fd5c36ab1 100644 --- a/dependency-check-cli/xref/index.html +++ b/dependency-check-cli/xref/index.html @@ -4,7 +4,7 @@ - Dependency-Check Command Line 1.3.5 Reference + Dependency-Check Command Line 1.3.6 Reference diff --git a/dependency-check-cli/xref/org/owasp/dependencycheck/package-frame.html b/dependency-check-cli/xref/org/owasp/dependencycheck/package-frame.html index eb61ab6f9..ee8b4f15b 100644 --- a/dependency-check-cli/xref/org/owasp/dependencycheck/package-frame.html +++ b/dependency-check-cli/xref/org/owasp/dependencycheck/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Command Line 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-cli/xref/org/owasp/dependencycheck/package-summary.html b/dependency-check-cli/xref/org/owasp/dependencycheck/package-summary.html index 6bad04706..4e5d566b4 100644 --- a/dependency-check-cli/xref/org/owasp/dependencycheck/package-summary.html +++ b/dependency-check-cli/xref/org/owasp/dependencycheck/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Command Line 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-cli/xref/overview-frame.html b/dependency-check-cli/xref/overview-frame.html index 31ecfd0c3..8875adeb3 100644 --- a/dependency-check-cli/xref/overview-frame.html +++ b/dependency-check-cli/xref/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference + Dependency-Check Command Line 1.3.6 Reference diff --git a/dependency-check-cli/xref/overview-summary.html b/dependency-check-cli/xref/overview-summary.html index 48cd27e5a..b129042bf 100644 --- a/dependency-check-cli/xref/overview-summary.html +++ b/dependency-check-cli/xref/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Command Line 1.3.5 Reference + Dependency-Check Command Line 1.3.6 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check Command Line 1.3.5 Reference

    +

    Dependency-Check Command Line 1.3.6 Reference

    diff --git a/dependency-check-core/apidocs/allclasses-frame.html b/dependency-check-core/apidocs/allclasses-frame.html index 9c07c98be..60836e66a 100644 --- a/dependency-check-core/apidocs/allclasses-frame.html +++ b/dependency-check-core/apidocs/allclasses-frame.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Core 1.3.5 API) - +All Classes (Dependency-Check Core 1.3.6 API) + diff --git a/dependency-check-core/apidocs/allclasses-noframe.html b/dependency-check-core/apidocs/allclasses-noframe.html index f0e431526..bbb58a347 100644 --- a/dependency-check-core/apidocs/allclasses-noframe.html +++ b/dependency-check-core/apidocs/allclasses-noframe.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Core 1.3.5 API) - +All Classes (Dependency-Check Core 1.3.6 API) + diff --git a/dependency-check-core/apidocs/constant-values.html b/dependency-check-core/apidocs/constant-values.html index 0381a7878..7f7cb2348 100644 --- a/dependency-check-core/apidocs/constant-values.html +++ b/dependency-check-core/apidocs/constant-values.html @@ -2,10 +2,10 @@ - + -Constant Field Values (Dependency-Check Core 1.3.5 API) - +Constant Field Values (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/package-summary.html index d426c37f2..56d10156b 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/agent/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.agent (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.agent (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 a22fdb019..3ed3ed848 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,10 +2,10 @@ - + -org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.analyzer.exception (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 9b70f4e32..7ce3c5580 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,10 +2,10 @@ - + -org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 f53138980..05435c8cc 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.central (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.central (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/composer/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/composer/package-summary.html index 64a508d3b..0a0ec49f7 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/composer/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/composer/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.composer (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.composer (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 f87d947c7..9b8a29a5d 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 746b1e888..ae80ba694 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 688c1e0dc..e4ea1bb5e 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 336a7c94c..0f20b36e3 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.nexus (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 8abfcfc08..577fdb89e 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.nuget (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 c8b249534..3ac9ba898 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/cpe/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/cpe/package-summary.html index 80acbfaef..6021f5bcf 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/cpe/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/cpe/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update.cpe (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.update.cpe (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 de21df1da..bbc801aab 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.update.exception (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/nvd/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/nvd/package-summary.html index 4be9cfef8..e2ab9207d 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/nvd/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/nvd/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update.nvd (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.update.nvd (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 e721113ff..ed7b50e29 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,10 +2,10 @@ - + -org.owasp.dependencycheck.data.update (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.data.update (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 afb9e83de..f2f657e2d 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,10 +2,10 @@ - + -org.owasp.dependencycheck.dependency (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.dependency (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 54c73cbce..41bc14bb0 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,10 +2,10 @@ - + -org.owasp.dependencycheck.exception (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.exception (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/package-summary.html index 319ad0051..d9616e417 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html index b23743f3e..5d96b4108 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/reporting/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.reporting (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.reporting (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/suppression/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/suppression/package-summary.html index feb9cfe30..63d63a43c 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/suppression/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/suppression/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.suppression (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.suppression (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/package-summary.html index 287298e29..0bdddc820 100644 --- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/package-summary.html +++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.utils (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.utils (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 index 199b4d386..158f105c4 100644 --- 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 @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.xml.pom (Dependency-Check Core 1.3.5 API) - +org.owasp.dependencycheck.xml.pom (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-core/apidocs/overview-summary.html b/dependency-check-core/apidocs/overview-summary.html index 9377fa32e..ab2979fa8 100644 --- a/dependency-check-core/apidocs/overview-summary.html +++ b/dependency-check-core/apidocs/overview-summary.html @@ -2,10 +2,10 @@ - + -Overview (Dependency-Check Core 1.3.5 API) - +Overview (Dependency-Check Core 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 b207e2e57..a2058e0d6 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 3c9f99167..50b289dbf 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.analyzer33
    61%
    1583/2580
    43%
    604/1392
    		4.292
    org.owasp.dependencycheck.analyzer33
    61%
    1591/2594
    43%
    605/1396
    		4.307
    org.owasp.dependencycheck.analyzer.exception2
    25%
    4/16
    N/A
    N/A
    		1
    @@ -31,7 +31,7 @@ packageTable.sort(0); AbstractAnalyzer
    100%
    3/3
    N/A
    N/A
    1 - AbstractFileTypeAnalyzer
    82%
    32/39
    80%
    8/10
    1.429 + AbstractFileTypeAnalyzer
    84%
    33/39
    80%
    8/10
    1.429 AbstractSuppressionAnalyzer
    80%
    48/60
    71%
    10/14
    3.833 @@ -63,7 +63,7 @@ packageTable.sort(0); FalsePositiveAnalyzer
    47%
    106/224
    25%
    58/230
    10.385 - FileNameAnalyzer
    80%
    16/20
    50%
    4/8
    2.333 + FileNameAnalyzer
    77%
    17/22
    40%
    4/10
    2.667 FileTypeAnalyzer
    N/A
    N/A
    N/A
    N/A
    1 @@ -86,7 +86,7 @@ packageTable.sort(0); PythonPackageAnalyzer
    91%
    67/73
    75%
    15/20
    2.091 - RubyBundleAuditAnalyzer
    14%
    22/157
    3%
    2/66
    4.385 + RubyBundleAuditAnalyzer
    16%
    28/169
    4%
    3/68
    4.615 RubyGemspecAnalyzer
    93%
    42/45
    60%
    6/10
    1.875 @@ -99,6 +99,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 13cb79836..ac63d3121 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.composer.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.composer.html index 3b745a069..80e26a770 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.composer.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.composer.html @@ -41,6 +41,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 204d5b368..df48f61ad 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 994501f5f..74337087f 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 5b296ee60..c0f552ab6 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 5d4e03f59..15bfa8625 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html @@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 ec00284ac..e229851ce 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 321b97ee8..fedf78698 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.cpe.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.cpe.html index ad049650f..d4f4cf8f0 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.cpe.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.cpe.html @@ -40,6 +40,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 61c40eaa0..6300f5421 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 19f347f2a..5de83f310 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 @@ -50,6 +50,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.nvd.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.nvd.html index 7528910bc..63ff4a057 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.nvd.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.nvd.html @@ -49,6 +49,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 96788d3df..f4355cb9e 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 @@ -58,6 +58,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 2bbbb0677..56e84b5b7 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 68e181eae..223e4633d 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html @@ -18,7 +18,7 @@ org.owasp.dependencycheck1
    54%
    102/187
    57%
    37/64
    3.174 org.owasp.dependencycheck.agent1
    0%
    0/226
    0%
    0/36
    1.319 - org.owasp.dependencycheck.analyzer33
    61%
    1583/2580
    43%
    604/1392
    4.292 + org.owasp.dependencycheck.analyzer33
    61%
    1591/2594
    43%
    605/1396
    4.307 org.owasp.dependencycheck.analyzer.exception2
    25%
    4/16
    N/A
    N/A
    1 org.owasp.dependencycheck.data.central1
    83%
    51/61
    83%
    20/24
    10 org.owasp.dependencycheck.data.composer3
    79%
    53/67
    45%
    19/42
    3.417 @@ -58,6 +58,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 07f449e62..1364a1fc5 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 a919ed085..1c800f27b 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); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 1dd23df0a..042ed1071 100644 --- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html +++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html @@ -55,6 +55,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 index a5f41909e..4694475ab 100644 --- 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 @@ -48,6 +48,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/frame-summary.html b/dependency-check-core/cobertura/frame-summary.html index 7dbd4e67c..addb221a0 100644 --- a/dependency-check-core/cobertura/frame-summary.html +++ b/dependency-check-core/cobertura/frame-summary.html @@ -16,10 +16,10 @@ - + - + @@ -46,6 +46,6 @@ var packageTable = new SortableTable(document.getElementById("packageResults"), ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html index eed088b07..59c67ca46 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html @@ -842,6 +842,6 @@
    Package # Classes Line Coverage Branch Coverage Complexity
    All Packages133
    53%
    3697/6854
    45%
    1399/3102
    		3.102
    All Packages133
    53%
    3705/6868
    45%
    1400/3106
    		3.106
    org.owasp.dependencycheck1
    54%
    102/187
    57%
    37/64
    		3.174
    org.owasp.dependencycheck.agent1
    0%
    0/226
    0%
    0/36
    		1.319
    org.owasp.dependencycheck.analyzer33
    61%
    1583/2580
    43%
    604/1392
    		4.292
    org.owasp.dependencycheck.analyzer33
    61%
    1591/2594
    43%
    605/1396
    		4.307
    org.owasp.dependencycheck.analyzer.exception2
    25%
    4/16
    N/A
    N/A
    		1
    org.owasp.dependencycheck.data.central1
    83%
    51/61
    83%
    20/24
    		10
    org.owasp.dependencycheck.data.composer3
    79%
    53/67
    45%
    19/42
    		3.417
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 cb479208d..e6e44c6a0 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html @@ -1847,6 +1847,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 ac6edacc4..885fb0a2c 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html @@ -63,7 +63,7 @@ 
      * @author Jeremy Long
     23   
      */
    -  24  153 
     public abstract class AbstractAnalyzer implements Analyzer {
    +  24  154 
     public abstract class AbstractAnalyzer implements Analyzer {
     25   
     
     26   @@ -101,11 +101,11 @@ 
         public void close() throws Exception {
     43   
             //do nothing
    -  44  54 
         }
    +  44  55 
         }
     45   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c2cd14f8e..1e7a0e834 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html @@ -12,7 +12,7 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    AbstractFileTypeAnalyzer
    82%
    32/39
    80%
    8/10
    		1.429
    AbstractFileTypeAnalyzer
    84%
    33/39
    80%
    8/10
    		1.429
     
    @@ -105,9 +105,9 @@ 
          * Base constructor that all children must call. This checks the configuration to determine if the analyzer is enabled.
     44   
          */
    -  45  110 
         public AbstractFileTypeAnalyzer() {
    -  46  110 
             reset();
    -  47  110 
         }
    +  45  111 
         public AbstractFileTypeAnalyzer() {
    +  46  111 
             reset();
    +  47  111 
         }
     48   
     //</editor-fold>
     49   @@ -127,7 +127,7 @@ 
          * Whether the file type analyzer detected any files it needs to analyze.
     57   
          */
    -  58  110 
         private boolean filesMatched = false;
    +  58  111 
         private boolean filesMatched = false;
     59   
     
     60   @@ -159,8 +159,8 @@ 
          */
     74   
         protected void setFilesMatched(boolean filesMatched) {
    -  75  38 
             this.filesMatched = filesMatched;
    -  76  38 
         }
    +  75  39 
             this.filesMatched = filesMatched;
    +  76  39 
         }
     77   
     
     78   @@ -169,7 +169,7 @@ 
          * A flag indicating whether or not the analyzer is enabled.
     80   
          */
    -  81  110 
         private boolean enabled = true;
    +  81  111 
         private boolean enabled = true;
     82   
     
     83   @@ -184,7 +184,7 @@ 
          */
     88   
         public boolean isEnabled() {
    -  89  0 
             return enabled;
    +  89  1 
             return enabled;
     90   
         }
     91   @@ -201,8 +201,8 @@ 
          */
     97   
         public void setEnabled(boolean enabled) {
    -  98  4 
             this.enabled = enabled;
    -  99  4 
         }
    +  98  6 
             this.enabled = enabled;
    +  99  6 
         }
     100   
     //</editor-fold>
     101   @@ -301,8 +301,8 @@ 
         @Override
     148   
         public final void initialize() throws Exception {
    -  149  62 
             if (filesMatched) {
    -  150  45 
                 initializeFileTypeAnalyzer();
    +  149  61 
             if (filesMatched) {
    +  150  44 
                 initializeFileTypeAnalyzer();
     151   
             } else {
     152  17 
                 enabled = false;
    @@ -321,16 +321,16 @@ 
         @Override
     160   
         public final void reset() {
    -  161  110 
             final String key = getAnalyzerEnabledSettingKey();
    +  161  111 
             final String key = getAnalyzerEnabledSettingKey();
     162   
             try {
    -  163  110 
                 enabled = Settings.getBoolean(key, true);
    +  163  111 
                 enabled = Settings.getBoolean(key, true);
     164  0 
             } catch (InvalidSettingException ex) {
     165  0 
                 LOGGER.warn("Invalid setting for property '{}'", key);
     166  0 
                 LOGGER.debug("", ex);
     167  0 
                 LOGGER.warn("{} has been disabled", getName());
    -  168  110 
             }
    -  169  110 
         }
    +  168  111 
             }
    +  169  111 
         }
     170   
     
     171   @@ -364,19 +364,19 @@ 
         @Override
     187   
         public boolean accept(File pathname) {
    -  188  12820 
             final FileFilter filter = getFileFilter();
    -  189  12820 
             boolean accepted = false;
    -  190  12820 
             if (null == filter) {
    +  188  12821 
             final FileFilter filter = getFileFilter();
    +  189  12821 
             boolean accepted = false;
    +  190  12821 
             if (null == filter) {
     191  0 
                 LOGGER.error("The '{}' analyzer is misconfigured and does not have a file filter; it will be disabled", getName());
    -  192  12820 
             } else if (enabled) {
    -  193  11092 
                 accepted = filter.accept(pathname);
    -  194  11092 
                 if (accepted) {
    -  195  32 
                     filesMatched = true;
    +  192  12821 
             } else if (enabled) {
    +  193  11093 
                 accepted = filter.accept(pathname);
    +  194  11093 
                 if (accepted) {
    +  195  33 
                     filesMatched = true;
     196   
                 }
     197   
             }
    -  198  12820 
             return accepted;
    +  198  12821 
             return accepted;
     199   
         }
     200   @@ -422,6 +422,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 e2ee0ac6e..a89907dcd 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html @@ -313,6 +313,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 7dd26772f..2eb5636fa 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html @@ -142,6 +142,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 746dcf911..4bed9ac2d 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html @@ -161,6 +161,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 552d43aeb..30ef18a47 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html @@ -121,6 +121,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 5a918e231..5db7b5552 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html @@ -843,6 +843,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 bca03b9c6..102acf7bb 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html @@ -518,6 +518,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AutoconfAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AutoconfAnalyzer.html index b50905dfd..8f890c3fc 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AutoconfAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AutoconfAnalyzer.html @@ -503,6 +503,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CMakeAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CMakeAnalyzer.html index ecde03dd2..15d019969 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CMakeAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CMakeAnalyzer.html @@ -422,6 +422,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c6e8b5728..08c4d9e11 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html @@ -1292,6 +1292,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 2b842f3a2..808d5e971 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html @@ -426,6 +426,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ComposerLockAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ComposerLockAnalyzer.html index c8850c4fe..2e16a2042 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ComposerLockAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ComposerLockAnalyzer.html @@ -306,6 +306,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 750987fbf..d132d93eb 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html @@ -152,13 +152,13 @@  70   
     
     71  2 
             for (final SuppressionRule rule : getRules()) {
    -  72  82 
                 rule.process(dependency);
    -  73  82 
             }
    +  72  84 
                 rule.process(dependency);
    +  73  84 
             }
     74  2 
         }
     75   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 57cee45d5..c57d711ea 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html @@ -719,6 +719,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 3f561ea86..a6a2c032f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html @@ -761,6 +761,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 2ccd6e5ad..a66884919 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html @@ -12,7 +12,7 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    FileNameAnalyzer
    80%
    16/20
    50%
    4/8
    		2.333
    FileNameAnalyzer
    77%
    17/22
    40%
    4/10
    		2.667
     
    @@ -58,171 +58,187 @@  20   
     import java.io.File;
     21   - 
     import org.apache.commons.io.FilenameUtils;
    -  22   - 
     import org.owasp.dependencycheck.Engine;
    -  23   - 
     import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
    -  24   - 
     import org.owasp.dependencycheck.dependency.Confidence;
    -  25   - 
     import org.owasp.dependencycheck.dependency.Dependency;
    -  26   - 
     import org.owasp.dependencycheck.utils.DependencyVersion;
    -  27   - 
     import org.owasp.dependencycheck.utils.DependencyVersionUtil;
    -  28   
     
    +  22   + 
     import org.apache.commons.io.FilenameUtils;
    +  23   + 
     import org.apache.commons.io.filefilter.NameFileFilter;
    +  24   + 
     import org.owasp.dependencycheck.Engine;
    +  25   + 
     import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
    +  26   + 
     import org.owasp.dependencycheck.dependency.Confidence;
    +  27   + 
     import org.owasp.dependencycheck.dependency.Dependency;
    +  28   + 
     import org.owasp.dependencycheck.utils.DependencyVersion;
     29   - 
     /**
    + 
     import org.owasp.dependencycheck.utils.DependencyVersionUtil;
     30   - 
      *
    + 
     
     31   - 
      * Takes a dependency and analyzes the filename and determines the hashes.
    + 
     /**
     32   
      *
     33   - 
      * @author Jeremy Long
    + 
      * Takes a dependency and analyzes the filename and determines the hashes.
     34   - 
      */
    -  35  9 
     public class FileNameAnalyzer extends AbstractAnalyzer implements Analyzer {
    + 
      *
    +  35   + 
      * @author Jeremy Long
     36   - 
     
    -  37   - 
         //<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer">
    + 
      */
    +  37  9 
     public class FileNameAnalyzer extends AbstractAnalyzer implements Analyzer {
     38   - 
         /**
    + 
     
     39   - 
          * The name of the analyzer.
    + 
         //<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer">
     40   - 
          */
    + 
         /**
     41   - 
         private static final String ANALYZER_NAME = "File Name Analyzer";
    + 
          * The name of the analyzer.
     42   - 
         /**
    + 
          */
     43   - 
          * The phase that this analyzer is intended to run in.
    + 
         private static final String ANALYZER_NAME = "File Name Analyzer";
     44   - 
          */
    -  45  1 
         private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;
    + 
         /**
    +  45   + 
          * The phase that this analyzer is intended to run in.
     46   - 
     
    -  47   - 
         /**
    + 
          */
    +  47  1 
         private static final AnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION;
     48   - 
          * Returns the name of the analyzer.
    + 
     
     49   - 
          *
    + 
         /**
     50   - 
          * @return the name of the analyzer.
    + 
          * Returns the name of the analyzer.
     51   - 
          */
    + 
          *
     52   - 
         @Override
    + 
          * @return the name of the analyzer.
     53   - 
         public String getName() {
    -  54  5 
             return ANALYZER_NAME;
    + 
          */
    +  54   + 
         @Override
     55   - 
         }
    -  56   - 
     
    + 
         public String getName() {
    +  56  5 
             return ANALYZER_NAME;
     57   - 
         /**
    -  58   - 
          * Returns the phase that the analyzer is intended to run in.
    -  59   - 
          *
    -  60   - 
          * @return the phase that the analyzer is intended to run in.
    -  61   - 
          */
    -  62   - 
         @Override
    -  63   - 
         public AnalysisPhase getAnalysisPhase() {
    -  64  4 
             return ANALYSIS_PHASE;
    -  65   
         }
    -  66   - 
         //</editor-fold>
    -  67   +  58   
     
    -  68   +  59   
         /**
    -  69   - 
          * Collects information about the file name.
    -  70   +  60   + 
          * Returns the phase that the analyzer is intended to run in.
    +  61   
          *
    -  71   - 
          * @param dependency the dependency to analyze.
    -  72   - 
          * @param engine the engine that is scanning the dependencies
    -  73   - 
          * @throws AnalysisException is thrown if there is an error reading the JAR file.
    -  74   +  62   + 
          * @return the phase that the analyzer is intended to run in.
    +  63   
          */
    -  75   +  64   
         @Override
    +  65   + 
         public AnalysisPhase getAnalysisPhase() {
    +  66  4 
             return ANALYSIS_PHASE;
    +  67   + 
         }
    +  68   + 
         //</editor-fold>
    +  69   + 
     
    +  70   + 
         // Python init files
    +  71  1 
         private static final NameFileFilter IGNORED_FILES = new NameFileFilter(new String[] {
    +  72   + 
             "__init__.py",
    +  73   + 
             "__init__.pyc",
    +  74   + 
             "__init__.pyo"
    +  75   + 
         });
     76   - 
         public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
    + 
     
     77   - 
     
    + 
         /**
     78   - 
             //strip any path information that may get added by ArchiveAnalyzer, etc.
    -  79  4 
             final File f = dependency.getActualFile();
    -  80  4 
             final String fileName = FilenameUtils.removeExtension(f.getName());
    + 
          * Collects information about the file name.
    +  79   + 
          *
    +  80   + 
          * @param dependency the dependency to analyze.
     81   - 
     
    + 
          * @param engine the engine that is scanning the dependencies
     82   - 
             //add version evidence
    -  83  4 
             final DependencyVersion version = DependencyVersionUtil.parseVersion(fileName);
    -  84  4 
             if (version != null) {
    + 
          * @throws AnalysisException is thrown if there is an error reading the JAR file.
    +  83   + 
          */
    +  84   + 
         @Override
     85   - 
                 // If the version number is just a number like 2 or 23, reduce the confidence
    + 
         public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
     86   - 
                 // a shade. This should hopefully correct for cases like log4j.jar or
    -  87   - 
                 // struts2-core.jar
    -  88  4 
                 if (version.getVersionParts() == null || version.getVersionParts().size() < 2) {
    -  89  0 
                     dependency.getVersionEvidence().addEvidence("file", "name",
    -  90  0 
                             version.toString(), Confidence.MEDIUM);
    -  91   - 
                 } else {
    -  92  8 
                     dependency.getVersionEvidence().addEvidence("file", "name",
    -  93  4 
                             version.toString(), Confidence.HIGHEST);
    -  94   - 
                 }
    -  95  4 
                 dependency.getVersionEvidence().addEvidence("file", "name",
    -  96   - 
                         fileName, Confidence.MEDIUM);
    -  97   - 
             }
    -  98   
     
    -  99   - 
             //add as vendor and product evidence
    -  100  4 
             if (fileName.contains("-")) {
    -  101  4 
                 dependency.getProductEvidence().addEvidence("file", "name",
    -  102   - 
                         fileName, Confidence.HIGHEST);
    -  103  4 
                 dependency.getVendorEvidence().addEvidence("file", "name",
    -  104   - 
                         fileName, Confidence.HIGHEST);
    +  87   + 
             //strip any path information that may get added by ArchiveAnalyzer, etc.
    +  88  4 
             final File f = dependency.getActualFile();
    +  89  4 
             final String fileName = FilenameUtils.removeExtension(f.getName());
    +  90   + 
     
    +  91   + 
             //add version evidence
    +  92  4 
             final DependencyVersion version = DependencyVersionUtil.parseVersion(fileName);
    +  93  4 
             if (version != null) {
    +  94   + 
                 // If the version number is just a number like 2 or 23, reduce the confidence
    +  95   + 
                 // a shade. This should hopefully correct for cases like log4j.jar or
    +  96   + 
                 // struts2-core.jar
    +  97  4 
                 if (version.getVersionParts() == null || version.getVersionParts().size() < 2) {
    +  98  0 
                     dependency.getVersionEvidence().addEvidence("file", "name",
    +  99  0 
                             version.toString(), Confidence.MEDIUM);
    +  100   + 
                 } else {
    +  101  8 
                     dependency.getVersionEvidence().addEvidence("file", "name",
    +  102  4 
                             version.toString(), Confidence.HIGHEST);
    +  103   + 
                 }
    +  104  4 
                 dependency.getVersionEvidence().addEvidence("file", "name",
     105   - 
             } else {
    -  106  0 
                 dependency.getProductEvidence().addEvidence("file", "name",
    -  107   - 
                         fileName, Confidence.HIGH);
    -  108  0 
                 dependency.getVendorEvidence().addEvidence("file", "name",
    -  109   - 
                         fileName, Confidence.HIGH);
    -  110   + 
                         fileName, Confidence.MEDIUM);
    +  106   
             }
    -  111  4 
         }
    -  112   +  107   + 
     
    +  108   + 
             //add as vendor and product evidence
    +  109  4 
             if (fileName.contains("-")) {
    +  110  4 
                 dependency.getProductEvidence().addEvidence("file", "name",
    +  111   + 
                         fileName, Confidence.HIGHEST);
    +  112  4 
                 dependency.getVendorEvidence().addEvidence("file", "name",
    +  113   + 
                         fileName, Confidence.HIGHEST);
    +  114  0 
             } else if (!IGNORED_FILES.accept(f)) {
    +  115  0 
                 dependency.getProductEvidence().addEvidence("file", "name",
    +  116   + 
                         fileName, Confidence.HIGH);
    +  117  0 
                 dependency.getVendorEvidence().addEvidence("file", "name",
    +  118   + 
                         fileName, Confidence.HIGH);
    +  119   + 
             }
    +  120  4 
         }
    +  121   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 aa500735a..4b0e50821 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html @@ -85,6 +85,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 69afbcd33..a59443980 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html @@ -321,6 +321,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 653983388..f9cb252f9 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html @@ -1879,6 +1879,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 eeca25078..3cb4a599d 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html @@ -469,6 +469,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NodePackageAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NodePackageAnalyzer.html index ebd4e5a38..2eae5525a 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NodePackageAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NodePackageAnalyzer.html @@ -340,6 +340,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 3168d2446..0beb970d6 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html @@ -311,6 +311,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 0a6a3b58a..231918aff 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html @@ -292,6 +292,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.OpenSSLAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.OpenSSLAnalyzer.html index def5bc933..c077c5f25 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.OpenSSLAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.OpenSSLAnalyzer.html @@ -332,6 +332,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonDistributionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonDistributionAnalyzer.html index fc80cdd5d..998a88538 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonDistributionAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonDistributionAnalyzer.html @@ -663,6 +663,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonPackageAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonPackageAnalyzer.html index 164477473..f1ee5fd37 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonPackageAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.PythonPackageAnalyzer.html @@ -363,7 +363,7 @@  186  1 
                 dependency.setDisplayFileName(parentName + "/__init__.py");
     187  1 
                 dependency.getProductEvidence().addEvidence(file.getName(),
     188   - 
                         "PackageName", parentName, Confidence.MEDIUM);
    + 
                         "PackageName", parentName, Confidence.HIGH);
     189   
             } else {
     190   @@ -578,6 +578,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyBundleAuditAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyBundleAuditAnalyzer.html index b84c04bcc..14484296d 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyBundleAuditAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyBundleAuditAnalyzer.html @@ -12,7 +12,7 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    RubyBundleAuditAnalyzer
    14%
    22/157
    3%
    2/66
    		4.385
    RubyBundleAuditAnalyzer
    16%
    28/169
    4%
    3/68
    		4.615
     
    @@ -95,7 +95,7 @@ 
      * @author Dale Visser
     39   
      */
    -  40  7 
     public class RubyBundleAuditAnalyzer extends AbstractFileTypeAnalyzer {
    +  40  8 
     public class RubyBundleAuditAnalyzer extends AbstractFileTypeAnalyzer {
     41   
     
     42  1 
         private static final Logger LOGGER = LoggerFactory.getLogger(RubyBundleAuditAnalyzer.class);
    @@ -142,7 +142,7 @@ 
         @Override
     65   
         protected FileFilter getFileFilter() {
    -  66  853 
             return FILTER;
    +  66  854 
             return FILTER;
     67   
         }
     68   @@ -159,307 +159,306 @@ 
          */
     74   
         private Process launchBundleAudit(File folder) throws AnalysisException {
    -  75  3 
             if (!folder.isDirectory()) {
    +  75  2 
             if (!folder.isDirectory()) {
     76  0 
                 throw new AnalysisException(String.format("%s should have been a directory.", folder.getAbsolutePath()));
     77   
             }
    -  78  3 
             final List<String> args = new ArrayList<String>();
    -  79  3 
             final String bundleAuditPath = Settings.getString(Settings.KEYS.ANALYZER_BUNDLE_AUDIT_PATH);
    -  80  3 
             args.add(null == bundleAuditPath ? "bundle-audit" : bundleAuditPath);
    -  81  3 
             args.add("check");
    -  82  3 
             args.add("--verbose");
    -  83  3 
             final ProcessBuilder builder = new ProcessBuilder(args);
    -  84  3 
             builder.directory(folder);
    +  78  2 
             final List<String> args = new ArrayList<String>();
    +  79  2 
             final String bundleAuditPath = Settings.getString(Settings.KEYS.ANALYZER_BUNDLE_AUDIT_PATH);
    +  80  2 
             args.add(null == bundleAuditPath ? "bundle-audit" : bundleAuditPath);
    +  81  2 
             args.add("check");
    +  82  2 
             args.add("--verbose");
    +  83  2 
             final ProcessBuilder builder = new ProcessBuilder(args);
    +  84  2 
             builder.directory(folder);
     85   
             try {
    -  86  3 
                 return builder.start();
    -  87  3 
             } catch (IOException ioe) {
    -  88  3 
                 throw new AnalysisException("bundle-audit failure", ioe);
    -  89   - 
             }
    +  86  2 
                     LOGGER.info("Launching: " + args + " from " + folder);
    +  87  2 
                 return builder.start();
    +  88  2 
             } catch (IOException ioe) {
    +  89  2 
                 throw new AnalysisException("bundle-audit failure", ioe);
     90   - 
         }
    + 
             }
     91   - 
     
    + 
         }
     92   - 
         /**
    + 
     
     93   - 
          * Initialize the analyzer. In this case, extract GrokAssembly.exe to a temporary location.
    + 
         /**
     94   - 
          *
    + 
          * Initialize the analyzer. In this case, extract GrokAssembly.exe to a temporary location.
     95   - 
          * @throws Exception if anything goes wrong
    + 
          *
     96   - 
          */
    + 
          * @throws Exception if anything goes wrong
     97   - 
         @Override
    + 
          */
     98   - 
         public void initializeFileTypeAnalyzer() throws Exception {
    + 
         @Override
     99   + 
         public void initializeFileTypeAnalyzer() throws Exception {
    +  100   
             // Now, need to see if bundle-audit actually runs from this location.
    -  100  3 
             Process process = launchBundleAudit(Settings.getTempDirectory());
    -  101  0 
             int exitValue = process.waitFor();
    -  102  0 
             if (0 == exitValue) {
    -  103  0 
                 LOGGER.warn("Unexpected exit code from bundle-audit process. Disabling {}: {}", ANALYZER_NAME, exitValue);
    -  104  0 
                 setEnabled(false);
    -  105  0 
                 throw new AnalysisException("Unexpected exit code from bundle-audit process.");
    -  106   - 
             } else {
    -  107  0 
                 BufferedReader reader = null;
    -  108   +  101  2 
                 Process process = null;
    +  102   
                 try {
    -  109  0 
                     reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8"));
    -  110  0 
                     if (!reader.ready()) {
    -  111  0 
                         LOGGER.warn("Bundle-audit error stream unexpectedly not ready. Disabling " + ANALYZER_NAME);
    -  112  0 
                         setEnabled(false);
    -  113  0 
                         throw new AnalysisException("Bundle-audit error stream unexpectedly not ready.");
    -  114   - 
                     } else {
    -  115  0 
                         final String line = reader.readLine();
    -  116  0 
                         if (line == null || !line.contains("Errno::ENOENT")) {
    -  117  0 
                             LOGGER.warn("Unexpected bundle-audit output. Disabling {}: {}", ANALYZER_NAME, line);
    -  118  0 
                             setEnabled(false);
    -  119  0 
                             throw new AnalysisException("Unexpected bundle-audit output.");
    -  120   - 
                         }
    -  121   - 
                     }
    -  122   - 
                 } finally {
    -  123  0 
                     if (null != reader) {
    -  124  0 
                         reader.close();
    -  125   - 
                     }
    -  126   +  103  2 
                     process = launchBundleAudit(Settings.getTempDirectory());
    +  104   
                 }
    -  127   - 
             }
    -  128  0 
             if (isEnabled()) {
    -  129  0 
                 LOGGER.info(ANALYZER_NAME + " is enabled. It is necessary to manually run \"bundle-audit update\" "
    +  105  2 
                 catch(AnalysisException ae) {
    +  106  2 
                         LOGGER.warn("Exception from bundle-audit process: {}. Disabling {}", ae.getCause(), ANALYZER_NAME);
    +  107  2 
                 setEnabled(false);
    +  108  2 
                 throw ae;
    +  109  0 
                 }
    +  110   + 
     
    +  111  0 
             int exitValue = process.waitFor();
    +  112  0 
             if (0 == exitValue) {
    +  113  0 
                 LOGGER.warn("Unexpected exit code from bundle-audit process. Disabling {}: {}", ANALYZER_NAME, exitValue);
    +  114  0 
                 setEnabled(false);
    +  115  0 
                 throw new AnalysisException("Unexpected exit code from bundle-audit process.");
    +  116   + 
             } else {
    +  117  0 
                 BufferedReader reader = null;
    +  118   + 
                 try {
    +  119  0 
                     reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8"));
    +  120  0 
                     if (!reader.ready()) {
    +  121  0 
                         LOGGER.warn("Bundle-audit error stream unexpectedly not ready. Disabling " + ANALYZER_NAME);
    +  122  0 
                         setEnabled(false);
    +  123  0 
                         throw new AnalysisException("Bundle-audit error stream unexpectedly not ready.");
    +  124   + 
                     } else {
    +  125  0 
                         final String line = reader.readLine();
    +  126  0 
                         if (line == null || !line.contains("Errno::ENOENT")) {
    +  127  0 
                             LOGGER.warn("Unexpected bundle-audit output. Disabling {}: {}", ANALYZER_NAME, line);
    +  128  0 
                             setEnabled(false);
    +  129  0 
                             throw new AnalysisException("Unexpected bundle-audit output.");
     130   - 
                         + "occasionally to keep its database up to date.");
    + 
                         }
     131   - 
             }
    -  132  0 
         }
    -  133   - 
     
    -  134   - 
         /**
    + 
                     }
    +  132   + 
                 } finally {
    +  133  0 
                     if (null != reader) {
    +  134  0 
                         reader.close();
     135   - 
          * Returns the name of the analyzer.
    + 
                     }
     136   - 
          *
    + 
                 }
     137   - 
          * @return the name of the analyzer.
    + 
             }
     138   - 
          */
    -  139   - 
         @Override
    -  140   - 
         public String getName() {
    -  141  4 
             return ANALYZER_NAME;
    + 
     
    +  139  0 
             if (isEnabled()) {
    +  140  0 
                 LOGGER.info(ANALYZER_NAME + " is enabled. It is necessary to manually run \"bundle-audit update\" "
    +  141   + 
                         + "occasionally to keep its database up to date.");
     142   - 
         }
    -  143   - 
     
    + 
             }
    +  143  0 
         }
     144   - 
         /**
    + 
     
     145   - 
          * Returns the phase that the analyzer is intended to run in.
    + 
         /**
     146   - 
          *
    + 
          * Returns the name of the analyzer.
     147   - 
          * @return the phase that the analyzer is intended to run in.
    -  148   - 
          */
    -  149   - 
         @Override
    -  150   - 
         public AnalysisPhase getAnalysisPhase() {
    -  151  3 
             return ANALYSIS_PHASE;
    -  152   - 
         }
    -  153   - 
     
    -  154   - 
         /**
    -  155   - 
          * Returns the key used in the properties file to reference the analyzer's enabled property.
    -  156   
          *
    -  157   - 
          * @return the analyzer's enabled property setting key
    -  158   +  148   + 
          * @return the name of the analyzer.
    +  149   
          */
    -  159   +  150   
         @Override
    -  160   - 
         protected String getAnalyzerEnabledSettingKey() {
    -  161  7 
             return Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED;
    -  162   +  151   + 
         public String getName() {
    +  152  5 
             return ANALYZER_NAME;
    +  153   
         }
    -  163   +  154   
     
    -  164   +  155   
         /**
    -  165   - 
          * If {@link #analyzeFileType(Dependency, Engine)} is called, then we have successfully initialized, and it will be necessary
    -  166   - 
          * to disable {@link RubyGemspecAnalyzer}.
    -  167   +  156   + 
          * Returns the phase that the analyzer is intended to run in.
    +  157   + 
          *
    +  158   + 
          * @return the phase that the analyzer is intended to run in.
    +  159   
          */
    -  168  7 
         private boolean needToDisableGemspecAnalyzer = true;
    -  169   +  160   + 
         @Override
    +  161   + 
         public AnalysisPhase getAnalysisPhase() {
    +  162  3 
             return ANALYSIS_PHASE;
    +  163   + 
         }
    +  164   
     
    +  165   + 
         /**
    +  166   + 
          * Returns the key used in the properties file to reference the analyzer's enabled property.
    +  167   + 
          *
    +  168   + 
          * @return the analyzer's enabled property setting key
    +  169   + 
          */
     170   
         @Override
     171   - 
         protected void analyzeFileType(Dependency dependency, Engine engine)
    -  172   - 
                 throws AnalysisException {
    -  173  0 
             if (needToDisableGemspecAnalyzer) {
    -  174  0 
                 boolean failed = true;
    -  175  0 
                 final String className = RubyGemspecAnalyzer.class.getName();
    -  176  0 
                 for (FileTypeAnalyzer analyzer : engine.getFileTypeAnalyzers()) {
    -  177  0 
                     if (analyzer instanceof RubyGemspecAnalyzer) {
    -  178  0 
                         ((RubyGemspecAnalyzer) analyzer).setEnabled(false);
    -  179  0 
                         LOGGER.info("Disabled " + className + " to avoid noisy duplicate results.");
    -  180  0 
                         failed = false;
    + 
         protected String getAnalyzerEnabledSettingKey() {
    +  172  8 
             return Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED;
    +  173   + 
         }
    +  174   + 
     
    +  175   + 
         /**
    +  176   + 
          * If {@link #analyzeFileType(Dependency, Engine)} is called, then we have successfully initialized, and it will be necessary
    +  177   + 
          * to disable {@link RubyGemspecAnalyzer}.
    +  178   + 
          */
    +  179  8 
         private boolean needToDisableGemspecAnalyzer = true;
    +  180   + 
     
     181   + 
         @Override
    +  182   + 
         protected void analyzeFileType(Dependency dependency, Engine engine)
    +  183   + 
                 throws AnalysisException {
    +  184  0 
             if (needToDisableGemspecAnalyzer) {
    +  185  0 
                 boolean failed = true;
    +  186  0 
                 final String className = RubyGemspecAnalyzer.class.getName();
    +  187  0 
                 for (FileTypeAnalyzer analyzer : engine.getFileTypeAnalyzers()) {
    +  188  0 
                     if (analyzer instanceof RubyGemspecAnalyzer) {
    +  189  0 
                         ((RubyGemspecAnalyzer) analyzer).setEnabled(false);
    +  190  0 
                         LOGGER.info("Disabled " + className + " to avoid noisy duplicate results.");
    +  191  0 
                         failed = false;
    +  192   
                     }
    -  182  0 
                 }
    -  183  0 
                 if (failed) {
    -  184  0 
                     LOGGER.warn("Did not find" + className + '.');
    -  185   - 
                 }
    -  186  0 
                 needToDisableGemspecAnalyzer = false;
    -  187   - 
             }
    -  188  0 
             final File parentFile = dependency.getActualFile().getParentFile();
    -  189  0 
             final Process process = launchBundleAudit(parentFile);
    -  190   - 
             try {
    -  191  0 
                 process.waitFor();
    -  192  0 
             } catch (InterruptedException ie) {
    -  193  0 
                 throw new AnalysisException("bundle-audit process interrupted", ie);
    -  194  0 
             }
    -  195  0 
             BufferedReader rdr = null;
    +  193  0 
                 }
    +  194  0 
                 if (failed) {
    +  195  0 
                     LOGGER.warn("Did not find" + className + '.');
     196   - 
             try {
    -  197  0 
                 rdr = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8"));
    -  198  0 
                 processBundlerAuditOutput(dependency, engine, rdr);
    -  199  0 
             } catch (IOException ioe) {
    -  200  0 
                 LOGGER.warn("bundle-audit failure", ioe);
    + 
                 }
    +  197  0 
                 needToDisableGemspecAnalyzer = false;
    +  198   + 
             }
    +  199  0 
             final File parentFile = dependency.getActualFile().getParentFile();
    +  200  0 
             final Process process = launchBundleAudit(parentFile);
     201   + 
             try {
    +  202  0 
                 process.waitFor();
    +  203  0 
             } catch (InterruptedException ie) {
    +  204  0 
                 throw new AnalysisException("bundle-audit process interrupted", ie);
    +  205  0 
             }
    +  206  0 
             BufferedReader rdr = null;
    +  207   + 
             try {
    +  208  0 
                     BufferedReader errReader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8"));
    +  209  0 
                     while(errReader.ready()) {
    +  210  0 
                             String error = errReader.readLine();
    +  211  0 
                             LOGGER.warn(error);
    +  212  0 
                     }
    +  213  0 
                 rdr = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8"));
    +  214  0 
                 processBundlerAuditOutput(dependency, engine, rdr);
    +  215  0 
             } catch (IOException ioe) {
    +  216  0 
                 LOGGER.warn("bundle-audit failure", ioe);
    +  217   
             } finally {
    -  202  0 
                 if (null != rdr) {
    -  203   +  218  0 
                 if (null != rdr) {
    +  219   
                     try {
    -  204  0 
                         rdr.close();
    -  205  0 
                     } catch (IOException ioe) {
    -  206  0 
                         LOGGER.warn("bundle-audit close failure", ioe);
    -  207  0 
                     }
    -  208   +  220  0 
                         rdr.close();
    +  221  0 
                     } catch (IOException ioe) {
    +  222  0 
                         LOGGER.warn("bundle-audit close failure", ioe);
    +  223  0 
                     }
    +  224   
                 }
    -  209   +  225   
             }
    -  210   +  226   
     
    -  211  0 
         }
    -  212   +  227  0 
         }
    +  228   
     
    -  213   +  229   
         private void processBundlerAuditOutput(Dependency original, Engine engine, BufferedReader rdr) throws IOException {
    -  214  0 
             final String parentName = original.getActualFile().getParentFile().getName();
    -  215  0 
             final String fileName = original.getFileName();
    -  216  0 
             Dependency dependency = null;
    -  217  0 
             Vulnerability vulnerability = null;
    -  218  0 
             String gem = null;
    -  219  0 
             final Map<String, Dependency> map = new HashMap<String, Dependency>();
    -  220  0 
             boolean appendToDescription = false;
    -  221  0 
             while (rdr.ready()) {
    -  222  0 
                 final String nextLine = rdr.readLine();
    -  223  0 
                 if (null == nextLine) {
    -  224  0 
                     break;
    -  225  0 
                 } else if (nextLine.startsWith(NAME)) {
    -  226  0 
                     appendToDescription = false;
    -  227  0 
                     gem = nextLine.substring(NAME.length());
    -  228  0 
                     if (!map.containsKey(gem)) {
    -  229  0 
                         map.put(gem, createDependencyForGem(engine, parentName, fileName, gem));
    -  230   +  230  0 
             final String parentName = original.getActualFile().getParentFile().getName();
    +  231  0 
             final String fileName = original.getFileName();
    +  232  0 
             Dependency dependency = null;
    +  233  0 
             Vulnerability vulnerability = null;
    +  234  0 
             String gem = null;
    +  235  0 
             final Map<String, Dependency> map = new HashMap<String, Dependency>();
    +  236  0 
             boolean appendToDescription = false;
    +  237  0 
             while (rdr.ready()) {
    +  238  0 
                 final String nextLine = rdr.readLine();
    +  239  0 
                 if (null == nextLine) {
    +  240  0 
                     break;
    +  241  0 
                 } else if (nextLine.startsWith(NAME)) {
    +  242  0 
                     appendToDescription = false;
    +  243  0 
                     gem = nextLine.substring(NAME.length());
    +  244  0 
                     if (!map.containsKey(gem)) {
    +  245  0 
                         map.put(gem, createDependencyForGem(engine, parentName, fileName, gem));
    +  246   
                     }
    -  231  0 
                     dependency = map.get(gem);
    -  232  0 
                     LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    -  233  0 
                 } else if (nextLine.startsWith(VERSION)) {
    -  234  0 
                     vulnerability = createVulnerability(parentName, dependency, vulnerability, gem, nextLine);
    -  235  0 
                 } else if (nextLine.startsWith(ADVISORY)) {
    -  236  0 
                     setVulnerabilityName(parentName, dependency, vulnerability, nextLine);
    -  237  0 
                 } else if (nextLine.startsWith(CRITICALITY)) {
    -  238  0 
                     addCriticalityToVulnerability(parentName, vulnerability, nextLine);
    -  239  0 
                 } else if (nextLine.startsWith("URL: ")) {
    -  240  0 
                     addReferenceToVulnerability(parentName, vulnerability, nextLine);
    -  241  0 
                 } else if (nextLine.startsWith("Description:")) {
    -  242  0 
                     appendToDescription = true;
    -  243  0 
                     if (null != vulnerability) {
    -  244  0 
                         vulnerability.setDescription("*** Vulnerability obtained from bundle-audit verbose report. Title link may not work. CPE below is guessed. CVSS score is estimated (-1.0 indicates unknown). See link below for full details. *** ");
    -  245   - 
                     }
    -  246  0 
                 } else if (appendToDescription) {
    -  247  0 
                     if (null != vulnerability) {
    -  248  0 
                         vulnerability.setDescription(vulnerability.getDescription() + nextLine + "\n");
    -  249   - 
                     }
    -  250   - 
                 }
    -  251  0 
             }
    -  252  0 
         }
    -  253   - 
     
    -  254   - 
         private void setVulnerabilityName(String parentName, Dependency dependency, Vulnerability vulnerability, String nextLine) {
    -  255  0 
             final String advisory = nextLine.substring((ADVISORY.length()));
    -  256  0 
             if (null != vulnerability) {
    -  257  0 
                 vulnerability.setName(advisory);
    -  258   - 
             }
    -  259  0 
             if (null != dependency) {
    -  260  0 
                 dependency.getVulnerabilities().add(vulnerability); // needed to wait for vulnerability name to avoid NPE
    +  247  0 
                     dependency = map.get(gem);
    +  248  0 
                     LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    +  249  0 
                 } else if (nextLine.startsWith(VERSION)) {
    +  250  0 
                     vulnerability = createVulnerability(parentName, dependency, vulnerability, gem, nextLine);
    +  251  0 
                 } else if (nextLine.startsWith(ADVISORY)) {
    +  252  0 
                     setVulnerabilityName(parentName, dependency, vulnerability, nextLine);
    +  253  0 
                 } else if (nextLine.startsWith(CRITICALITY)) {
    +  254  0 
                     addCriticalityToVulnerability(parentName, vulnerability, nextLine);
    +  255  0 
                 } else if (nextLine.startsWith("URL: ")) {
    +  256  0 
                     addReferenceToVulnerability(parentName, vulnerability, nextLine);
    +  257  0 
                 } else if (nextLine.startsWith("Description:")) {
    +  258  0 
                     appendToDescription = true;
    +  259  0 
                     if (null != vulnerability) {
    +  260  0 
                         vulnerability.setDescription("*** Vulnerability obtained from bundle-audit verbose report. Title link may not work. CPE below is guessed. CVSS score is estimated (-1.0 indicates unknown). See link below for full details. *** ");
     261   - 
             }
    -  262  0 
             LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    -  263  0 
         }
    -  264   - 
     
    + 
                     }
    +  262  0 
                 } else if (appendToDescription) {
    +  263  0 
                     if (null != vulnerability) {
    +  264  0 
                         vulnerability.setDescription(vulnerability.getDescription() + nextLine + "\n");
     265   - 
         private void addReferenceToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) {
    -  266  0 
             final String url = nextLine.substring(("URL: ").length());
    -  267  0 
             if (null != vulnerability) {
    -  268  0 
                 Reference ref = new Reference();
    -  269  0 
                 ref.setName(vulnerability.getName());
    -  270  0 
                 ref.setSource("bundle-audit");
    -  271  0 
                 ref.setUrl(url);
    -  272  0 
                 vulnerability.getReferences().add(ref);
    -  273   - 
             }
    -  274  0 
             LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    -  275  0 
         }
    -  276   - 
     
    -  277   - 
         private void addCriticalityToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) {
    -  278  0 
             if (null != vulnerability) {
    -  279  0 
                 final String criticality = nextLine.substring(CRITICALITY.length()).trim();
    -  280  0 
                 if ("High".equals(criticality)) {
    -  281  0 
                     vulnerability.setCvssScore(8.5f);
    -  282  0 
                 } else if ("Medium".equals(criticality)) {
    -  283  0 
                     vulnerability.setCvssScore(5.5f);
    -  284  0 
                 } else if ("Low".equals(criticality)) {
    -  285  0 
                     vulnerability.setCvssScore(2.0f);
    -  286   - 
                 } else {
    -  287  0 
                     vulnerability.setCvssScore(-1.0f);
    -  288   + 
                     }
    +  266   
                 }
    +  267  0 
             }
    +  268  0 
         }
    +  269   + 
     
    +  270   + 
         private void setVulnerabilityName(String parentName, Dependency dependency, Vulnerability vulnerability, String nextLine) {
    +  271  0 
             final String advisory = nextLine.substring((ADVISORY.length()));
    +  272  0 
             if (null != vulnerability) {
    +  273  0 
                 vulnerability.setName(advisory);
    +  274   + 
             }
    +  275  0 
             if (null != dependency) {
    +  276  0 
                 dependency.getVulnerabilities().add(vulnerability); // needed to wait for vulnerability name to avoid NPE
    +  277   + 
             }
    +  278  0 
             LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    +  279  0 
         }
    +  280   + 
     
    +  281   + 
         private void addReferenceToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) {
    +  282  0 
             final String url = nextLine.substring(("URL: ").length());
    +  283  0 
             if (null != vulnerability) {
    +  284  0 
                 Reference ref = new Reference();
    +  285  0 
                 ref.setName(vulnerability.getName());
    +  286  0 
                 ref.setSource("bundle-audit");
    +  287  0 
                 ref.setUrl(url);
    +  288  0 
                 vulnerability.getReferences().add(ref);
     289   
             }
     290  0 
             LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    @@ -467,53 +466,74 @@  292   
     
     293   - 
         private Vulnerability createVulnerability(String parentName, Dependency dependency, Vulnerability vulnerability, String gem, String nextLine) {
    -  294  0 
             if (null != dependency) {
    -  295  0 
                 final String version = nextLine.substring(VERSION.length());
    -  296  0 
                 dependency.getVersionEvidence().addEvidence(
    -  297   - 
                         "bundler-audit",
    -  298   - 
                         "Version",
    -  299   - 
                         version,
    -  300   - 
                         Confidence.HIGHEST);
    -  301  0 
                 vulnerability = new Vulnerability(); // don't add to dependency until we have name set later
    -  302  0 
                 vulnerability.setMatchedCPE(
    -  303  0 
                         String.format("cpe:/a:%1$s_project:%1$s:%2$s::~~~ruby~~", gem, version),
    + 
         private void addCriticalityToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) {
    +  294  0 
             if (null != vulnerability) {
    +  295  0 
                 final String criticality = nextLine.substring(CRITICALITY.length()).trim();
    +  296  0 
                 if ("High".equals(criticality)) {
    +  297  0 
                     vulnerability.setCvssScore(8.5f);
    +  298  0 
                 } else if ("Medium".equals(criticality)) {
    +  299  0 
                     vulnerability.setCvssScore(5.5f);
    +  300  0 
                 } else if ("Low".equals(criticality)) {
    +  301  0 
                     vulnerability.setCvssScore(2.0f);
    +  302   + 
                 } else {
    +  303  0 
                     vulnerability.setCvssScore(-1.0f);
     304   - 
                         null);
    -  305  0 
                 vulnerability.setCvssAccessVector("-");
    -  306  0 
                 vulnerability.setCvssAccessComplexity("-");
    -  307  0 
                 vulnerability.setCvssAuthentication("-");
    -  308  0 
                 vulnerability.setCvssAvailabilityImpact("-");
    -  309  0 
                 vulnerability.setCvssConfidentialityImpact("-");
    -  310  0 
                 vulnerability.setCvssIntegrityImpact("-");
    -  311   + 
                 }
    +  305   
             }
    -  312  0 
             LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    -  313  0 
             return vulnerability;
    -  314   - 
         }
    -  315   +  306  0 
             LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    +  307  0 
         }
    +  308   
     
    +  309   + 
         private Vulnerability createVulnerability(String parentName, Dependency dependency, Vulnerability vulnerability, String gem, String nextLine) {
    +  310  0 
             if (null != dependency) {
    +  311  0 
                 final String version = nextLine.substring(VERSION.length());
    +  312  0 
                 dependency.getVersionEvidence().addEvidence(
    +  313   + 
                         "bundler-audit",
    +  314   + 
                         "Version",
    +  315   + 
                         version,
     316   - 
         private Dependency createDependencyForGem(Engine engine, String parentName, String fileName, String gem) throws IOException {
    -  317  0 
             final File tempFile = File.createTempFile("Gemfile-" + gem, ".lock", Settings.getTempDirectory());
    -  318  0 
             final String displayFileName = String.format("%s%c%s:%s", parentName, File.separatorChar, fileName, gem);
    -  319  0 
             FileUtils.write(tempFile, displayFileName); // unique contents to avoid dependency bundling
    -  320  0 
             final Dependency dependency = new Dependency(tempFile);
    -  321  0 
             dependency.getProductEvidence().addEvidence("bundler-audit", "Name", gem, Confidence.HIGHEST);
    -  322  0 
             dependency.setDisplayFileName(displayFileName);
    -  323  0 
             engine.getDependencies().add(dependency);
    -  324  0 
             return dependency;
    -  325   + 
                         Confidence.HIGHEST);
    +  317  0 
                 vulnerability = new Vulnerability(); // don't add to dependency until we have name set later
    +  318  0 
                 vulnerability.setMatchedCPE(
    +  319  0 
                         String.format("cpe:/a:%1$s_project:%1$s:%2$s::~~~ruby~~", gem, version),
    +  320   + 
                         null);
    +  321  0 
                 vulnerability.setCvssAccessVector("-");
    +  322  0 
                 vulnerability.setCvssAccessComplexity("-");
    +  323  0 
                 vulnerability.setCvssAuthentication("-");
    +  324  0 
                 vulnerability.setCvssAvailabilityImpact("-");
    +  325  0 
                 vulnerability.setCvssConfidentialityImpact("-");
    +  326  0 
                 vulnerability.setCvssIntegrityImpact("-");
    +  327   + 
             }
    +  328  0 
             LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine));
    +  329  0 
             return vulnerability;
    +  330   
         }
    -  326   +  331   + 
     
    +  332   + 
         private Dependency createDependencyForGem(Engine engine, String parentName, String fileName, String gem) throws IOException {
    +  333  0 
             final File tempFile = File.createTempFile("Gemfile-" + gem, ".lock", Settings.getTempDirectory());
    +  334  0 
             final String displayFileName = String.format("%s%c%s:%s", parentName, File.separatorChar, fileName, gem);
    +  335  0 
             FileUtils.write(tempFile, displayFileName); // unique contents to avoid dependency bundling
    +  336  0 
             final Dependency dependency = new Dependency(tempFile);
    +  337  0 
             dependency.getProductEvidence().addEvidence("bundler-audit", "Name", gem, Confidence.HIGHEST);
    +  338  0 
             dependency.setDisplayFileName(displayFileName);
    +  339  0 
             engine.getDependencies().add(dependency);
    +  340  0 
             return dependency;
    +  341   + 
         }
    +  342   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyGemspecAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyGemspecAnalyzer.html index c4cc6e90f..8f07fa39a 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyGemspecAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.RubyGemspecAnalyzer.html @@ -296,6 +296,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c784f9584..59e756b97 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html @@ -152,13 +152,13 @@  70   
     
     71  2 
             for (final SuppressionRule rule : getRules()) {
    -  72  82 
                 rule.process(dependency);
    -  73  82 
             }
    +  72  84 
                 rule.process(dependency);
    +  73  84 
             }
     74  2 
         }
     75   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 3bdfa0971..523b80d31 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 @@ -137,12 +137,12 @@ 
          */
     63   
         public AnalysisException(String msg, Throwable ex) {
    -  64  3 
             super(msg, ex);
    -  65  3 
         }
    +  64  2 
             super(msg, ex);
    +  65  2 
         }
     66   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 388490958..ff78d6158 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 @@ -143,6 +143,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 745bf5048..f35fb0af5 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 @@ -300,6 +300,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerDependency.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerDependency.html index 6cd2f1b81..c92139680 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerDependency.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerDependency.html @@ -217,6 +217,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerException.html index a5a0996d3..329f0a2c6 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerException.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerException.html @@ -127,6 +127,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerLockParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerLockParser.html index 619ee0a24..35dde7426 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerLockParser.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.composer.ComposerLockParser.html @@ -228,6 +228,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 aa5968def..2d263e0e2 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 @@ -404,10 +404,10 @@ 
     
     222  1 
                     final Set<Pair<String, String>> data = cve.getVendorProductList();
     223  1 
                     for (Pair<String, String> pair : data) {
    -  224  25656 
                         v.setStringValue(pair.getLeft());
    -  225  25656 
                         p.setStringValue(pair.getRight());
    -  226  25656 
                         indexWriter.addDocument(doc);
    -  227  25656 
                     }
    +  224  25715 
                         v.setStringValue(pair.getLeft());
    +  225  25715 
                         p.setStringValue(pair.getRight());
    +  226  25715 
                         indexWriter.addDocument(doc);
    +  227  25715 
                     }
     228  0 
                 } catch (DatabaseException ex) {
     229  0 
                     LOGGER.debug("", ex);
     230  0 
                     throw new IndexException("Error reading CPE data", ex);
    @@ -564,6 +564,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 60505ce58..4b830c1c4 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 @@ -107,6 +107,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 776ecd4f7..4801d7a4c 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 @@ -73,7 +73,7 @@ 
      * @author Jeremy Long
     28   
      */
    -  29  1575 
     public class IndexEntry implements Serializable {
    +  29  1578 
     public class IndexEntry implements Serializable {
     30   
     
     31   @@ -168,8 +168,8 @@ 
          */
     79   
         public void setVendor(String vendor) {
    -  80  1574 
             this.vendor = vendor;
    -  81  1574 
         }
    +  80  1577 
             this.vendor = vendor;
    +  81  1577 
         }
     82   
         /**
     83   @@ -209,8 +209,8 @@ 
          */
     101   
         public void setProduct(String product) {
    -  102  1574 
             this.product = product;
    -  103  1574 
         }
    +  102  1577 
             this.product = product;
    +  103  1577 
         }
     104   
         /**
     105   @@ -363,6 +363,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 635542c40..1cd8ed576 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 @@ -143,6 +143,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 68eb6cdb0..4ce6face8 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 @@ -186,6 +186,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 9f5035a8f..61d97b0ab 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 @@ -121,6 +121,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 7de1779ff..594d22b1a 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 @@ -85,7 +85,7 @@ 
          * The char term attribute.
     34   
          */
    -  35  10 
         private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
    +  35  11 
         private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
     36   
     
     37   @@ -100,7 +100,7 @@ 
          */
     42   
         protected CharTermAttribute getTermAtt() {
    -  43  25803 
             return termAtt;
    +  43  32391 
             return termAtt;
     44   
         }
     45   @@ -125,7 +125,7 @@ 
          */
     55   
         protected LinkedList<String> getTokens() {
    -  56  25797 
             return tokens;
    +  56  32377 
             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  11 
             super(stream);
    +  66  11 
             tokens = new LinkedList<String>();
    +  67  11 
         }
     68   
     
     69   @@ -159,20 +159,20 @@ 
          */
     74   
         protected boolean addTerm() {
    -  75  25709 
             final boolean termAdded = !tokens.isEmpty();
    -  76  25718 
             if (termAdded) {
    -  77  17257 
                 final String term = tokens.pop();
    -  78  17255 
                 clearAttributes();
    -  79  17253 
                 termAtt.append(term);
    +  75  32217 
             final boolean termAdded = !tokens.isEmpty();
    +  76  32246 
             if (termAdded) {
    +  77  21838 
                 final String term = tokens.pop();
    +  78  21836 
                 clearAttributes();
    +  79  21837 
                 termAtt.append(term);
     80   
             }
    -  81  25717 
             return termAdded;
    +  81  32271 
             return termAdded;
     82   
         }
     83   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 0853b1c4f..64f53821f 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 @@ -131,13 +131,13 @@ 
         @Override
     59   
         protected boolean isTokenChar(int c) {
    -  60  615694 
             return Character.isLetter(c) || Character.isDigit(c);
    +  60  617221 
             return Character.isLetter(c) || Character.isDigit(c);
     61   
         }
     62   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 cb7f69f99..55d3f1c96 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 @@ -111,6 +111,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 3c0264d27..e7bba8436 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 @@ -170,6 +170,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 0476e41c6..097b70744 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 @@ -212,6 +212,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c3ea6cebe..aaf8101cc 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 @@ -196,6 +196,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 ac5e58964..cbbe5559a 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 @@ -306,6 +306,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 ee1db5be3..fb0af3422 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 @@ -116,8 +116,8 @@ 
          */
     50   
         public UrlTokenizingFilter(TokenStream stream) {
    -  51  10 
             super(stream);
    -  52  10 
         }
    +  51  11 
             super(stream);
    +  52  11 
         }
     53   
     
     54   @@ -138,11 +138,11 @@ 
         @Override
     62   
         public boolean incrementToken() throws IOException {
    -  63  25793 
             final LinkedList<String> tokens = getTokens();
    -  64  25798 
             final CharTermAttribute termAtt = getTermAtt();
    -  65  25803 
             if (tokens.isEmpty() && input.incrementToken()) {
    -  66  17252 
                 final String text = new String(termAtt.buffer(), 0, termAtt.length());
    -  67  17251 
                 if (UrlStringUtils.containsUrl(text)) {
    +  63  32368 
             final LinkedList<String> tokens = getTokens();
    +  64  32381 
             final CharTermAttribute termAtt = getTermAtt();
    +  65  32391 
             if (tokens.isEmpty() && input.incrementToken()) {
    +  66  21826 
                 final String text = new String(termAtt.buffer(), 0, termAtt.length());
    +  67  21830 
                 if (UrlStringUtils.containsUrl(text)) {
     68  6 
                     final String[] parts = text.split("\\s");
     69  12 
                     for (String part : parts) {
     70  6 
                         if (UrlStringUtils.isUrl(part)) {
    @@ -162,18 +162,18 @@  81   
                     }
     82  6 
                 } else {
    -  83  17245 
                     tokens.add(text);
    +  83  21819 
                     tokens.add(text);
     84   
                 }
     85   
             }
    -  86  25706 
             return addTerm();
    +  86  32212 
             return addTerm();
     87   
         }
     88   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 a37af95ff..0392b3740 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 @@ -426,6 +426,6 @@ 
     // vim: cc=120:sw=4:ts=4:sts=4
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c2dc301d8..5f1f37193 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 @@ -327,6 +327,6 @@ 
     // vim: cc=120:sw=4:ts=4:sts=4
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 185e5cef6..d8822a204 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 @@ -352,6 +352,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 a9b7a0420..d4d1dfe7f 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 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 93d9f6a37..9d367e7b8 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 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 e17151438..5d3d037f0 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 @@ -160,6 +160,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 51b8b49c5..5ee5cf252 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 @@ -606,6 +606,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 7e7303c4b..5f906a5a7 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 @@ -115,6 +115,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 79a2eeb7d..e0217a5c3 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 @@ -406,8 +406,8 @@ 
             try {
     225  1 
                 ps = getConnection().prepareStatement(statementBundle.getString("SELECT_VENDOR_PRODUCT_LIST"));
     226  1 
                 rs = ps.executeQuery();
    -  227  25657 
                 while (rs.next()) {
    -  228  25656 
                     data.add(new Pair<String, String>(rs.getString(1), rs.getString(2)));
    +  227  25716 
                 while (rs.next()) {
    +  228  25715 
                     data.add(new Pair<String, String>(rs.getString(1), rs.getString(2)));
     229   
                 }
     230  0 
             } catch (SQLException ex) {
    @@ -653,24 +653,24 @@  408  8 
                     psR = getConnection().prepareStatement(statementBundle.getString("SELECT_REFERENCES"));
     409  8 
                     psR.setInt(1, cveId);
     410  8 
                     rsR = psR.executeQuery();
    -  411  76 
                     while (rsR.next()) {
    -  412  68 
                         vuln.addReference(rsR.getString(1), rsR.getString(2), rsR.getString(3));
    +  411  74 
                     while (rsR.next()) {
    +  412  66 
                         vuln.addReference(rsR.getString(1), rsR.getString(2), rsR.getString(3));
     413   
                     }
     414  8 
                     psS = getConnection().prepareStatement(statementBundle.getString("SELECT_SOFTWARE"));
     415  8 
                     psS.setInt(1, cveId);
     416  8 
                     rsS = psS.executeQuery();
    -  417  244 
                     while (rsS.next()) {
    -  418  236 
                         final String cpe = rsS.getString(1);
    -  419  236 
                         final String prevVersion = rsS.getString(2);
    -  420  236 
                         if (prevVersion == null) {
    -  421  228 
                             vuln.addVulnerableSoftware(cpe);
    +  417  247 
                     while (rsS.next()) {
    +  418  239 
                         final String cpe = rsS.getString(1);
    +  419  239 
                         final String prevVersion = rsS.getString(2);
    +  420  239 
                         if (prevVersion == null) {
    +  421  231 
                             vuln.addVulnerableSoftware(cpe);
     422   
                         } else {
     423  8 
                             vuln.addVulnerableSoftware(cpe, prevVersion);
     424   
                         }
    -  425  236 
                     }
    +  425  239 
                     }
     426   
                 }
     427  0 
             } catch (SQLException ex) {
    @@ -1191,6 +1191,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 60b36608b..a3a694de4 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 @@ -131,6 +131,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 1f82fb350..1bf5d569e 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 @@ -352,6 +352,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 573360b18..759d9c8de 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 @@ -131,6 +131,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 095830a60..1895454c9 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 @@ -269,6 +269,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c67999345..cd7bbf1fd 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 @@ -394,6 +394,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.BaseUpdater.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.BaseUpdater.html index 6d58b0a29..e001139d9 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.BaseUpdater.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.BaseUpdater.html @@ -171,6 +171,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 e63ab2810..36a27cefa 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html @@ -93,6 +93,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CpeUpdater.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CpeUpdater.html index 5d234530d..d9a8dec2f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CpeUpdater.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CpeUpdater.html @@ -344,6 +344,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 4e1b00ac5..7900e0f9b 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 @@ -376,6 +376,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 f6c3b0108..a431d3529 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 @@ -541,6 +541,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 e45a41366..3e61158fa 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html @@ -121,6 +121,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.CPEHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.CPEHandler.html index 63e96ed57..ba6882f58 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.CPEHandler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.CPEHandler.html @@ -701,6 +701,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.Cpe.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.Cpe.html index d1344226d..26f217a06 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.Cpe.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.cpe.Cpe.html @@ -251,6 +251,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 6ede56c8a..acf4c9845 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 @@ -115,6 +115,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 ea6b20187..88d2c500b 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 @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.DownloadTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.DownloadTask.html index 4ea966b14..43da95402 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.DownloadTask.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.DownloadTask.html @@ -513,8 +513,8 @@ 
     
     295   
                 int len;
    -  296  310 
                 while ((len = cin.read(buffer)) > 0) {
    -  297  308 
                     out.write(buffer, 0, len);
    +  296  1154 
                 while ((len = cin.read(buffer)) > 0) {
    +  297  1152 
                     out.write(buffer, 0, len);
     298   
                 }
     299   @@ -548,6 +548,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve12Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve12Handler.html index be90d7a94..47ab35a74 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve12Handler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve12Handler.html @@ -451,6 +451,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve20Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve20Handler.html index 61dc1edfb..5f459ece4 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve20Handler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCve20Handler.html @@ -867,6 +867,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCveInfo.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCveInfo.html index 6a25a451c..8008e4af5 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCveInfo.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.NvdCveInfo.html @@ -276,6 +276,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.ProcessTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.ProcessTask.html index 61c849f73..d6fd95fde 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.ProcessTask.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.ProcessTask.html @@ -336,6 +336,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.UpdateableNvdCve.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.UpdateableNvdCve.html index 959d8f8e8..debe41825 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.UpdateableNvdCve.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.nvd.UpdateableNvdCve.html @@ -357,6 +357,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 03d173bed..bd188791e 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html @@ -100,6 +100,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 e82a675e5..94f4d610a 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html @@ -522,7 +522,7 @@ 
          */
     274   
         public Set<Identifier> getIdentifiers() {
    -  275  194 
             return this.identifiers;
    +  275  198 
             return this.identifiers;
     276   
         }
     277   @@ -1381,6 +1381,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 e4ab3efc1..b498508e5 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html @@ -538,6 +538,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c325c8322..2fa072481 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html @@ -728,6 +728,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 ac3a10513..41d7fcb82 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html @@ -287,7 +287,7 @@ 
          */
     145   
         public String getType() {
    -  146  282 
             return type;
    +  146  288 
             return type;
     147   
         }
     148   @@ -437,6 +437,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 b15386057..9412df7ee 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html @@ -69,7 +69,7 @@ 
      * @author Jeremy Long
     26   
      */
    -  27  512 
     public class Reference implements Serializable, Comparable<Reference> {
    +  27  500 
     public class Reference implements Serializable, Comparable<Reference> {
     28   
     
     29   @@ -119,8 +119,8 @@ 
          */
     52   
         public void setName(String name) {
    -  53  158 
             this.name = name;
    -  54  158 
         }
    +  53  156 
             this.name = name;
    +  54  156 
         }
     55   
         /**
     56   @@ -160,8 +160,8 @@ 
          */
     74   
         public void setUrl(String url) {
    -  75  158 
             this.url = url;
    -  76  158 
         }
    +  75  156 
             this.url = url;
    +  76  156 
         }
     77   
         /**
     78   @@ -201,8 +201,8 @@ 
          */
     96   
         public void setSource(String source) {
    -  97  158 
             this.source = source;
    -  98  158 
         }
    +  97  156 
             this.source = source;
    +  98  156 
         }
     99   
     
     100   @@ -264,7 +264,7 @@ 
         @Override
     137   
         public int compareTo(Reference o) {
    -  138  354 
             if (source.equals(o.source)) {
    +  138  344 
             if (source.equals(o.source)) {
     139  104 
                 if (name.equals(o.name)) {
     140  34 
                     if (url.equals(o.url)) {
     141  34 
                         return 0; //they are equal
    @@ -280,7 +280,7 @@ 
                 }
     148   
             } else {
    -  149  250 
                 return source.compareTo(o.source);
    +  149  240 
                 return source.compareTo(o.source);
     150   
             }
     151   @@ -289,6 +289,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 85cd335d3..b3282fe4a 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html @@ -242,12 +242,12 @@ 
          */
     119   
         public void addReference(String referenceSource, String referenceName, String referenceUrl) {
    -  120  68 
             final Reference ref = new Reference();
    -  121  68 
             ref.setSource(referenceSource);
    -  122  68 
             ref.setName(referenceName);
    -  123  68 
             ref.setUrl(referenceUrl);
    -  124  68 
             this.references.add(ref);
    -  125  68 
         }
    +  120  66 
             final Reference ref = new Reference();
    +  121  66 
             ref.setSource(referenceSource);
    +  122  66 
             ref.setName(referenceName);
    +  123  66 
             ref.setUrl(referenceUrl);
    +  124  66 
             this.references.add(ref);
    +  125  66 
         }
     126   
         /**
     127   @@ -304,7 +304,7 @@ 
          */
     155   
         public boolean addVulnerableSoftware(String cpe) {
    -  156  842 
             return addVulnerableSoftware(cpe, null);
    +  156  845 
             return addVulnerableSoftware(cpe, null);
     157   
         }
     158   @@ -325,13 +325,13 @@ 
          */
     166   
         public boolean addVulnerableSoftware(String cpe, String previousVersion) {
    -  167  850 
             final VulnerableSoftware vs = new VulnerableSoftware();
    -  168  850 
             vs.setCpe(cpe);
    -  169  850 
             if (previousVersion != null) {
    +  167  853 
             final VulnerableSoftware vs = new VulnerableSoftware();
    +  168  853 
             vs.setCpe(cpe);
    +  169  853 
             if (previousVersion != null) {
     170  8 
                 vs.setPreviousVersion(previousVersion);
     171   
             }
    -  172  850 
             return updateVulnerableSoftware(vs);
    +  172  853 
             return updateVulnerableSoftware(vs);
     173   
         }
     174   @@ -350,11 +350,11 @@ 
          */
     181   
         public boolean updateVulnerableSoftware(VulnerableSoftware vulnSoftware) {
    -  182  850 
             if (vulnerableSoftware.contains(vulnSoftware)) {
    +  182  853 
             if (vulnerableSoftware.contains(vulnSoftware)) {
     183  0 
                 vulnerableSoftware.remove(vulnSoftware);
     184   
             }
    -  185  850 
             return vulnerableSoftware.add(vulnSoftware);
    +  185  853 
             return vulnerableSoftware.add(vulnSoftware);
     186   
         }
     187   @@ -835,6 +835,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 8e022d051..285da55aa 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html @@ -109,6 +109,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 644f4733c..03f066d2f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html @@ -79,7 +79,7 @@ 
      * @author Jeremy Long
     31   
      */
    -  32  11488 
     public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable<VulnerableSoftware> {
    +  32  11521 
     public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable<VulnerableSoftware> {
     33   
     
     34   @@ -113,13 +113,13 @@ 
         public void setCpe(String cpe) {
     49   
             try {
    -  50  967 
                 parseName(cpe);
    +  50  970 
                 parseName(cpe);
     51  0 
             } catch (UnsupportedEncodingException ex) {
     52  0 
                 LOGGER.warn("Character encoding is unsupported for CPE '{}'.", cpe);
     53  0 
                 LOGGER.debug("", ex);
     54  0 
                 setName(cpe);
    -  55  967 
             }
    -  56  967 
         }
    +  55  970 
             }
    +  56  970 
         }
     57   
     
     58   @@ -154,32 +154,32 @@ 
         @Override
     73   
         public void parseName(String cpeName) throws UnsupportedEncodingException {
    -  74  1484 
             this.name = cpeName;
    -  75  1484 
             if (cpeName != null && cpeName.length() > 7) {
    -  76  1484 
                 final String[] data = cpeName.substring(7).split(":");
    -  77  1484 
                 if (data.length >= 1) {
    -  78  1484 
                     this.setVendor(urlDecode(data[0]));
    +  74  1487 
             this.name = cpeName;
    +  75  1487 
             if (cpeName != null && cpeName.length() > 7) {
    +  76  1487 
                 final String[] data = cpeName.substring(7).split(":");
    +  77  1487 
                 if (data.length >= 1) {
    +  78  1487 
                     this.setVendor(urlDecode(data[0]));
     79   
                 }
    -  80  1484 
                 if (data.length >= 2) {
    -  81  1484 
                     this.setProduct(urlDecode(data[1]));
    +  80  1487 
                 if (data.length >= 2) {
    +  81  1487 
                     this.setProduct(urlDecode(data[1]));
     82   
                 }
    -  83  1484 
                 if (data.length >= 3) {
    -  84  1484 
                     version = urlDecode(data[2]);
    +  83  1487 
                 if (data.length >= 3) {
    +  84  1487 
                     version = urlDecode(data[2]);
     85   
                 }
    -  86  1484 
                 if (data.length >= 4) {
    +  86  1487 
                 if (data.length >= 4) {
     87  232 
                     update = urlDecode(data[3]);
     88   
                 }
    -  89  1484 
                 if (data.length >= 5) {
    +  89  1487 
                 if (data.length >= 5) {
     90  0 
                     edition = urlDecode(data[4]);
     91   
                 }
     92   
             }
    -  93  1484 
         }
    +  93  1487 
         }
     94   
         /**
     95   @@ -330,21 +330,21 @@ 
         @Override
     176   
         public int compareTo(VulnerableSoftware vs) {
    -  177  10006 
             int result = 0;
    -  178  10006 
             final String[] left = this.getName().split(":");
    -  179  10006 
             final String[] right = vs.getName().split(":");
    -  180  10006 
             final int max = (left.length <= right.length) ? left.length : right.length;
    -  181  10006 
             if (max > 0) {
    -  182  60251 
                 for (int i = 0; result == 0 && i < max; i++) {
    -  183  50245 
                     final String[] subLeft = left[i].split("\\.");
    -  184  50245 
                     final String[] subRight = right[i].split("\\.");
    -  185  50245 
                     final int subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;
    -  186  50245 
                     if (subMax > 0) {
    -  187  114648 
                         for (int x = 0; result == 0 && x < subMax; x++) {
    -  188  64403 
                             if (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {
    +  177  10036 
             int result = 0;
    +  178  10036 
             final String[] left = this.getName().split(":");
    +  179  10036 
             final String[] right = vs.getName().split(":");
    +  180  10036 
             final int max = (left.length <= right.length) ? left.length : right.length;
    +  181  10036 
             if (max > 0) {
    +  182  60403 
                 for (int i = 0; result == 0 && i < max; i++) {
    +  183  50367 
                     final String[] subLeft = left[i].split("\\.");
    +  184  50367 
                     final String[] subRight = right[i].split("\\.");
    +  185  50367 
                     final int subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;
    +  186  50367 
                     if (subMax > 0) {
    +  187  114910 
                         for (int x = 0; result == 0 && x < subMax; x++) {
    +  188  64543 
                             if (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {
     189   
                                 try {
    -  190  23452 
                                     result = Long.valueOf(subLeft[x]).compareTo(Long.valueOf(subRight[x]));
    +  190  23486 
                                     result = Long.valueOf(subLeft[x]).compareTo(Long.valueOf(subRight[x]));
     191   
     //                                final long iLeft = Long.parseLong(subLeft[x]);
     192   @@ -370,20 +370,20 @@  203  0 
                                         result = subLeft[x].compareToIgnoreCase(subRight[x]);
     204   
                                     }
    -  205  23452 
                                 }
    +  205  23486 
                                 }
     206   
                             } else {
    -  207  40951 
                                 result = subLeft[x].compareToIgnoreCase(subRight[x]);
    +  207  41057 
                                 result = subLeft[x].compareToIgnoreCase(subRight[x]);
     208   
                             }
     209   
                         }
    -  210  50245 
                         if (result == 0) {
    -  211  40464 
                             if (subLeft.length > subRight.length) {
    +  210  50367 
                         if (result == 0) {
    +  211  40556 
                             if (subLeft.length > subRight.length) {
     212  114 
                                 result = 2;
     213   
                             }
    -  214  40464 
                             if (subRight.length > subLeft.length) {
    +  214  40556 
                             if (subRight.length > subLeft.length) {
     215  7 
                                 result = -2;
     216   
                             }
    @@ -396,7 +396,7 @@ 
                     }
     221   
                 }
    -  222  10006 
                 if (result == 0) {
    +  222  10036 
                 if (result == 0) {
     223  104 
                     if (left.length > right.length) {
     224  68 
                         result = 2;
     225   @@ -412,7 +412,7 @@  231  0 
                 result = this.getName().compareToIgnoreCase(vs.getName());
     232   
             }
    -  233  10006 
             return result;
    +  233  10036 
             return result;
     234   
         }
     235   @@ -431,19 +431,19 @@ 
          */
     242   
         private static boolean isPositiveInteger(final String str) {
    -  243  87927 
             if (str == null || str.isEmpty()) {
    +  243  88101 
             if (str == null || str.isEmpty()) {
     244  14 
                 return false;
     245   
             }
    -  246  142898 
             for (int i = 0; i < str.length(); i++) {
    -  247  95922 
                 final char c = str.charAt(i);
    -  248  95922 
                 if (c < '0' || c > '9') {
    -  249  40937 
                     return false;
    +  246  143148 
             for (int i = 0; i < str.length(); i++) {
    +  247  96104 
                 final char c = str.charAt(i);
    +  248  96104 
                 if (c < '0' || c > '9') {
    +  249  41043 
                     return false;
     250   
                 }
     251   
             }
    -  252  46976 
             return true;
    +  252  47044 
             return true;
     253   
         }
     254   @@ -468,7 +468,7 @@ 
          */
     264   
         public String getName() {
    -  265  20251 
             return name;
    +  265  20311 
             return name;
     266   
         }
     267   @@ -626,12 +626,12 @@ 
          */
     349   
         private String urlDecode(String string) {
    -  350  4684 
             final String text = string.replace("+", "%2B");
    +  350  4693 
             final String text = string.replace("+", "%2B");
     351   
             String result;
     352   
             try {
    -  353  4684 
                 result = URLDecoder.decode(text, "UTF-8");
    +  353  4693 
                 result = URLDecoder.decode(text, "UTF-8");
     354  0 
             } catch (UnsupportedEncodingException ex) {
     355   
                 try {
    @@ -639,8 +639,8 @@  357  0 
                 } catch (UnsupportedEncodingException ex1) {
     358  0 
                     result = defaultUrlDecode(text);
     359  0 
                 }
    -  360  4684 
             }
    -  361  4684 
             return result;
    +  360  4693 
             }
    +  361  4693 
             return result;
     362   
         }
     363   @@ -668,6 +668,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 adcd8f43e..61162b3b7 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 4601044fd..f2a1eb661 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 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 40cdb8ab5..7c7cfef96 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html @@ -170,6 +170,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 faf7637aa..f3c4d2a8f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html @@ -543,6 +543,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 290b9e7e4..e60d244ae 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html @@ -235,6 +235,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 2782ce191..e5b4e3f40 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html @@ -71,7 +71,7 @@ 
      * @author Jeremy Long
     27   
      */
    -  28  561 
     public class PropertyType {
    +  28  571 
     public class PropertyType {
     29   
     
     30   @@ -117,15 +117,15 @@ 
          */
     51   
         public void setValue(String value) {
    -  52  570 
             this.value = value;
    -  53  570 
         }
    +  52  580 
             this.value = value;
    +  53  580 
         }
     54   
         /**
     55   
          * Whether or not the expression is a regex.
     56   
          */
    -  57  561 
         private boolean regex = false;
    +  57  571 
         private boolean regex = false;
     58   
     
     59   @@ -161,15 +161,15 @@ 
          */
     75   
         public void setRegex(boolean value) {
    -  76  554 
             this.regex = value;
    -  77  554 
         }
    +  76  564 
             this.regex = value;
    +  77  564 
         }
     78   
         /**
     79   
          * Indicates case sensitivity.
     80   
          */
    -  81  561 
         private boolean caseSensitive = false;
    +  81  571 
         private boolean caseSensitive = false;
     82   
     
     83   @@ -205,8 +205,8 @@ 
          */
     99   
         public void setCaseSensitive(boolean value) {
    -  100  555 
             this.caseSensitive = value;
    -  101  555 
         }
    +  100  565 
             this.caseSensitive = value;
    +  101  565 
         }
     102   
         //</editor-fold>
     103   @@ -345,6 +345,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 3529a3d89..a55d24f28 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html @@ -196,6 +196,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 4f562b023..d97588ac5 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html @@ -216,13 +216,13 @@ 
         @Override
     101   
         public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
    -  102  1020 
             currentAttributes = attributes;
    -  103  1020 
             currentText = new StringBuilder();
    -  104  1020 
             if (SUPPRESS.equals(qName)) {
    -  105  225 
                 rule = new SuppressionRule();
    -  106  225 
                 final String base = currentAttributes.getValue("base");
    -  107  225 
                 if (base != null) {
    -  108  225 
                     rule.setBase(Boolean.parseBoolean(base));
    +  102  1040 
             currentAttributes = attributes;
    +  103  1040 
             currentText = new StringBuilder();
    +  104  1040 
             if (SUPPRESS.equals(qName)) {
    +  105  230 
                 rule = new SuppressionRule();
    +  106  230 
                 final String base = currentAttributes.getValue("base");
    +  107  230 
                 if (base != null) {
    +  108  230 
                     rule.setBase(Boolean.parseBoolean(base));
     109   
                 } else {
     110  0 
                     rule.setBase(false);
    @@ -230,7 +230,7 @@ 
                 }
     112   
             }
    -  113  1020 
         }
    +  113  1040 
         }
     114   
     
     115   @@ -253,30 +253,30 @@ 
         @Override
     124   
         public void endElement(String uri, String localName, String qName) throws SAXException {
    -  125  1020 
             if (SUPPRESS.equals(qName)) {
    -  126  225 
                 suppressionRules.add(rule);
    -  127  225 
                 rule = null;
    -  128  795 
             } else if (FILE_PATH.equals(qName)) {
    +  125  1040 
             if (SUPPRESS.equals(qName)) {
    +  126  230 
                 suppressionRules.add(rule);
    +  127  230 
                 rule = null;
    +  128  810 
             } else if (FILE_PATH.equals(qName)) {
     129  47 
                 final PropertyType pt = processPropertyType();
     130  47 
                 rule.setFilePath(pt);
     131  47 
             } else if (SHA1.equals(qName)) {
     132  4 
                 rule.setSha1(currentText.toString());
    -  133  744 
             } else if (GAV.equals(qName)) {
    -  134  170 
                 final PropertyType pt = processPropertyType();
    -  135  170 
                 rule.setGav(pt);
    -  136  170 
             } else if (CPE.equals(qName)) {
    -  137  328 
                 final PropertyType pt = processPropertyType();
    -  138  328 
                 rule.addCpe(pt);
    -  139  328 
             } else if (CWE.equals(qName)) {
    +  133  759 
             } else if (GAV.equals(qName)) {
    +  134  175 
                 final PropertyType pt = processPropertyType();
    +  135  175 
                 rule.setGav(pt);
    +  136  175 
             } else if (CPE.equals(qName)) {
    +  137  333 
                 final PropertyType pt = processPropertyType();
    +  138  333 
                 rule.addCpe(pt);
    +  139  333 
             } else if (CWE.equals(qName)) {
     140  0 
                 rule.addCwe(currentText.toString());
    -  141  246 
             } else if (CVE.equals(qName)) {
    +  141  251 
             } else if (CVE.equals(qName)) {
     142  8 
                 rule.addCve(currentText.toString());
    -  143  238 
             } else if (CVSS_BELOW.equals(qName)) {
    +  143  243 
             } else if (CVSS_BELOW.equals(qName)) {
     144  4 
                 final float cvss = Float.parseFloat(currentText.toString());
     145  4 
                 rule.addCvssBelow(cvss);
     146   
             }
    -  147  1020 
         }
    +  147  1040 
         }
     148   
     
     149   @@ -299,8 +299,8 @@ 
         @Override
     158   
         public void characters(char[] ch, int start, int length) throws SAXException {
    -  159  2296 
             currentText.append(ch, start, length);
    -  160  2296 
         }
    +  159  2346 
             currentText.append(ch, start, length);
    +  160  2346 
         }
     161   
     
     162   @@ -317,28 +317,28 @@ 
          */
     168   
         private PropertyType processPropertyType() {
    -  169  545 
             final PropertyType pt = new PropertyType();
    -  170  545 
             pt.setValue(currentText.toString());
    -  171  545 
             if (currentAttributes != null && currentAttributes.getLength() > 0) {
    -  172  545 
                 final String regex = currentAttributes.getValue("regex");
    -  173  545 
                 if (regex != null) {
    -  174  545 
                     pt.setRegex(Boolean.parseBoolean(regex));
    +  169  555 
             final PropertyType pt = new PropertyType();
    +  170  555 
             pt.setValue(currentText.toString());
    +  171  555 
             if (currentAttributes != null && currentAttributes.getLength() > 0) {
    +  172  555 
                 final String regex = currentAttributes.getValue("regex");
    +  173  555 
                 if (regex != null) {
    +  174  555 
                     pt.setRegex(Boolean.parseBoolean(regex));
     175   
                 }
    -  176  545 
                 final String caseSensitive = currentAttributes.getValue("caseSensitive");
    -  177  545 
                 if (caseSensitive != null) {
    -  178  545 
                     pt.setCaseSensitive(Boolean.parseBoolean(caseSensitive));
    +  176  555 
                 final String caseSensitive = currentAttributes.getValue("caseSensitive");
    +  177  555 
                 if (caseSensitive != null) {
    +  178  555 
                     pt.setCaseSensitive(Boolean.parseBoolean(caseSensitive));
     179   
                 }
     180   
             }
    -  181  545 
             return pt;
    +  181  555 
             return pt;
     182   
         }
     183   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 cf59251da..096936473 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 f23a4c80e..a1f550b7e 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html @@ -239,6 +239,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 b6ca7d61b..1f78a161f 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html @@ -77,7 +77,7 @@ 
      * @author Jeremy Long
     30   
      */
    -  31  240 
     public class SuppressionRule {
    +  31  245 
     public class SuppressionRule {
     32   
     
     33   @@ -168,7 +168,7 @@ 
          * A list of CPEs to suppression
     79   
          */
    -  80  240 
         private List<PropertyType> cpe = new ArrayList<PropertyType>();
    +  80  245 
         private List<PropertyType> cpe = new ArrayList<PropertyType>();
     81   
     
     82   @@ -216,8 +216,8 @@ 
          */
     105   
         public void addCpe(PropertyType cpe) {
    -  106  335 
             this.cpe.add(cpe);
    -  107  335 
         }
    +  106  340 
             this.cpe.add(cpe);
    +  107  340 
         }
     108   
     
     109   @@ -241,7 +241,7 @@ 
          * The list of cvssBelow scores.
     119   
          */
    -  120  240 
         private List<Float> cvssBelow = new ArrayList<Float>();
    +  120  245 
         private List<Float> cvssBelow = new ArrayList<Float>();
     121   
     
     122   @@ -314,7 +314,7 @@ 
          * The list of cwe entries to suppress.
     159   
          */
    -  160  240 
         private List<String> cwe = new ArrayList<String>();
    +  160  245 
         private List<String> cwe = new ArrayList<String>();
     161   
     
     162   @@ -387,7 +387,7 @@ 
          * The list of cve entries to suppress.
     199   
          */
    -  200  240 
         private List<String> cve = new ArrayList<String>();
    +  200  245 
         private List<String> cve = new ArrayList<String>();
     201   
     
     202   @@ -460,7 +460,7 @@ 
          * A Maven GAV to suppression.
     239   
          */
    -  240  240 
         private PropertyType gav = null;
    +  240  245 
         private PropertyType gav = null;
     241   
     
     242   @@ -492,8 +492,8 @@ 
          */
     256   
         public void setGav(PropertyType gav) {
    -  257  171 
             this.gav = gav;
    -  258  171 
         }
    +  257  176 
             this.gav = gav;
    +  258  176 
         }
     259   
     
     260   @@ -554,8 +554,8 @@ 
          */
     289   
         public void setBase(boolean base) {
    -  290  227 
             this.base = base;
    -  291  227 
         }
    +  290  232 
             this.base = base;
    +  291  232 
         }
     292   
     
     293   @@ -572,27 +572,27 @@ 
          */
     299   
         public void process(Dependency dependency) {
    -  300  174 
             if (filePath != null && !filePath.matches(dependency.getFilePath())) {
    +  300  178 
             if (filePath != null && !filePath.matches(dependency.getFilePath())) {
     301  12 
                 return;
     302   
             }
    -  303  162 
             if (sha1 != null && !sha1.equalsIgnoreCase(dependency.getSha1sum())) {
    +  303  166 
             if (sha1 != null && !sha1.equalsIgnoreCase(dependency.getSha1sum())) {
     304  1 
                 return;
     305   
             }
    -  306  161 
             if (gav != null) {
    -  307  137 
                 final Iterator<Identifier> itr = dependency.getIdentifiers().iterator();
    -  308  137 
                 boolean gavFound = false;
    -  309  345 
                 while (itr.hasNext()) {
    -  310  209 
                     final Identifier i = itr.next();
    -  311  209 
                     if (identifierMatches("maven", this.gav, i)) {
    +  306  165 
             if (gav != null) {
    +  307  141 
                 final Iterator<Identifier> itr = dependency.getIdentifiers().iterator();
    +  308  141 
                 boolean gavFound = false;
    +  309  355 
                 while (itr.hasNext()) {
    +  310  215 
                     final Identifier i = itr.next();
    +  311  215 
                     if (identifierMatches("maven", this.gav, i)) {
     312  1 
                         gavFound = true;
     313  1 
                         break;
     314   
                     }
    -  315  208 
                 }
    -  316  137 
                 if (!gavFound) {
    -  317  136 
                     return;
    +  315  214 
                 }
    +  316  141 
                 if (!gavFound) {
    +  317  140 
                     return;
     318   
                 }
     319   @@ -733,7 +733,7 @@ 
          */
     412   
         boolean identifierMatches(String identifierType, PropertyType suppressionEntry, Identifier identifier) {
    -  413  260 
             if (identifierType.equals(identifier.getType())) {
    +  413  266 
             if (identifierType.equals(identifier.getType())) {
     414  49 
                 if (suppressionEntry.matches(identifier.getValue())) {
     415  5 
                     return true;
     416  44 
                 } else if ("cpe".equals(identifierType) && cpeHasNoVersion(suppressionEntry)) {
    @@ -750,7 +750,7 @@ 
                 }
     425   
             }
    -  426  218 
             return false;
    +  426  224 
             return false;
     427   
         }
     428   @@ -823,6 +823,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 c4a044931..c1d35cf31 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html @@ -189,6 +189,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 b5b0ec5c1..11c37e398 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html @@ -109,6 +109,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 a363e3112..27d9c7c42 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html @@ -445,6 +445,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 2615beafb..d8861576d 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html @@ -187,6 +187,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 b80149032..abb857d6d 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html @@ -449,6 +449,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileFilterBuilder.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileFilterBuilder.html index f58858a01..81a91b952 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileFilterBuilder.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileFilterBuilder.html @@ -270,6 +270,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 0258af763..8cd7abba6 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html @@ -145,6 +145,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 e245fcdd9..c69209d8e 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html @@ -97,17 +97,17 @@ 
          * @param right the value for the right pair
     41   
          */
    -  42  25656 
         public Pair(L left, R right) {
    -  43  25656 
             this.left = left;
    -  44  25656 
             this.right = right;
    -  45  25656 
         }
    +  42  25715 
         public Pair(L left, R right) {
    +  43  25715 
             this.left = left;
    +  44  25715 
             this.right = right;
    +  45  25715 
         }
     46   
         /**
     47   
          * The left element of the pair.
     48   
          */
    -  49  25656 
         private L left = null;
    +  49  25715 
         private L left = null;
     50   
     
     51   @@ -122,7 +122,7 @@ 
          */
     56   
         public L getLeft() {
    -  57  25656 
             return left;
    +  57  25715 
             return left;
     58   
         }
     59   @@ -147,7 +147,7 @@ 
          * The right element of the pair.
     70   
          */
    -  71  25656 
         private R right = null;
    +  71  25715 
         private R right = null;
     72   
     
     73   @@ -162,7 +162,7 @@ 
          */
     78   
         public R getRight() {
    -  79  25656 
             return right;
    +  79  25715 
             return right;
     80   
         }
     81   @@ -197,10 +197,10 @@ 
         @Override
     97   
         public int hashCode() {
    -  98  25656 
             int hash = 3;
    -  99  25656 
             hash = 53 * hash + (this.left != null ? this.left.hashCode() : 0);
    -  100  25656 
             hash = 53 * hash + (this.right != null ? this.right.hashCode() : 0);
    -  101  25656 
             return hash;
    +  98  25715 
             int hash = 3;
    +  99  25715 
             hash = 53 * hash + (this.left != null ? this.left.hashCode() : 0);
    +  100  25715 
             hash = 53 * hash + (this.right != null ? this.right.hashCode() : 0);
    +  101  25715 
             return hash;
     102   
         }
     103   @@ -245,6 +245,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 3cc38d3ce..406fd5870 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html @@ -125,7 +125,7 @@ 
          */
     56   
         public static boolean containsUrl(String text) {
    -  57  17599 
             return CONTAINS_URL_TEST.matcher(text).matches();
    +  57  22176 
             return CONTAINS_URL_TEST.matcher(text).matches();
     58   
         }
     59   @@ -221,6 +221,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 index 9b901a18e..b45a8106d 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.License.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.License.html @@ -266,6 +266,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 index 8491673c6..a73d0507b 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.Model.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.Model.html @@ -665,6 +665,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 index dd02301c6..666d32ba0 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomHandler.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomHandler.html @@ -354,6 +354,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 index 96420e4cf..ed3f4e175 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParseException.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParseException.html @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 index 6f4ad74cd..84541ae13 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParser.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomParser.html @@ -211,6 +211,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    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 index 4254864c5..80e20ceeb 100644 --- a/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomUtils.html +++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.xml.pom.PomUtils.html @@ -212,6 +212,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:26 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:09 PM.
    diff --git a/dependency-check-core/cpd.html b/dependency-check-core/cpd.html index 36a8a2428..cd3b57ab1 100644 --- a/dependency-check-core/cpd.html +++ b/dependency-check-core/cpd.html @@ -1,13 +1,13 @@ - + dependency-check-core – CPD Results @@ -52,7 +52,7 @@ diff --git a/dependency-check-core/dependency-analysis.html b/dependency-check-core/dependency-analysis.html index e54300a6d..30b74e585 100644 --- a/dependency-check-core/dependency-analysis.html +++ b/dependency-check-core/dependency-analysis.html @@ -1,13 +1,13 @@ - + dependency-check-core – Dependencies Report @@ -52,7 +52,7 @@ @@ -263,7 +263,7 @@ org.slf4j slf4j-api -1.7.16 +1.7.21 compile jar @@ -271,7 +271,7 @@ org.owasp dependency-check-utils -1.3.5 +1.3.6 compile jar @@ -287,7 +287,7 @@ org.jmockit jmockit -1.21 +1.22 test jar @@ -295,7 +295,7 @@ org.apache.commons commons-compress -1.10 +1.11 compile jar @@ -421,7 +421,7 @@ ch.qos.logback logback-classic -1.1.5 +1.1.7 test jar diff --git a/dependency-check-core/dependency-updates-report.html b/dependency-check-core/dependency-updates-report.html index 8307f449d..bd8865bf7 100644 --- a/dependency-check-core/dependency-updates-report.html +++ b/dependency-check-core/dependency-updates-report.html @@ -1,13 +1,13 @@ - + dependency-check-core – Dependency Updates Report @@ -52,7 +52,7 @@ @@ -246,7 +246,7 @@ # of dependencies using the latest version available -19 +24 # of dependencies where the next version available is smaller than an incremental version update @@ -254,15 +254,15 @@ # of dependencies where the next version available is an incremental version update -14 +10 # of dependencies where the next version available is a minor version update -15 +13 # of dependencies where the next version available is a major version update -0 +1

    Dependency Management

    @@ -279,27 +279,27 @@ - + - + - + - + - + - + @@ -351,6 +351,18 @@ + + + + + + + + + + + + @@ -362,7 +374,7 @@ - + @@ -374,7 +386,7 @@ - + @@ -386,7 +398,7 @@ - + @@ -398,11 +410,11 @@ - + - + @@ -410,7 +422,7 @@ - + @@ -422,7 +434,7 @@ - + @@ -434,7 +446,7 @@ - + @@ -446,7 +458,7 @@ - + @@ -458,7 +470,7 @@ - + @@ -470,7 +482,7 @@ - + @@ -482,7 +494,7 @@ - + @@ -494,7 +506,7 @@ - + @@ -506,7 +518,7 @@ - + @@ -518,7 +530,7 @@ - + @@ -530,18 +542,6 @@ - - - - - - - - - - - - @@ -591,16 +591,16 @@ - + - + - + @@ -615,27 +615,27 @@ - + - + - + - + - + - + @@ -825,7 +825,7 @@ - + @@ -913,7 +913,7 @@
    Next Minor Next Major
    ch.qos.logback logback-classic1.1.51.1.7 jar 1.1.6
    ch.qos.logback logback-core1.1.51.1.7 jar 1.1.6
    commons-collectionscommons-collections3.2.2jar20030418.083655
    commons-io commons-io
    junit junit
    org.apache.ant ant
    org.apache.ant ant-testutil
    org.apache.commons commons-compress1.101.11 jar
    org.apache.commons commons-lang3 3.4
    org.apache.lucene lucene-analyzers-common 4.8.0 5.0.0
    org.apache.lucene lucene-core 4.8.0 5.0.0
    org.apache.lucene lucene-queryparser 4.8.0 5.0.0
    org.apache.lucene lucene-test-framework 4.8.0 5.0.0
    org.apache.maven maven-core3.3.9
    org.apache.maven maven-plugin-api3.3.9
    org.apache.maven maven-settings3.3.9
    org.apache.maven.plugin-testing maven-plugin-testing-harness
    org.apache.maven.plugin-tools maven-plugin-annotations
    org.apache.maven.pluginsmaven-site-plugin3.4jar3.5
    org.apache.maven.reporting
    org.jmockit jmockit1.211.22 test jar 1.22
    org.slf4j slf4j-api1.7.161.7.21 jar 1.7.18
    org.slf4j slf4j-simple1.7.161.7.21 jar 1.7.18
    org.owasp dependency-check-utils1.3.51.3.6 compile jar
    - + @@ -922,7 +922,7 @@ - + @@ -931,16 +931,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-classic
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    ch.qos.logback:logback-core

    - + @@ -949,7 +946,7 @@ - + @@ -958,10 +955,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-core
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    com.google.code.findbugs:annotations

    @@ -1066,7 +1060,7 @@ -
    jar
    Newer versions2.5.1 Next Incremental
    2.6 Next Minor
    2.6.1
    2.6.2
    2.6.3
    2.6.4
    2.6.5
    2.6.6
    2.6.7
    2.6.8
    2.6.9
    3.0-RC1
    3.0-RC2 Latest Minor
    3.0 Next Major
    3.0.1
    3.0.2
    3.0.3
    3.1
    3.1.1
    3.1.2
    3.1.3
    3.1.4
    3.1.5
    3.1.6
    3.1.7
    3.1.8
    3.2-RC1
    3.2-RC2
    3.2
    3.2.1
    3.2.2
    3.2.3
    3.2.4
    3.2.5
    3.2.6
    3.3-RC1
    3.3-RC2
    3.3-RC3
    3.3
    3.3-EA
    3.3-EA2
    3.3.1
    3.3.2
    3.3.3
    3.3.4
    3.3.5
    3.4
    3.4-EA
    3.4.1
    3.4.2
    3.4.5
    3.4.6
    3.5-EA
    3.5.1
    3.5.2
    3.5.3
    3.5.4
    3.5.5
    3.6-RC1
    3.6
    3.6-EA
    3.6-EA2
    3.6-EA3
    3.6.1 Latest Major
    +2.5.1 Next Incremental
    2.6 Next Minor
    2.6.1
    2.6.2
    2.6.3
    2.6.4
    2.6.5
    2.6.6
    2.6.7
    2.6.8
    2.6.9
    3.0-RC1
    3.0-RC2 Latest Minor
    3.0 Next Major
    3.0.1
    3.0.2
    3.0.3
    3.1
    3.1.1
    3.1.2
    3.1.3
    3.1.4
    3.1.5
    3.1.6
    3.1.7
    3.1.8
    3.2-RC1
    3.2-RC2
    3.2
    3.2.1
    3.2.2
    3.2.3
    3.2.4
    3.2.5
    3.2.6
    3.3-RC1
    3.3-RC2
    3.3-RC3
    3.3
    3.3-EA
    3.3-EA2
    3.3.1
    3.3.2
    3.3.3
    3.3.4
    3.3.5
    3.4
    3.4-EA
    3.4.1
    3.4.2
    3.4.5
    3.4.6
    3.4.7
    3.5-EA
    3.5.1
    3.5.2
    3.5.3
    3.5.4
    3.5.5
    3.6-RC1
    3.6
    3.6-EA
    3.6-EA2
    3.6-EA3
    3.6.1
    3.6.2 Latest Major

    com.sun.mail:mailapi

    @@ -1116,6 +1110,33 @@
    Type jar
    +

    commons-collections:commons-collections

    + + + + + + + + + + + + + + + + + + + + + + + + +
    Status There is at least one newer major version available. Major updates are rarely passive.
    Group Idcommons-collections
    Artifact Idcommons-collections
    Current Version3.2.2
    Scope
    Classifier
    Typejar
    Newer versions20030418.083655 Next Major
    20031027.000000
    20040102.233541
    20040616 Latest Major
    +

    commons-io:commons-io

    @@ -1306,7 +1327,7 @@ - + @@ -1393,7 +1414,7 @@ -
    commons-compress
    Current Version1.10
    1.11
    Scope
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-core

    @@ -1420,7 +1441,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-queryparser

    @@ -1447,7 +1468,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-test-framework

    @@ -1474,7 +1495,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.maven:maven-core

    @@ -1605,33 +1626,6 @@
    Type jar
    -

    org.apache.maven.plugins:maven-site-plugin

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Idorg.apache.maven.plugins
    Artifact Idmaven-site-plugin
    Current Version3.4
    Scope
    Classifier
    Typejar
    Newer versions3.5 Next Minor
    -

    org.apache.maven.reporting:maven-reporting-api

    @@ -1735,7 +1729,7 @@ -
    jar
    Newer versions2.1.6 Next Incremental
    2.1.8
    2.1.8.1 Latest Incremental
    2.2.1 Next Minor
    2.2.1.1
    2.2.3
    2.2.3.1
    2.3.1
    2.3.1.1
    2.3.1.2
    2.3.3
    2.3.4
    2.3.4.1
    2.3.7
    2.3.8
    2.3.12
    2.3.14
    2.3.14.1
    2.3.14.2
    2.3.14.3
    2.3.15
    2.3.15.1
    2.3.15.2
    2.3.15.3
    2.3.16
    2.3.16.1
    2.3.16.2
    2.3.16.3
    2.3.20
    2.3.20.1
    2.3.24
    2.3.24.1
    2.5-BETA1
    2.5-BETA2
    2.5-BETA3 Latest Minor
    +2.1.6 Next Incremental
    2.1.8
    2.1.8.1 Latest Incremental
    2.2.1 Next Minor
    2.2.1.1
    2.2.3
    2.2.3.1
    2.3.1
    2.3.1.1
    2.3.1.2
    2.3.3
    2.3.4
    2.3.4.1
    2.3.7
    2.3.8
    2.3.12
    2.3.14
    2.3.14.1
    2.3.14.2
    2.3.14.3
    2.3.15
    2.3.15.1
    2.3.15.2
    2.3.15.3
    2.3.16
    2.3.16.1
    2.3.16.2
    2.3.16.3
    2.3.20
    2.3.20.1
    2.3.24
    2.3.24.1
    2.3.28
    2.5-BETA1
    2.5-BETA2
    2.5-BETA3 Latest Minor

    org.apache.velocity:velocity

    @@ -1867,7 +1861,7 @@
    - + @@ -1876,7 +1870,7 @@ - + @@ -1885,10 +1879,7 @@ - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
     No newer versions available.
    Group Id org.jmockit
    jmockit
    Current Version1.21
    1.22
    Scope test
    Typejar
    Newer versions1.22 Next Minor
    +jar

    org.jsoup:jsoup

    @@ -1954,7 +1945,7 @@ - + @@ -1969,7 +1960,7 @@
    dependency-check-utils
    Current Version1.3.5
    1.3.6
    Scope compile
    - + @@ -1978,7 +1969,7 @@ - + @@ -1987,16 +1978,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-api
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.slf4j:slf4j-simple

    - + @@ -2005,7 +1993,7 @@ - + @@ -2014,10 +2002,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-simple
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.sonatype.plexus:plexus-sec-dispatcher

    diff --git a/dependency-check-core/failsafe-report.html b/dependency-check-core/failsafe-report.html index 9a5f561ea..03deb63f0 100644 --- a/dependency-check-core/failsafe-report.html +++ b/dependency-check-core/failsafe-report.html @@ -1,13 +1,13 @@ - + dependency-check-core – Surefire Report @@ -52,7 +52,7 @@ @@ -275,7 +275,7 @@ function toggleDisplay(elementId) { -
    0 0 100%121.4

    +143.237

    Note: failures are anticipated and checked for with assertions while errors are unanticipated.


    Package List

    @@ -296,7 +296,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.988 +1.219 org.owasp.dependencycheck.reporting 2 @@ -304,7 +304,7 @@ function toggleDisplay(elementId) { 0 0 100% -6.87 +6.977 org.owasp.dependencycheck.data.update.nvd 1 @@ -312,7 +312,7 @@ function toggleDisplay(elementId) { 0 0 100% -30.599 +25.83 org.owasp.dependencycheck.data.nvdcve 9 @@ -320,7 +320,7 @@ function toggleDisplay(elementId) { 0 0 100% -6.057 +6.156 org.owasp.dependencycheck 1 @@ -328,7 +328,7 @@ function toggleDisplay(elementId) { 0 0 100% -46.064 +71.83 org.owasp.dependencycheck.analyzer 21 @@ -336,7 +336,7 @@ function toggleDisplay(elementId) { 0 0 100% -30.822
    +31.225

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

    org.owasp.dependencycheck.data.update

    @@ -367,7 +367,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.988
    +1.219

    org.owasp.dependencycheck.reporting

    @@ -388,7 +388,7 @@ function toggleDisplay(elementId) { -
    0 0 100%6.87
    +6.977

    org.owasp.dependencycheck.data.update.nvd

    @@ -409,7 +409,7 @@ function toggleDisplay(elementId) { -
    0 0 100%30.599
    +25.83

    org.owasp.dependencycheck.data.nvdcve

    @@ -430,7 +430,7 @@ function toggleDisplay(elementId) { - + @@ -439,7 +439,7 @@ function toggleDisplay(elementId) { -
    0 0 100%2.765
    2.813
    DatabasePropertiesIntegrationTest0 0 100%3.292
    +3.343

    org.owasp.dependencycheck

    @@ -460,7 +460,7 @@ function toggleDisplay(elementId) { -
    0 0 100%46.064
    +71.83

    org.owasp.dependencycheck.analyzer

    @@ -481,7 +481,7 @@ function toggleDisplay(elementId) { - + @@ -490,7 +490,7 @@ function toggleDisplay(elementId) { - + @@ -508,7 +508,7 @@ function toggleDisplay(elementId) { -
    0 0 100%22.69
    23.749
    CPEAnalyzerIntegrationTest0 0 100%5.393
    5.144
    DependencyBundlingAnalyzerIntegrationTest0 0 100%2.739

    +2.332

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -518,23 +518,23 @@ function toggleDisplay(elementId) { testAnalyzeTar -3.639 +5.274 testAnalyzeTgz -5.807 +5.381 testAnalyzeTarBz2 -3.87 +3.742 testAnalyze -1.237 +1.608 testGetAnalysisPhase -0.001 +0 testGetName @@ -542,7 +542,7 @@ function toggleDisplay(elementId) { testAnalyze_badZip -0.588 +0.526 testInitialize @@ -550,15 +550,15 @@ function toggleDisplay(elementId) { testAnalyzeTbz2 -3.443 +3.339 testAnalyzeTarGz -3.156 +3.144 testSupportsExtension -0.001 +0 testSupportsExtensions @@ -569,23 +569,23 @@ function toggleDisplay(elementId) { testSearchCPE -1.736 +1.616 testDetermineCPE -1.265 +1.392 testDetermineIdentifiers -0.887 +0.91 testDetermineCPE_full -1.497 +1.224 testBuildSearch -0.001
    +0

    DependencyBundlingAnalyzerIntegrationTest

    @@ -599,11 +599,11 @@ function toggleDisplay(elementId) { - + - + @@ -618,38 +618,38 @@ function toggleDisplay(elementId) { - + - + -
    testAnalyze2.737
    2.332
    testGetAnalysisPhase0.001
    0
    testGetName
    testGetCPEs0.519
    0.561
    testGetVulnerabilities0.655
    0.631
    testGetMatchingSoftware0.538
    +0.567

    DatabasePropertiesIntegrationTest

    - + - + - + - + -
    testSave1.13
    1.087
    testGetProperty_String_String0.585
    0.577
    testGetProperties0.532
    0.577
    testGetProperty_String0.518
    0.535
    testIsEmpty0.527
    +0.567

    CpeUpdaterIntegrationTest

    @@ -663,28 +663,28 @@ function toggleDisplay(elementId) { -
    testUpdate30.598
    +25.83

    NvdCveUpdaterIntegrationTest

    -
    testUpdatesNeeded0.988
    +1.219

    EngineIntegrationTest

    -
    testEngine46.061
    +71.825

    ReportGeneratorIntegrationTest

    - + diff --git a/dependency-check-core/findbugs.html b/dependency-check-core/findbugs.html index b960e1478..65f3fdb97 100644 --- a/dependency-check-core/findbugs.html +++ b/dependency-check-core/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-core – FindBugs Bug Detector Report @@ -52,7 +52,7 @@ @@ -255,7 +255,7 @@ - +
    testGenerateXMLReport6.87
    6.976
    testGenerateReport Missing Classes
    13345 0 0
    @@ -272,17 +272,20 @@ 2 org.owasp.dependencycheck.analyzer.JarAnalyzer +1 + +org.owasp.dependencycheck.analyzer.RubyBundleAuditAnalyzer 1

    org.owasp.dependencycheck.analyzer.CMakeAnalyzer

    - + - + @@ -291,19 +294,19 @@

    org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer

    Bug Category Details Line Priority
    Found reliance on default encoding in org.owasp.dependencycheck.analyzer.CMakeAnalyzer.analyzeSetVersionCommand(Dependency, Engine, String): String.getBytes() I18N DM_DEFAULT_ENCODING
    - + - + - + @@ -312,17 +315,32 @@

    org.owasp.dependencycheck.analyzer.JarAnalyzer

    Bug Category Details Line Priority
    Possible null pointer dereference of currentVersion on branch that might be infeasible in org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.removeSpuriousCPE(Dependency) STYLE NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE 188 Medium
    Possible null pointer dereference of nextVersion on branch that might be infeasible in org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.removeSpuriousCPE(Dependency) STYLE NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE
    - + - + +
    Bug Category Details Line Priority
    org.owasp.dependencycheck.analyzer.JarAnalyzer.parseManifest(Dependency, List) makes inefficient use of keySet iterator instead of entrySet iterator PERFORMANCE WMI_WRONG_MAP_ITERATOR 778Medium
    +
    +

    org.owasp.dependencycheck.analyzer.RubyBundleAuditAnalyzer

    + + + + + + + + + + + +
    BugCategoryDetailsLinePriority
    org.owasp.dependencycheck.analyzer.RubyBundleAuditAnalyzer.analyzeFileType(Dependency, Engine) may fail to close streamBAD_PRACTICEOS_OPEN_STREAM208 Medium
    diff --git a/dependency-check-core/index.html b/dependency-check-core/index.html index 3c6f65261..67b4f2bef 100644 --- a/dependency-check-core/index.html +++ b/dependency-check-core/index.html @@ -1,13 +1,13 @@ - + dependency-check-core – About @@ -52,7 +52,7 @@ diff --git a/dependency-check-core/integration.html b/dependency-check-core/integration.html index 1f4a87b84..b4a65433d 100644 --- a/dependency-check-core/integration.html +++ b/dependency-check-core/integration.html @@ -1,15 +1,15 @@ - + - dependency-check-core – Continuous Integration + dependency-check-core – CI Management @@ -52,7 +52,7 @@ @@ -96,14 +96,14 @@
  • - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -115,30 +115,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-core/issue-tracking.html b/dependency-check-core/issue-tracking.html index 3cc4a8b94..7c7da9c49 100644 --- a/dependency-check-core/issue-tracking.html +++ b/dependency-check-core/issue-tracking.html @@ -1,15 +1,15 @@ - + - dependency-check-core – Issue Tracking + dependency-check-core – Issue Management @@ -52,7 +52,7 @@ @@ -96,16 +96,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -117,28 +117,28 @@
  • - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -194,8 +194,8 @@

    Overview

    This project uses github to manage its issues.

    -

    Issue Tracking

    -

    Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.

    +

    Issue Management

    +

    Issues, bugs, and feature requests should be submitted to the following issue management system for this project.

    https://github.com/jeremylong/DependencyCheck/issues
    diff --git a/dependency-check-core/license.html b/dependency-check-core/license.html index 515a68a18..59da377d0 100644 --- a/dependency-check-core/license.html +++ b/dependency-check-core/license.html @@ -1,15 +1,15 @@ - + - dependency-check-core – Project License + dependency-check-core – Project Licenses @@ -52,7 +52,7 @@ @@ -96,16 +96,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -117,28 +117,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - Project License + Licenses
    • @@ -189,15 +189,15 @@
    -
    + +

    Overview

    Typically the licenses listed for the project are that of the project itself, and not of dependencies.

    -

    Project License

    +

    Project Licenses

    The Apache Software License, Version 2.0

    -
    -
    +
                                      Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/dependency-check-core/mail-lists.html b/dependency-check-core/mail-lists.html
index 8afc8d1f5..4d64a4147 100644
--- a/dependency-check-core/mail-lists.html
+++ b/dependency-check-core/mail-lists.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-core – Project Mailing Lists
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Project Mailing Lists
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -96,16 +96,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -115,30 +115,30 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
diff --git a/dependency-check-core/plugin-updates-report.html b/dependency-check-core/plugin-updates-report.html
index 43a86e95e..b30020c09 100644
--- a/dependency-check-core/plugin-updates-report.html
+++ b/dependency-check-core/plugin-updates-report.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-core – Plugin Updates Report
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Plugin Updates Report
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
diff --git a/dependency-check-core/pmd.html b/dependency-check-core/pmd.html
index 745d6cc4e..a305652eb 100644
--- a/dependency-check-core/pmd.html
+++ b/dependency-check-core/pmd.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-core – PMD Results
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • PMD Results
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -315,13 +315,13 @@
 Line
 
 These nested if statements could be combined
-247–249
+263–265
 
 Useless parentheses.
-255
+271
 
 Useless parentheses.
-266
    
+282

    org/owasp/dependencycheck/data/cpe/IndexEntry.java

    diff --git a/dependency-check-core/project-info.html b/dependency-check-core/project-info.html index 64c2cee2f..0a189ab3c 100644 --- a/dependency-check-core/project-info.html +++ b/dependency-check-core/project-info.html @@ -1,13 +1,13 @@ - + dependency-check-core – Project Information @@ -52,7 +52,7 @@
    • - + /
      • @@ -64,9 +64,9 @@
    • Project Information
      • -
    • | Last Published: 2016-03-05
      • +
    • | Last Published: 2016-04-09
    • - Version: 1.3.5 + Version: 1.3.6
    @@ -94,16 +94,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -115,30 +115,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -200,25 +200,25 @@ - + - + - + - + - + - +
    Document Description
    Continuous IntegrationCI Management This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
    Project SummarySummary This document lists other related information of this project
    Mailing Lists This document provides subscription and archive information for this project's mailing lists.
    Issue TrackingIssue Management This document provides information on the issue management system used in this project.
    Project TeamTeam This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
    Source RepositorySource Code Management This document lists ways to access the online source repository.
    Project LicenseLicenses This document lists the project license(s).
    diff --git a/dependency-check-core/project-reports.html b/dependency-check-core/project-reports.html index 6f7a09686..d50a2db45 100644 --- a/dependency-check-core/project-reports.html +++ b/dependency-check-core/project-reports.html @@ -1,13 +1,13 @@ - + dependency-check-core – Generated Reports @@ -52,7 +52,7 @@ diff --git a/dependency-check-core/project-summary.html b/dependency-check-core/project-summary.html index 2fbd926af..4fb3eb7ea 100644 --- a/dependency-check-core/project-summary.html +++ b/dependency-check-core/project-summary.html @@ -1,13 +1,13 @@ - + dependency-check-core – Project Summary @@ -52,7 +52,7 @@ @@ -96,14 +96,14 @@
  • - + - Continuous Integration + CI Management
  • - Project Summary + Summary
  • @@ -115,30 +115,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -233,7 +233,7 @@ dependency-check-core Version -1.3.5 +1.3.6 Type jar diff --git a/dependency-check-core/source-repository.html b/dependency-check-core/source-repository.html index be47ac2ce..e10325bec 100644 --- a/dependency-check-core/source-repository.html +++ b/dependency-check-core/source-repository.html @@ -1,15 +1,15 @@ - + - dependency-check-core – Source Repository + dependency-check-core – Source Code Management @@ -52,7 +52,7 @@ @@ -96,16 +96,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -117,28 +117,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-core/surefire-report.html b/dependency-check-core/surefire-report.html index 79634d5d8..fc6ceb75e 100644 --- a/dependency-check-core/surefire-report.html +++ b/dependency-check-core/surefire-report.html @@ -1,13 +1,13 @@ - + dependency-check-core – Surefire Report @@ -52,7 +52,7 @@ @@ -270,12 +270,12 @@ function toggleDisplay(elementId) { Success Rate Time -226 +227 0 0 -9 -96.018% -23.641
    +7 +96.916% +15.731

    Note: failures are anticipated and checked for with assertions while errors are unanticipated.


    Package List

    @@ -296,7 +296,7 @@ function toggleDisplay(elementId) { 0 0 100% -2.44 +2.594 org.owasp.dependencycheck.dependency 26 @@ -304,7 +304,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.002 +0.001 org.owasp.dependencycheck.data.nexus 4 @@ -312,7 +312,7 @@ function toggleDisplay(elementId) { 0 4 0% -0.001 +0 org.owasp.dependencycheck.data.composer 4 @@ -320,7 +320,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.003 +0 org.owasp.dependencycheck.suppression 36 @@ -328,7 +328,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.001 +0.003 org.owasp.dependencycheck.data.nuget 3 @@ -344,15 +344,15 @@ function toggleDisplay(elementId) { 0 0 100% -0.002 +0 org.owasp.dependencycheck.analyzer -73 +74 0 0 -5 -93.151% -18.188 +3 +95.946% +10.353 org.owasp.dependencycheck.data.cpe 1 @@ -368,7 +368,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.869 +0.684 org.owasp.dependencycheck.data.cwe 1 @@ -376,7 +376,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.01 +0 org.owasp.dependencycheck.data.update.nvd 14 @@ -384,7 +384,7 @@ function toggleDisplay(elementId) { 0 0 100% -1.128 +1.089 org.owasp.dependencycheck.xml.pom 23 @@ -392,7 +392,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.001 +0 org.owasp.dependencycheck.data.nvdcve 7 @@ -400,7 +400,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.605 +0.691 org.owasp.dependencycheck.data.central 5 @@ -408,7 +408,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.391
    +0.316

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

    org.owasp.dependencycheck.data.update

    @@ -430,7 +430,7 @@ function toggleDisplay(elementId) { 0 0 100% -2.173 +2.271 EngineVersionCheckTest @@ -439,7 +439,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.267
    +0.323

    org.owasp.dependencycheck.dependency

    @@ -478,7 +478,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.001
    +0

    org.owasp.dependencycheck.data.nexus

    @@ -499,7 +499,7 @@ function toggleDisplay(elementId) { -
    0 4 0%0.001
    +0

    org.owasp.dependencycheck.data.composer

    @@ -520,7 +520,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.003
    +0

    org.owasp.dependencycheck.suppression

    @@ -559,7 +559,7 @@ function toggleDisplay(elementId) { - + @@ -568,7 +568,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0
    0.001
    SuppressionRuleTest0 0 100%0
    +0.001

    org.owasp.dependencycheck.data.nuget

    @@ -619,7 +619,7 @@ function toggleDisplay(elementId) { - + @@ -637,7 +637,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.001
    0
    DependencyVersionUtilTest0 0 100%0.001
    +0

    org.owasp.dependencycheck.analyzer

    @@ -658,7 +658,7 @@ function toggleDisplay(elementId) { - + @@ -667,7 +667,7 @@ function toggleDisplay(elementId) { - + @@ -676,7 +676,7 @@ function toggleDisplay(elementId) { - + @@ -685,7 +685,7 @@ function toggleDisplay(elementId) { - + @@ -694,7 +694,7 @@ function toggleDisplay(elementId) { - + @@ -703,7 +703,7 @@ function toggleDisplay(elementId) { - + @@ -712,7 +712,7 @@ function toggleDisplay(elementId) { - + @@ -721,7 +721,7 @@ function toggleDisplay(elementId) { - + @@ -730,7 +730,7 @@ function toggleDisplay(elementId) { - + @@ -748,7 +748,7 @@ function toggleDisplay(elementId) { - + @@ -757,7 +757,7 @@ function toggleDisplay(elementId) { - + @@ -766,7 +766,7 @@ function toggleDisplay(elementId) { - + @@ -775,7 +775,7 @@ function toggleDisplay(elementId) { - + @@ -784,7 +784,7 @@ function toggleDisplay(elementId) { - + @@ -802,7 +802,7 @@ function toggleDisplay(elementId) { - + @@ -811,16 +811,16 @@ function toggleDisplay(elementId) { - + - + - - - + + + @@ -829,7 +829,7 @@ function toggleDisplay(elementId) { -
    0 0 100%1.134
    0.878
    AbstractSuppressionAnalyzerTest0 0 100%0.568
    0.508
    AnalyzerServiceTest0 0 100%0.1
    0.075
    ArchiveAnalyzerTest0 1 0%0
    0.001
    AssemblyAnalyzerTest0 1 80%1.03
    0.809
    AutoconfAnalyzerTest0 0 100%0.034
    0.031
    CMakeAnalyzerTest0 0 100%1.002
    0.937
    ComposerLockAnalyzerTest0 0 100%0.14
    0.1
    DependencyBundlingAnalyzerTest0 0 100%0
    0.001
    FalsePositiveAnalyzerTest0 0 100%0
    0.001
    HintAnalyzerTest0 0 100%5.932
    4.82
    JarAnalyzerTest0 0 100%0.195
    0.131
    NodePackageAnalyzerTest0 0 100%0.001
    0
    NuspecAnalyzerTest0 0 100%0.001
    0
    OpenSSLAnalyzerTest0 0 100%2.043
    2.037
    PythonPackageAnalyzerTest0 0 100%1.993
    0
    RubyBundleAuditAnalyzerTest34 0 030%2.015
    175%0.022
    RubyGemspecAnalyzerTest0 0 100%1.998
    +0

    org.owasp.dependencycheck.data.cpe

    @@ -889,7 +889,7 @@ function toggleDisplay(elementId) { - + @@ -898,7 +898,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.23
    0.222
    UrlTokenizingFilterTest0 0 100%0.639
    +0.462

    org.owasp.dependencycheck.data.cwe

    @@ -919,7 +919,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.01
    +0

    org.owasp.dependencycheck.data.update.nvd

    @@ -940,7 +940,7 @@ function toggleDisplay(elementId) { - + @@ -949,7 +949,7 @@ function toggleDisplay(elementId) { - + @@ -967,7 +967,7 @@ function toggleDisplay(elementId) { - + @@ -976,7 +976,7 @@ function toggleDisplay(elementId) { -
    0 0 100%1.128
    1.057
    NvdCveInfoTest0 0 100%0
    0.016
    NvdCve_1_2_HandlerTest0 0 100%0
    0.015
    UpdateableNvdCveTest0 0 100%0
    +0.001

    org.owasp.dependencycheck.xml.pom

    @@ -1006,7 +1006,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.001
    +0

    org.owasp.dependencycheck.data.nvdcve

    @@ -1027,7 +1027,7 @@ function toggleDisplay(elementId) { - + @@ -1036,7 +1036,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.538
    0.522
    DriverLoaderTest0 0 100%0.067
    +0.169

    org.owasp.dependencycheck.data.central

    @@ -1057,7 +1057,7 @@ function toggleDisplay(elementId) { -
    0 0 100%0.391

    +0.316

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -1067,22 +1067,22 @@ function toggleDisplay(elementId) { testNewHashSet -0.023
    +0.02

    AbstractSuppressionAnalyzerTest

    - + - + - + @@ -1093,7 +1093,7 @@ function toggleDisplay(elementId) { -
    testFailureToLocateSuppressionFileAnywhere0.331
    0.293
    testGetRulesFromSuppressionFileFromURL0.19
    0.168
    testGetRulesFromSuppressionFileInClasspath0.045
    0.04
    testGetSupportedExtensions
    testGetAnalyzers0.097
    +0.075

    ArchiveAnalyzerTest

    @@ -1112,11 +1112,11 @@ function toggleDisplay(elementId) { - + - + - + -
    testGetName0.425
    0.328
    testAnalysis0.187
    0.151
    testWithSettingMono @@ -1129,11 +1129,11 @@ function toggleDisplay(elementId) {
    testNonexistent0.13
    0.088
    testLog4Net0.215
    +0.179

    AutoconfAnalyzerTest

    @@ -1152,15 +1152,15 @@ function toggleDisplay(elementId) { - + - + -
    testAnalyzeConfigureScript0.024
    0.031
    testAnalyzeConfigureAC10.004
    0
    testAnalyzeConfigureAC20.004
    +0

    CMakeAnalyzerTest

    @@ -1179,11 +1179,11 @@ function toggleDisplay(elementId) { - + -
    testAnalyzeCMakeListsOpenCV3rdParty1
    0.936
    testAccept0
    +0.001

    ComposerLockAnalyzerTest

    @@ -1194,11 +1194,11 @@ function toggleDisplay(elementId) { - + -
    testAnalyzePackageJson0.14
    0.099
    testSupportsFiles0
    +0.001

    DependencyBundlingAnalyzerTest

    @@ -1266,7 +1266,7 @@ function toggleDisplay(elementId) { - + @@ -1274,26 +1274,26 @@ function toggleDisplay(elementId) { -
    testAnalyze5.93
    4.82
    testGetAnalysisPhase
    testGetName0.001
    +0

    JarAnalyzerTest

    - + - + - + -
    testAnalyze0.145
    0.1
    testGetName0.002
    0
    testAcceptSupportedExtensions0.001
    0
    testParseManifest0.047
    +0.031

    NodePackageAnalyzerTest

    @@ -1342,7 +1342,7 @@ function toggleDisplay(elementId) { -
    testAccept0.001
    +0

    PythonDistributionAnalyzerTest

    @@ -1361,15 +1361,15 @@ function toggleDisplay(elementId) { - + - + - + @@ -1377,7 +1377,7 @@ function toggleDisplay(elementId) { -
    testAnalyzeEggArchiveNamedZip0.01
    0.012
    testAnalyzeWheel0.019
    0.014
    testAnalyzeEggInfoFolder0.007
    0
    testAnalyzeSitePackage
    testSupportsFiles0.002
    +0

    PythonPackageAnalyzerTest

    @@ -1397,14 +1397,13 @@ function toggleDisplay(elementId) {

    RubyBundleAuditAnalyzerTest

    - - + + - - - + + + - - - - - - -
    testGetName -
    + [ Detail ]
    		testMissingBundleAudit 0
    skipped
    testGetName0
    testAnalysis @@ -1415,14 +1414,9 @@ function toggleDisplay(elementId) { skipped
    testSupportsFiles -
    + [ Detail ]
    		0
    skipped
    + +testSupportsFiles +0

    RubyGemspecAnalyzerTest

    @@ -1444,11 +1438,11 @@ function toggleDisplay(elementId) { - + - + @@ -1456,18 +1450,18 @@ function toggleDisplay(elementId) { - + -
    testMultipleReturns0.256
    0.185
    testNullSha10.001
    0
    testMalformedSha1
    testValidSha10.076
    0.069
    testMissingSha10.055
    +0.062

    ComposerLockParserTest

    - + @@ -1475,11 +1469,11 @@ function toggleDisplay(elementId) { - + -
    testNotPackagesArray0.001
    0
    testValidComposerLock
    testNotComposer0.001
    0
    testNotJSON0.001
    +0

    IndexEntryTest

    @@ -1526,26 +1520,26 @@ function toggleDisplay(elementId) { - + -
    testClear0.06
    0.047
    testExamples0.008
    +0

    UrlTokenizingFilterTest

    - - + + - - + + - -
    testEmptyTerm0.016
    testExamples0.046
    testRandomStrings0.592
    testEmptyTerm0
    testExamples0.004
    +testRandomStrings +0.415

    NexusSearchTest

    @@ -1606,7 +1600,7 @@ function toggleDisplay(elementId) { -
    testInitialize0.538
    +0.522

    DriverLoaderTest

    @@ -1629,11 +1623,11 @@ function toggleDisplay(elementId) { - + -
    testLoad_String_String0.021
    0.031
    testLoad_String_String_multiple_paths0.046
    +0.138

    BaseUpdaterTest

    @@ -1644,37 +1638,37 @@ function toggleDisplay(elementId) { - + - + -
    testOpenDataStores1.082
    1.107
    testGetProperties0.551
    0.586
    testCloseDataStores0.539
    +0.578

    EngineVersionCheckTest

    - + -
    testShouldUpdate0.246
    0.283
    testGetCurrentReleaseVersion0.021
    +0.04

    DownloadTaskTest

    - + -
    testIsXML0
    0.033
    testCall1.083
    +1.009

    NvdCveInfoTest

    @@ -1689,7 +1683,7 @@ function toggleDisplay(elementId) { - + @@ -2041,7 +2035,7 @@ function toggleDisplay(elementId) { - + @@ -2184,24 +2178,12 @@ function toggleDisplay(elementId) { - - - - - - - - - - - - diff --git a/dependency-check-core/taglist.html b/dependency-check-core/taglist.html index c57d3db6b..57b4c63db 100644 --- a/dependency-check-core/taglist.html +++ b/dependency-check-core/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-core – Tag List report @@ -52,7 +52,7 @@ diff --git a/dependency-check-core/team-list.html b/dependency-check-core/team-list.html index 69b25db43..7b3243d71 100644 --- a/dependency-check-core/team-list.html +++ b/dependency-check-core/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-core – Project Team @@ -52,7 +52,7 @@ @@ -96,16 +96,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -117,28 +117,28 @@
  • - + - Issue Tracking + Issue Management
  • - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -191,9 +191,9 @@
    -

    The Team

    +

    Project Team

    A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.

    -

    The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    +

    The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    Members

    The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.

    diff --git a/dependency-check-core/xref-test/index.html b/dependency-check-core/xref-test/index.html index 4acfc8770..bb6a4037a 100644 --- a/dependency-check-core/xref-test/index.html +++ b/dependency-check-core/xref-test/index.html @@ -4,7 +4,7 @@ - Dependency-Check Core 1.3.5 Reference + Dependency-Check Core 1.3.6 Reference diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html index 17ad23763..eb035d832 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html @@ -25,96 +25,127 @@ 17 */ 18 package org.owasp.dependencycheck.analyzer; 19 -20 import org.junit.After; -21 import org.junit.Assume; -22 import org.junit.Before; -23 import org.junit.Test; -24 import org.owasp.dependencycheck.BaseTest; -25 import org.owasp.dependencycheck.Engine; -26 import org.owasp.dependencycheck.analyzer.exception.AnalysisException; -27 import org.owasp.dependencycheck.data.nvdcve.DatabaseException; -28 import org.owasp.dependencycheck.dependency.Dependency; -29 import org.slf4j.Logger; -30 import org.slf4j.LoggerFactory; -31 -32 import java.io.File; -33 -34 import static org.hamcrest.CoreMatchers.is; -35 import static org.hamcrest.CoreMatchers.not; -36 import static org.junit.Assert.assertThat; -37 -38 /** -39 * Unit tests for {@link RubyBundleAuditAnalyzer}. -40 * -41 * @author Dale Visser -42 */ -43 public class RubyBundleAuditAnalyzerTest extends BaseTest { -44 -45 private static final Logger LOGGER = LoggerFactory.getLogger(RubyBundleAuditAnalyzerTest.class); -46 -47 /** -48 * The analyzer to test. -49 */ -50 RubyBundleAuditAnalyzer analyzer; -51 -52 /** -53 * Correctly setup the analyzer for testing. -54 * -55 * @throws Exception thrown if there is a problem -56 */ -57 @Before -58 public void setUp() throws Exception { -59 try { -60 analyzer = new RubyBundleAuditAnalyzer(); -61 analyzer.setFilesMatched(true); -62 analyzer.initialize(); -63 } catch (Exception e) { -64 //LOGGER.warn("Exception setting up RubyBundleAuditAnalyzer. Tests will be incomplete", e); -65 Assume.assumeNoException("Exception setting up RubyBundleAuditAnalyzer; bundle audit may not be installed. Tests will be incomplete", e); -66 } -67 } -68 -69 /** -70 * Cleanup the analyzer's temp files, etc. -71 * -72 * @throws Exception thrown if there is a problem -73 */ -74 @After -75 public void tearDown() throws Exception { -76 analyzer.close(); -77 analyzer = null; -78 } -79 -80 /** -81 * Test Ruby Gemspec name. -82 */ -83 @Test -84 public void testGetName() { -85 assertThat(analyzer.getName(), is("Ruby Bundle Audit Analyzer")); -86 } -87 -88 /** -89 * Test Ruby Bundler Audit file support. -90 */ -91 @Test -92 public void testSupportsFiles() { -93 assertThat(analyzer.accept(new File("Gemfile.lock")), is(true)); -94 } -95 -96 /** -97 * Test Ruby BundlerAudit analysis. -98 * -99 * @throws AnalysisException is thrown when an exception occurs. -100 */ -101 @Test -102 public void testAnalysis() throws AnalysisException, DatabaseException { -103 final Dependency result = new Dependency(BaseTest.getResourceAsFile(this, -104 "ruby/vulnerable/Gemfile.lock")); -105 final Engine engine = new Engine(); -106 analyzer.analyze(result, engine); -107 assertThat(engine.getDependencies().size(), is(not(0))); -108 } -109 } +20 import static org.hamcrest.CoreMatchers.is; +21 import static org.junit.Assert.assertThat; +22 import static org.junit.Assert.assertTrue; +23 +24 import java.io.File; +25 +26 import org.junit.After; +27 import org.junit.Assume; +28 import org.junit.Before; +29 import org.junit.Test; +30 import org.owasp.dependencycheck.BaseTest; +31 import org.owasp.dependencycheck.Engine; +32 import org.owasp.dependencycheck.analyzer.exception.AnalysisException; +33 import org.owasp.dependencycheck.data.nvdcve.DatabaseException; +34 import org.owasp.dependencycheck.dependency.Dependency; +35 import org.owasp.dependencycheck.utils.Settings; +36 import org.slf4j.Logger; +37 import org.slf4j.LoggerFactory; +38 +39 /** +40 * Unit tests for {@link RubyBundleAuditAnalyzer}. +41 * +42 * @author Dale Visser +43 */ +44 public class RubyBundleAuditAnalyzerTest extends BaseTest { +45 +46 private static final Logger LOGGER = LoggerFactory.getLogger(RubyBundleAuditAnalyzerTest.class); +47 +48 /** +49 * The analyzer to test. +50 */ +51 RubyBundleAuditAnalyzer analyzer; +52 +53 /** +54 * Correctly setup the analyzer for testing. +55 * +56 * @throws Exception thrown if there is a problem +57 */ +58 @Before +59 public void setUp() throws Exception { +60 Settings.initialize(); +61 analyzer = new RubyBundleAuditAnalyzer(); +62 analyzer.setFilesMatched(true); +63 } +64 +65 /** +66 * Cleanup the analyzer's temp files, etc. +67 * +68 * @throws Exception thrown if there is a problem +69 */ +70 @After +71 public void tearDown() throws Exception { +72 Settings.cleanup(); +73 analyzer.close(); +74 analyzer = null; +75 } +76 +77 /** +78 * Test Ruby Gemspec name. +79 */ +80 @Test +81 public void testGetName() { +82 assertThat(analyzer.getName(), is("Ruby Bundle Audit Analyzer")); +83 } +84 +85 /** +86 * Test Ruby Bundler Audit file support. +87 */ +88 @Test +89 public void testSupportsFiles() { +90 assertThat(analyzer.accept(new File("Gemfile.lock")), is(true)); +91 } +92 +93 /** +94 * Test Ruby BundlerAudit analysis. +95 * +96 * @throws AnalysisException is thrown when an exception occurs. +97 */ +98 @Test +99 public void testAnalysis() throws AnalysisException, DatabaseException { +100 try { +101 analyzer.initialize(); +102 +103 final Dependency result = new Dependency(BaseTest.getResourceAsFile(this, +104 "ruby/vulnerable/gems/rails-4.1.15/Gemfile.lock")); +105 final Engine engine = new Engine(); +106 analyzer.analyze(result, engine); +107 int size = engine.getDependencies().size(); +108 assertThat(size, is(1)); +109 +110 Dependency dependency = engine.getDependencies().get(0); +111 assertTrue(dependency.getProductEvidence().toString().toLowerCase().contains("redcarpet")); +112 assertTrue(dependency.getVersionEvidence().toString().toLowerCase().contains("2.2.2")); +113 +114 } catch (Exception e) { +115 LOGGER.warn("Exception setting up RubyBundleAuditAnalyzer. Make sure Ruby gem bundle-audit is installed. You may also need to set property \"analyzer.bundle.audit.path\".", e); +116 Assume.assumeNoException("Exception setting up RubyBundleAuditAnalyzer; bundle audit may not be installed, or property \"analyzer.bundle.audit.path\" may not be set.", e); +117 } +118 } +119 +120 /** +121 * Test when Ruby bundle-audit is not available on the system. +122 * +123 * @throws AnalysisException is thrown when an exception occurs. +124 */ +125 @Test +126 public void testMissingBundleAudit() throws AnalysisException, DatabaseException { +127 //set a non-exist bundle-audit +128 Settings.setString(Settings.KEYS.ANALYZER_BUNDLE_AUDIT_PATH, "phantom-bundle-audit"); +129 try { +130 //initialize should fail. +131 analyzer.initialize(); +132 } catch (Exception e) { +133 //expected, so ignore. +134 } +135 finally { +136 assertThat(analyzer.isEnabled(), is(false)); +137 LOGGER.info("phantom-bundle-audit is not available. Ruby Bundle Audit Analyzer is disabled as expected."); +138 } +139 } +140 }
    diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html index 628d1f96d..6423f2e67 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html index bbabd2dd6..a4c69e44d 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-frame.html index ff6e31d82..aca06a0b1 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-summary.html index 27d13b892..f1771eddd 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/central/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html index 84e9a7e6c..a5bdfad79 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html index bd579d9ce..a342338ae 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html index 680a658b7..1889ec728 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html index 18ef0cc86..7b5882536 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html index ace42fdc3..b8ac19665 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html index 0430878b7..0a7c24db2 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html index 188e84d45..08d5187eb 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html index 5c8ab1f5a..171e48ce7 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html index 341d7caf9..85e5ce40a 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html index c0e477f1b..691d02a59 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html index fa08f3bab..8bda52742 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html index cfe01ff02..98d3f6437 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html index b0d651cd7..47a6efb0e 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html index f6fea6d00..2ebd22021 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html index dc984ea69..122a53a82 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html index a02118bb5..499e3693e 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-frame.html index b26a823b7..b9d7870cc 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-summary.html index 7bd9ad22c..98b6f30ac 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/data/update/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-frame.html index 7d91d18ae..c9eb89ea0 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-summary.html index 61f1d3a01..25d9f3c87 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/dependency/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/package-frame.html index 394dee9ff..30bcb85ac 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/package-summary.html index a01952a3a..0e465a813 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html index 07c2d3f4a..facb42cb9 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-summary.html index 71c2ae850..a25ddcc01 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/reporting/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-frame.html index aad5ddeeb..ce886c354 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-summary.html index 9c879999a..7a4b3e8c6 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/suppression/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-frame.html index fbb1adfb1..a1ed0106c 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-summary.html index 914bd58d7..4785ceaca 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/utils/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html index 115b7df11..52929518d 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html b/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html index bc2f599a1..65f206207 100644 --- a/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html +++ b/dependency-check-core/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/dependency-check-core/xref-test/overview-frame.html b/dependency-check-core/xref-test/overview-frame.html index 74a257643..f29080b74 100644 --- a/dependency-check-core/xref-test/overview-frame.html +++ b/dependency-check-core/xref-test/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference + Dependency-Check Core 1.3.6 Reference diff --git a/dependency-check-core/xref-test/overview-summary.html b/dependency-check-core/xref-test/overview-summary.html index 16cd6b27c..1a5deb8a0 100644 --- a/dependency-check-core/xref-test/overview-summary.html +++ b/dependency-check-core/xref-test/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference + Dependency-Check Core 1.3.6 Reference @@ -24,7 +24,7 @@
    -

    Dependency-Check Core 1.3.5 Reference

    +

    Dependency-Check Core 1.3.6 Reference

    testSetGetOldSchemaVersionUrl0
    0.016
    testSetGetUrl
    testEquals0.001
    0
    testGetVersionPartsskipped: skipped
    testGetName
    skipped: skipped
    testAnalysis
    skipped: skipped
    testSupportsFiles
    skipped: skipped
    testNullSha1
    diff --git a/dependency-check-core/xref/index.html b/dependency-check-core/xref/index.html index 4acfc8770..bb6a4037a 100644 --- a/dependency-check-core/xref/index.html +++ b/dependency-check-core/xref/index.html @@ -4,7 +4,7 @@ - Dependency-Check Core 1.3.5 Reference + Dependency-Check Core 1.3.6 Reference diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-frame.html index f02c9636c..1cfb5be0d 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.agent + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.agent diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-summary.html index 9280b3dcb..a39b3e89c 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/agent/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.agent + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.agent diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html index 8a02ef33d..6d2cc1c4f 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html @@ -26,98 +26,107 @@ 18package org.owasp.dependencycheck.analyzer; 1920import java.io.File; -21import org.apache.commons.io.FilenameUtils; -22import org.owasp.dependencycheck.Engine; -23import org.owasp.dependencycheck.analyzer.exception.AnalysisException; -24import org.owasp.dependencycheck.dependency.Confidence; -25import org.owasp.dependencycheck.dependency.Dependency; -26import org.owasp.dependencycheck.utils.DependencyVersion; -27import org.owasp.dependencycheck.utils.DependencyVersionUtil; -28 -29/** -30 * -31 * Takes a dependency and analyzes the filename and determines the hashes. +21 +22import org.apache.commons.io.FilenameUtils; +23import org.apache.commons.io.filefilter.NameFileFilter; +24import org.owasp.dependencycheck.Engine; +25import org.owasp.dependencycheck.analyzer.exception.AnalysisException; +26import org.owasp.dependencycheck.dependency.Confidence; +27import org.owasp.dependencycheck.dependency.Dependency; +28import org.owasp.dependencycheck.utils.DependencyVersion; +29import org.owasp.dependencycheck.utils.DependencyVersionUtil; +30 +31/**32 * -33 * @author Jeremy Long -34 */ -35publicclassFileNameAnalyzerextendsAbstractAnalyzerimplementsAnalyzer { -36 -37//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"> -38/** -39 * The name of the analyzer. -40 */ -41privatestaticfinal String ANALYZER_NAME = "File Name Analyzer"; -42/** -43 * The phase that this analyzer is intended to run in. -44 */ -45privatestaticfinalAnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION; -46 -47/** -48 * Returns the name of the analyzer. -49 * -50 * @return the name of the analyzer. -51 */ -52 @Override -53public String getName() { -54return ANALYZER_NAME; -55 } -56 -57/** -58 * Returns the phase that the analyzer is intended to run in. -59 * -60 * @return the phase that the analyzer is intended to run in. -61 */ -62 @Override -63publicAnalysisPhase getAnalysisPhase() { -64return ANALYSIS_PHASE; -65 } -66//</editor-fold> -67 -68/** -69 * Collects information about the file name. -70 * -71 * @param dependency the dependency to analyze. -72 * @param engine the engine that is scanning the dependencies -73 * @throws AnalysisException is thrown if there is an error reading the JAR file. -74 */ -75 @Override -76publicvoid analyze(Dependency dependency, Engine engine) throws AnalysisException { -77 -78//strip any path information that may get added by ArchiveAnalyzer, etc. -79final File f = dependency.getActualFile(); -80final String fileName = FilenameUtils.removeExtension(f.getName()); -81 -82//add version evidence -83finalDependencyVersion version = DependencyVersionUtil.parseVersion(fileName); -84if (version != null) { -85// If the version number is just a number like 2 or 23, reduce the confidence -86// a shade. This should hopefully correct for cases like log4j.jar or -87// struts2-core.jar -88if (version.getVersionParts() == null || version.getVersionParts().size() < 2) { -89 dependency.getVersionEvidence().addEvidence("file", "name", -90 version.toString(), Confidence.MEDIUM); -91 } else { -92 dependency.getVersionEvidence().addEvidence("file", "name", -93 version.toString(), Confidence.HIGHEST); -94 } -95 dependency.getVersionEvidence().addEvidence("file", "name", -96 fileName, Confidence.MEDIUM); -97 } -98 -99//add as vendor and product evidence -100if (fileName.contains("-")) { -101 dependency.getProductEvidence().addEvidence("file", "name", -102 fileName, Confidence.HIGHEST); -103 dependency.getVendorEvidence().addEvidence("file", "name", -104 fileName, Confidence.HIGHEST); -105 } else { -106 dependency.getProductEvidence().addEvidence("file", "name", -107 fileName, Confidence.HIGH); -108 dependency.getVendorEvidence().addEvidence("file", "name", -109 fileName, Confidence.HIGH); -110 } -111 } -112 } +33 * Takes a dependency and analyzes the filename and determines the hashes. +34 * +35 * @author Jeremy Long +36 */ +37publicclassFileNameAnalyzerextendsAbstractAnalyzerimplementsAnalyzer { +38 +39//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"> +40/** +41 * The name of the analyzer. +42 */ +43privatestaticfinal String ANALYZER_NAME = "File Name Analyzer"; +44/** +45 * The phase that this analyzer is intended to run in. +46 */ +47privatestaticfinalAnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION; +48 +49/** +50 * Returns the name of the analyzer. +51 * +52 * @return the name of the analyzer. +53 */ +54 @Override +55public String getName() { +56return ANALYZER_NAME; +57 } +58 +59/** +60 * Returns the phase that the analyzer is intended to run in. +61 * +62 * @return the phase that the analyzer is intended to run in. +63 */ +64 @Override +65publicAnalysisPhase getAnalysisPhase() { +66return ANALYSIS_PHASE; +67 } +68//</editor-fold> +69 +70// Python init files +71privatestaticfinal NameFileFilter IGNORED_FILES = new NameFileFilter(new String[] { +72"__init__.py", +73"__init__.pyc", +74"__init__.pyo" +75 }); +76 +77/** +78 * Collects information about the file name. +79 * +80 * @param dependency the dependency to analyze. +81 * @param engine the engine that is scanning the dependencies +82 * @throws AnalysisException is thrown if there is an error reading the JAR file. +83 */ +84 @Override +85publicvoid analyze(Dependency dependency, Engine engine) throws AnalysisException { +86 +87//strip any path information that may get added by ArchiveAnalyzer, etc. +88final File f = dependency.getActualFile(); +89final String fileName = FilenameUtils.removeExtension(f.getName()); +90 +91//add version evidence +92finalDependencyVersion version = DependencyVersionUtil.parseVersion(fileName); +93if (version != null) { +94// If the version number is just a number like 2 or 23, reduce the confidence +95// a shade. This should hopefully correct for cases like log4j.jar or +96// struts2-core.jar +97if (version.getVersionParts() == null || version.getVersionParts().size() < 2) { +98 dependency.getVersionEvidence().addEvidence("file", "name", +99 version.toString(), Confidence.MEDIUM); +100 } else { +101 dependency.getVersionEvidence().addEvidence("file", "name", +102 version.toString(), Confidence.HIGHEST); +103 } +104 dependency.getVersionEvidence().addEvidence("file", "name", +105 fileName, Confidence.MEDIUM); +106 } +107 +108//add as vendor and product evidence +109if (fileName.contains("-")) { +110 dependency.getProductEvidence().addEvidence("file", "name", +111 fileName, Confidence.HIGHEST); +112 dependency.getVendorEvidence().addEvidence("file", "name", +113 fileName, Confidence.HIGHEST); +114 } elseif (!IGNORED_FILES.accept(f)) { +115 dependency.getProductEvidence().addEvidence("file", "name", +116 fileName, Confidence.HIGH); +117 dependency.getVendorEvidence().addEvidence("file", "name", +118 fileName, Confidence.HIGH); +119 } +120 } +121 }
    diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html index e82736060..8bae17722 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html @@ -193,7 +193,7 @@ 185if (found) { 186 dependency.setDisplayFileName(parentName + "/__init__.py"); 187 dependency.getProductEvidence().addEvidence(file.getName(), -188"PackageName", parentName, Confidence.MEDIUM); +188"PackageName", parentName, Confidence.HIGH); 189 } else { 190// copy, alter and set in case some other thread is iterating over191final List<Dependency> dependencies = new ArrayList<Dependency>( diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html index 4fd6162fc..93be2b0d4 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html @@ -91,247 +91,263 @@ 83final ProcessBuilder builder = new ProcessBuilder(args); 84 builder.directory(folder); 85try { -86return builder.start(); -87 } catch (IOException ioe) { -88thrownewAnalysisException("bundle-audit failure", ioe); -89 } -90 } -91 -92/** -93 * Initialize the analyzer. In this case, extract GrokAssembly.exe to a temporary location. -94 * -95 * @throws Exception if anything goes wrong -96 */ -97 @Override -98publicvoid initializeFileTypeAnalyzer() throws Exception { -99// Now, need to see if bundle-audit actually runs from this location. -100 Process process = launchBundleAudit(Settings.getTempDirectory()); -101int exitValue = process.waitFor(); -102if (0 == exitValue) { -103 LOGGER.warn("Unexpected exit code from bundle-audit process. Disabling {}: {}", ANALYZER_NAME, exitValue); -104 setEnabled(false); -105thrownewAnalysisException("Unexpected exit code from bundle-audit process."); -106 } else { -107 BufferedReader reader = null; -108try { -109 reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); -110if (!reader.ready()) { -111 LOGGER.warn("Bundle-audit error stream unexpectedly not ready. Disabling " + ANALYZER_NAME); -112 setEnabled(false); -113thrownewAnalysisException("Bundle-audit error stream unexpectedly not ready."); -114 } else { -115final String line = reader.readLine(); -116if (line == null || !line.contains("Errno::ENOENT")) { -117 LOGGER.warn("Unexpected bundle-audit output. Disabling {}: {}", ANALYZER_NAME, line); -118 setEnabled(false); -119thrownewAnalysisException("Unexpected bundle-audit output."); -120 } -121 } -122 } finally { -123if (null != reader) { -124 reader.close(); -125 } -126 } -127 } -128if (isEnabled()) { -129 LOGGER.info(ANALYZER_NAME + " is enabled. It is necessary to manually run \"bundle-audit update\" " -130 + "occasionally to keep its database up to date."); -131 } -132 } -133 -134/** -135 * Returns the name of the analyzer. -136 * -137 * @return the name of the analyzer. -138 */ -139 @Override -140public String getName() { -141return ANALYZER_NAME; -142 } -143 -144/** -145 * Returns the phase that the analyzer is intended to run in. -146 * -147 * @return the phase that the analyzer is intended to run in. -148 */ -149 @Override -150publicAnalysisPhase getAnalysisPhase() { -151return ANALYSIS_PHASE; -152 } -153 -154/** -155 * Returns the key used in the properties file to reference the analyzer's enabled property. -156 * -157 * @return the analyzer's enabled property setting key -158 */ -159 @Override -160protected String getAnalyzerEnabledSettingKey() { -161return Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED; -162 } -163 -164/** -165 * If {@link #analyzeFileType(Dependency, Engine)} is called, then we have successfully initialized, and it will be necessary -166 * to disable {@link RubyGemspecAnalyzer}. -167 */ -168privateboolean needToDisableGemspecAnalyzer = true; -169 +86 LOGGER.info("Launching: " + args + " from " + folder); +87return builder.start(); +88 } catch (IOException ioe) { +89thrownewAnalysisException("bundle-audit failure", ioe); +90 } +91 } +92 +93/** +94 * Initialize the analyzer. In this case, extract GrokAssembly.exe to a temporary location. +95 * +96 * @throws Exception if anything goes wrong +97 */ +98 @Override +99publicvoid initializeFileTypeAnalyzer() throws Exception { +100// Now, need to see if bundle-audit actually runs from this location. +101 Process process = null; +102try { +103 process = launchBundleAudit(Settings.getTempDirectory()); +104 } +105catch(AnalysisException ae) { +106 LOGGER.warn("Exception from bundle-audit process: {}. Disabling {}", ae.getCause(), ANALYZER_NAME); +107 setEnabled(false); +108throw ae; +109 } +110 +111int exitValue = process.waitFor(); +112if (0 == exitValue) { +113 LOGGER.warn("Unexpected exit code from bundle-audit process. Disabling {}: {}", ANALYZER_NAME, exitValue); +114 setEnabled(false); +115thrownewAnalysisException("Unexpected exit code from bundle-audit process."); +116 } else { +117 BufferedReader reader = null; +118try { +119 reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); +120if (!reader.ready()) { +121 LOGGER.warn("Bundle-audit error stream unexpectedly not ready. Disabling " + ANALYZER_NAME); +122 setEnabled(false); +123thrownewAnalysisException("Bundle-audit error stream unexpectedly not ready."); +124 } else { +125final String line = reader.readLine(); +126if (line == null || !line.contains("Errno::ENOENT")) { +127 LOGGER.warn("Unexpected bundle-audit output. Disabling {}: {}", ANALYZER_NAME, line); +128 setEnabled(false); +129thrownewAnalysisException("Unexpected bundle-audit output."); +130 } +131 } +132 } finally { +133if (null != reader) { +134 reader.close(); +135 } +136 } +137 } +138 +139if (isEnabled()) { +140 LOGGER.info(ANALYZER_NAME + " is enabled. It is necessary to manually run \"bundle-audit update\" " +141 + "occasionally to keep its database up to date."); +142 } +143 } +144 +145/** +146 * Returns the name of the analyzer. +147 * +148 * @return the name of the analyzer. +149 */ +150 @Override +151public String getName() { +152return ANALYZER_NAME; +153 } +154 +155/** +156 * Returns the phase that the analyzer is intended to run in. +157 * +158 * @return the phase that the analyzer is intended to run in. +159 */ +160 @Override +161publicAnalysisPhase getAnalysisPhase() { +162return ANALYSIS_PHASE; +163 } +164 +165/** +166 * Returns the key used in the properties file to reference the analyzer's enabled property. +167 * +168 * @return the analyzer's enabled property setting key +169 */170 @Override -171protectedvoid analyzeFileType(Dependency dependency, Engine engine) -172throwsAnalysisException { -173if (needToDisableGemspecAnalyzer) { -174boolean failed = true; -175final String className = RubyGemspecAnalyzer.class.getName(); -176for (FileTypeAnalyzer analyzer : engine.getFileTypeAnalyzers()) { -177if (analyzer instanceof RubyGemspecAnalyzer) { -178 ((RubyGemspecAnalyzer) analyzer).setEnabled(false); -179 LOGGER.info("Disabled " + className + " to avoid noisy duplicate results."); -180 failed = false; -181 } -182 } -183if (failed) { -184 LOGGER.warn("Did not find" + className + '.'); -185 } -186 needToDisableGemspecAnalyzer = false; -187 } -188final File parentFile = dependency.getActualFile().getParentFile(); -189final Process process = launchBundleAudit(parentFile); -190try { -191 process.waitFor(); -192 } catch (InterruptedException ie) { -193thrownewAnalysisException("bundle-audit process interrupted", ie); -194 } -195 BufferedReader rdr = null; -196try { -197 rdr = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8")); -198 processBundlerAuditOutput(dependency, engine, rdr); -199 } catch (IOException ioe) { -200 LOGGER.warn("bundle-audit failure", ioe); -201 } finally { -202if (null != rdr) { -203try { -204 rdr.close(); -205 } catch (IOException ioe) { -206 LOGGER.warn("bundle-audit close failure", ioe); -207 } -208 } -209 } -210 -211 } -212 -213privatevoid processBundlerAuditOutput(Dependency original, Engine engine, BufferedReader rdr) throws IOException { -214final String parentName = original.getActualFile().getParentFile().getName(); -215final String fileName = original.getFileName(); -216Dependency dependency = null; -217Vulnerability vulnerability = null; -218 String gem = null; -219final Map<String, Dependency> map = new HashMap<String, Dependency>(); -220boolean appendToDescription = false; -221while (rdr.ready()) { -222final String nextLine = rdr.readLine(); -223if (null == nextLine) { -224break; -225 } elseif (nextLine.startsWith(NAME)) { -226 appendToDescription = false; -227 gem = nextLine.substring(NAME.length()); -228if (!map.containsKey(gem)) { -229 map.put(gem, createDependencyForGem(engine, parentName, fileName, gem)); -230 } -231 dependency = map.get(gem); -232 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -233 } elseif (nextLine.startsWith(VERSION)) { -234 vulnerability = createVulnerability(parentName, dependency, vulnerability, gem, nextLine); -235 } elseif (nextLine.startsWith(ADVISORY)) { -236 setVulnerabilityName(parentName, dependency, vulnerability, nextLine); -237 } elseif (nextLine.startsWith(CRITICALITY)) { -238 addCriticalityToVulnerability(parentName, vulnerability, nextLine); -239 } elseif (nextLine.startsWith("URL: ")) { -240 addReferenceToVulnerability(parentName, vulnerability, nextLine); -241 } elseif (nextLine.startsWith("Description:")) { -242 appendToDescription = true; -243if (null != vulnerability) { -244 vulnerability.setDescription("*** Vulnerability obtained from bundle-audit verbose report. Title link may not work. CPE below is guessed. CVSS score is estimated (-1.0 indicates unknown). See link below for full details. *** "); -245 } -246 } elseif (appendToDescription) { -247if (null != vulnerability) { -248 vulnerability.setDescription(vulnerability.getDescription() + nextLine + "\n"); -249 } -250 } -251 } -252 } -253 -254privatevoid setVulnerabilityName(String parentName, Dependency dependency, Vulnerability vulnerability, String nextLine) { -255final String advisory = nextLine.substring((ADVISORY.length())); -256if (null != vulnerability) { -257 vulnerability.setName(advisory); -258 } -259if (null != dependency) { -260 dependency.getVulnerabilities().add(vulnerability); // needed to wait for vulnerability name to avoid NPE -261 } -262 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -263 } -264 -265privatevoid addReferenceToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { -266final String url = nextLine.substring(("URL: ").length()); -267if (null != vulnerability) { -268Reference ref = newReference(); -269 ref.setName(vulnerability.getName()); -270 ref.setSource("bundle-audit"); -271 ref.setUrl(url); -272 vulnerability.getReferences().add(ref); -273 } -274 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -275 } -276 -277privatevoid addCriticalityToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { -278if (null != vulnerability) { -279final String criticality = nextLine.substring(CRITICALITY.length()).trim(); -280if ("High".equals(criticality)) { -281 vulnerability.setCvssScore(8.5f); -282 } elseif ("Medium".equals(criticality)) { -283 vulnerability.setCvssScore(5.5f); -284 } elseif ("Low".equals(criticality)) { -285 vulnerability.setCvssScore(2.0f); -286 } else { -287 vulnerability.setCvssScore(-1.0f); -288 } +171protected String getAnalyzerEnabledSettingKey() { +172return Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED; +173 } +174 +175/** +176 * If {@link #analyzeFileType(Dependency, Engine)} is called, then we have successfully initialized, and it will be necessary +177 * to disable {@link RubyGemspecAnalyzer}. +178 */ +179privateboolean needToDisableGemspecAnalyzer = true; +180 +181 @Override +182protectedvoid analyzeFileType(Dependency dependency, Engine engine) +183throwsAnalysisException { +184if (needToDisableGemspecAnalyzer) { +185boolean failed = true; +186final String className = RubyGemspecAnalyzer.class.getName(); +187for (FileTypeAnalyzer analyzer : engine.getFileTypeAnalyzers()) { +188if (analyzer instanceof RubyGemspecAnalyzer) { +189 ((RubyGemspecAnalyzer) analyzer).setEnabled(false); +190 LOGGER.info("Disabled " + className + " to avoid noisy duplicate results."); +191 failed = false; +192 } +193 } +194if (failed) { +195 LOGGER.warn("Did not find" + className + '.'); +196 } +197 needToDisableGemspecAnalyzer = false; +198 } +199final File parentFile = dependency.getActualFile().getParentFile(); +200final Process process = launchBundleAudit(parentFile); +201try { +202 process.waitFor(); +203 } catch (InterruptedException ie) { +204thrownewAnalysisException("bundle-audit process interrupted", ie); +205 } +206 BufferedReader rdr = null; +207try { +208 BufferedReader errReader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); +209while(errReader.ready()) { +210 String error = errReader.readLine(); +211 LOGGER.warn(error); +212 } +213 rdr = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8")); +214 processBundlerAuditOutput(dependency, engine, rdr); +215 } catch (IOException ioe) { +216 LOGGER.warn("bundle-audit failure", ioe); +217 } finally { +218if (null != rdr) { +219try { +220 rdr.close(); +221 } catch (IOException ioe) { +222 LOGGER.warn("bundle-audit close failure", ioe); +223 } +224 } +225 } +226 +227 } +228 +229privatevoid processBundlerAuditOutput(Dependency original, Engine engine, BufferedReader rdr) throws IOException { +230final String parentName = original.getActualFile().getParentFile().getName(); +231final String fileName = original.getFileName(); +232Dependency dependency = null; +233Vulnerability vulnerability = null; +234 String gem = null; +235final Map<String, Dependency> map = new HashMap<String, Dependency>(); +236boolean appendToDescription = false; +237while (rdr.ready()) { +238final String nextLine = rdr.readLine(); +239if (null == nextLine) { +240break; +241 } elseif (nextLine.startsWith(NAME)) { +242 appendToDescription = false; +243 gem = nextLine.substring(NAME.length()); +244if (!map.containsKey(gem)) { +245 map.put(gem, createDependencyForGem(engine, parentName, fileName, gem)); +246 } +247 dependency = map.get(gem); +248 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +249 } elseif (nextLine.startsWith(VERSION)) { +250 vulnerability = createVulnerability(parentName, dependency, vulnerability, gem, nextLine); +251 } elseif (nextLine.startsWith(ADVISORY)) { +252 setVulnerabilityName(parentName, dependency, vulnerability, nextLine); +253 } elseif (nextLine.startsWith(CRITICALITY)) { +254 addCriticalityToVulnerability(parentName, vulnerability, nextLine); +255 } elseif (nextLine.startsWith("URL: ")) { +256 addReferenceToVulnerability(parentName, vulnerability, nextLine); +257 } elseif (nextLine.startsWith("Description:")) { +258 appendToDescription = true; +259if (null != vulnerability) { +260 vulnerability.setDescription("*** Vulnerability obtained from bundle-audit verbose report. Title link may not work. CPE below is guessed. CVSS score is estimated (-1.0 indicates unknown). See link below for full details. *** "); +261 } +262 } elseif (appendToDescription) { +263if (null != vulnerability) { +264 vulnerability.setDescription(vulnerability.getDescription() + nextLine + "\n"); +265 } +266 } +267 } +268 } +269 +270privatevoid setVulnerabilityName(String parentName, Dependency dependency, Vulnerability vulnerability, String nextLine) { +271final String advisory = nextLine.substring((ADVISORY.length())); +272if (null != vulnerability) { +273 vulnerability.setName(advisory); +274 } +275if (null != dependency) { +276 dependency.getVulnerabilities().add(vulnerability); // needed to wait for vulnerability name to avoid NPE +277 } +278 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +279 } +280 +281privatevoid addReferenceToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { +282final String url = nextLine.substring(("URL: ").length()); +283if (null != vulnerability) { +284Reference ref = newReference(); +285 ref.setName(vulnerability.getName()); +286 ref.setSource("bundle-audit"); +287 ref.setUrl(url); +288 vulnerability.getReferences().add(ref); 289 } 290 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); 291 } 292 -293privateVulnerability createVulnerability(String parentName, Dependency dependency, Vulnerability vulnerability, String gem, String nextLine) { -294if (null != dependency) { -295final String version = nextLine.substring(VERSION.length()); -296 dependency.getVersionEvidence().addEvidence( -297"bundler-audit", -298"Version", -299 version, -300 Confidence.HIGHEST); -301 vulnerability = newVulnerability(); // don't add to dependency until we have name set later -302 vulnerability.setMatchedCPE( -303 String.format("cpe:/a:%1$s_project:%1$s:%2$s::~~~ruby~~", gem, version), -304null); -305 vulnerability.setCvssAccessVector("-"); -306 vulnerability.setCvssAccessComplexity("-"); -307 vulnerability.setCvssAuthentication("-"); -308 vulnerability.setCvssAvailabilityImpact("-"); -309 vulnerability.setCvssConfidentialityImpact("-"); -310 vulnerability.setCvssIntegrityImpact("-"); -311 } -312 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -313return vulnerability; -314 } -315 -316privateDependency createDependencyForGem(Engine engine, String parentName, String fileName, String gem) throws IOException { -317final File tempFile = File.createTempFile("Gemfile-" + gem, ".lock", Settings.getTempDirectory()); -318final String displayFileName = String.format("%s%c%s:%s", parentName, File.separatorChar, fileName, gem); -319 FileUtils.write(tempFile, displayFileName); // unique contents to avoid dependency bundling -320finalDependency dependency = newDependency(tempFile); -321 dependency.getProductEvidence().addEvidence("bundler-audit", "Name", gem, Confidence.HIGHEST); -322 dependency.setDisplayFileName(displayFileName); -323 engine.getDependencies().add(dependency); -324return dependency; -325 } -326 } +293privatevoid addCriticalityToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { +294if (null != vulnerability) { +295final String criticality = nextLine.substring(CRITICALITY.length()).trim(); +296if ("High".equals(criticality)) { +297 vulnerability.setCvssScore(8.5f); +298 } elseif ("Medium".equals(criticality)) { +299 vulnerability.setCvssScore(5.5f); +300 } elseif ("Low".equals(criticality)) { +301 vulnerability.setCvssScore(2.0f); +302 } else { +303 vulnerability.setCvssScore(-1.0f); +304 } +305 } +306 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +307 } +308 +309privateVulnerability createVulnerability(String parentName, Dependency dependency, Vulnerability vulnerability, String gem, String nextLine) { +310if (null != dependency) { +311final String version = nextLine.substring(VERSION.length()); +312 dependency.getVersionEvidence().addEvidence( +313"bundler-audit", +314"Version", +315 version, +316 Confidence.HIGHEST); +317 vulnerability = newVulnerability(); // don't add to dependency until we have name set later +318 vulnerability.setMatchedCPE( +319 String.format("cpe:/a:%1$s_project:%1$s:%2$s::~~~ruby~~", gem, version), +320null); +321 vulnerability.setCvssAccessVector("-"); +322 vulnerability.setCvssAccessComplexity("-"); +323 vulnerability.setCvssAuthentication("-"); +324 vulnerability.setCvssAvailabilityImpact("-"); +325 vulnerability.setCvssConfidentialityImpact("-"); +326 vulnerability.setCvssIntegrityImpact("-"); +327 } +328 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +329return vulnerability; +330 } +331 +332privateDependency createDependencyForGem(Engine engine, String parentName, String fileName, String gem) throws IOException { +333final File tempFile = File.createTempFile("Gemfile-" + gem, ".lock", Settings.getTempDirectory()); +334final String displayFileName = String.format("%s%c%s:%s", parentName, File.separatorChar, fileName, gem); +335 FileUtils.write(tempFile, displayFileName); // unique contents to avoid dependency bundling +336finalDependency dependency = newDependency(tempFile); +337 dependency.getProductEvidence().addEvidence("bundler-audit", "Name", gem, Confidence.HIGHEST); +338 dependency.setDisplayFileName(displayFileName); +339 engine.getDependencies().add(dependency); +340return dependency; +341 } +342 }
    diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html index 13685e071..ce3f75470 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.analyzer.exception + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.analyzer.exception diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html index 772776f18..341d1b0c3 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.analyzer.exception + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.analyzer.exception diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-frame.html index 5a4054d67..3f69b68d2 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-summary.html index 4bae1b374..dc55d48d1 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/analyzer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-frame.html index 5bcce011c..a70c3d199 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-summary.html index 7b3550308..6046e2c35 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/central/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-frame.html index 1d00328ec..ff20887ce 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-summary.html index 7d77607fd..b4f821391 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/composer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-frame.html index 7916e2e78..b032e2597 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-summary.html index 52d87b291..8fe9e4630 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/cpe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-frame.html index 3ee162736..7b88bcf63 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-summary.html index 04f9f0e80..fe678a295 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/cwe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-frame.html index 8d6244552..ad521bc4e 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-summary.html index 856e87c2b..298aa1edb 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/lucene/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-frame.html index 0b8005da4..1aee7e778 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-summary.html index beca64835..4ca282c71 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/nexus/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html index fc2b0405e..fa1ddf464 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-summary.html index ebc65957b..689676322 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/nuget/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html index d7c8f571f..ea1166c2e 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html index 733ceeaa6..5715cadbf 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html index a00d5f805..dac667f69 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.cpe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.cpe diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html index d34b47538..bbe44ce89 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.cpe + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.cpe diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html index 2dafc72a8..61290944a 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.exception + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.exception diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html index e2c2f346c..12ccbae68 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.exception + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.exception diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html index a0c8c36c1..59376923d 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html index 4e29aa3ce..70b9753ed 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-frame.html index bcd6d9e01..5375e6b00 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-summary.html index 899d839e7..1fc1fe749 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/data/update/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-frame.html index f0047146b..f5ebb248b 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-summary.html index 554be15ea..e1c65c505 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/dependency/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-frame.html index a346dc245..fce19b696 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.exception + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.exception diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-summary.html index c8e28b1d4..34134ccea 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/exception/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.exception + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.exception diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/package-frame.html index fe499dcb1..f08868051 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/package-summary.html index 91fdd33a3..d706b2c2e 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-frame.html index 1fd21de13..66dc070e4 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html index 7f10d2617..6d1fc5cfc 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/reporting/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-frame.html index ba0ee2de2..6b66d9aea 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-summary.html index d08d4034f..f3b719522 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/suppression/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html index 561f3bbe1..3205316e2 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-summary.html index e29348b56..f18252cbb 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/utils/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-frame.html b/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-frame.html index 2fbc333e7..2efd6af86 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-frame.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-summary.html b/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-summary.html index 89e82e190..4dc26febb 100644 --- a/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-summary.html +++ b/dependency-check-core/xref/org/owasp/dependencycheck/xml/pom/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check Core 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/dependency-check-core/xref/overview-frame.html b/dependency-check-core/xref/overview-frame.html index 725c94366..21869e23f 100644 --- a/dependency-check-core/xref/overview-frame.html +++ b/dependency-check-core/xref/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference + Dependency-Check Core 1.3.6 Reference diff --git a/dependency-check-core/xref/overview-summary.html b/dependency-check-core/xref/overview-summary.html index d0ad197ee..aed179e8c 100644 --- a/dependency-check-core/xref/overview-summary.html +++ b/dependency-check-core/xref/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Core 1.3.5 Reference + Dependency-Check Core 1.3.6 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check Core 1.3.5 Reference

    +

    Dependency-Check Core 1.3.6 Reference

    diff --git a/dependency-check-gradle/configuration-purge.html b/dependency-check-gradle/configuration-purge.html index b2a525b95..4bca014e3 100644 --- a/dependency-check-gradle/configuration-purge.html +++ b/dependency-check-gradle/configuration-purge.html @@ -1,13 +1,13 @@ - + dependency-check-gradle – Tasks @@ -59,9 +59,9 @@
  • Tasks
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -246,7 +246,7 @@ - + @@ -301,13 +301,16 @@
    [dependencyCheckUpdate]](configuration-update.html) dependencyCheckUpdate Updates the local cache of the NVD data from NIST.
    -

    $H$H$H$H Example groovy -dependencyCheckPurge { +

    +

    Example

    + +
    +
    dependencyCheckPurge {
     data {
         directory='d:/nvd'
     }
 }
-
    +
    diff --git a/dependency-check-gradle/configuration-update.html b/dependency-check-gradle/configuration-update.html index 7ad4baa32..11c3aac6f 100644 --- a/dependency-check-gradle/configuration-update.html +++ b/dependency-check-gradle/configuration-update.html @@ -1,13 +1,13 @@ - + dependency-check-gradle – Tasks @@ -59,9 +59,9 @@
  • Tasks
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/dependency-check-gradle/configuration.html b/dependency-check-gradle/configuration.html index 7ee6336d1..e3b0fe3c8 100644 --- a/dependency-check-gradle/configuration.html +++ b/dependency-check-gradle/configuration.html @@ -1,13 +1,13 @@ - + dependency-check-gradle – Tasks @@ -59,9 +59,9 @@
  • Tasks
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/dependency-check-gradle/index.html b/dependency-check-gradle/index.html index 587d58f5e..fddab7999 100644 --- a/dependency-check-gradle/index.html +++ b/dependency-check-gradle/index.html @@ -1,13 +1,13 @@ - + dependency-check-gradle – Usage @@ -59,9 +59,9 @@
  • Usage
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -239,7 +239,7 @@ mavenCentral() } dependencies { - classpath 'org.owasp:dependency-check-gradle:1.3.5' + classpath 'org.owasp:dependency-check-gradle:1.3.6' } } diff --git a/dependency-check-jenkins/index.html b/dependency-check-jenkins/index.html index 2b0a75434..26b5c3447 100644 --- a/dependency-check-jenkins/index.html +++ b/dependency-check-jenkins/index.html @@ -1,13 +1,13 @@ - + dependency-check – Dependency-Check Jenkins Plugin @@ -59,9 +59,9 @@
  • Dependency-Check Jenkins Plugin
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/dependency-check-maven/aggregate-mojo.html b/dependency-check-maven/aggregate-mojo.html index 90c0be581..a3979c619 100644 --- a/dependency-check-maven/aggregate-mojo.html +++ b/dependency-check-maven/aggregate-mojo.html @@ -1,13 +1,13 @@ - + dependency-check-maven – dependency-check:aggregate @@ -52,7 +52,7 @@ @@ -158,7 +158,7 @@

    Full name:

    -

    org.owasp:dependency-check-maven:1.3.5.1:aggregate

    +

    org.owasp:dependency-check-maven:1.3.6:aggregate

    Description:

    diff --git a/dependency-check-maven/apidocs/allclasses-frame.html b/dependency-check-maven/apidocs/allclasses-frame.html index ea62f0ec0..ea9f0ab54 100644 --- a/dependency-check-maven/apidocs/allclasses-frame.html +++ b/dependency-check-maven/apidocs/allclasses-frame.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Maven Plugin 1.3.5 API) - +All Classes (Dependency-Check Maven Plugin 1.3.6 API) + diff --git a/dependency-check-maven/apidocs/allclasses-noframe.html b/dependency-check-maven/apidocs/allclasses-noframe.html index bdc4c3a64..10a72f807 100644 --- a/dependency-check-maven/apidocs/allclasses-noframe.html +++ b/dependency-check-maven/apidocs/allclasses-noframe.html @@ -2,10 +2,10 @@ - + -All Classes (Dependency-Check Maven Plugin 1.3.5 API) - +All Classes (Dependency-Check Maven Plugin 1.3.6 API) + diff --git a/dependency-check-maven/apidocs/constant-values.html b/dependency-check-maven/apidocs/constant-values.html index 072c7e0a1..fd88ff15d 100644 --- a/dependency-check-maven/apidocs/constant-values.html +++ b/dependency-check-maven/apidocs/constant-values.html @@ -2,10 +2,10 @@ - + -Constant Field Values (Dependency-Check Maven Plugin 1.3.5 API) - +Constant Field Values (Dependency-Check Maven Plugin 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,13 +13,13 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-summary.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-summary.html index 56dba8a0e..984f43297 100644 --- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-summary.html +++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.3.5 API) - +org.owasp.dependencycheck.maven (Dependency-Check Maven Plugin 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/slf4j/package-summary.html b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/slf4j/package-summary.html index e44e6c3a2..1e2bd8ea2 100644 --- a/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/slf4j/package-summary.html +++ b/dependency-check-maven/apidocs/org/owasp/dependencycheck/maven/slf4j/package-summary.html @@ -2,10 +2,10 @@ - + -org.owasp.dependencycheck.maven.slf4j (Dependency-Check Maven Plugin 1.3.5 API) - +org.owasp.dependencycheck.maven.slf4j (Dependency-Check Maven Plugin 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-maven/apidocs/org/slf4j/impl/package-summary.html b/dependency-check-maven/apidocs/org/slf4j/impl/package-summary.html index ad19f03d0..5f34073d9 100644 --- a/dependency-check-maven/apidocs/org/slf4j/impl/package-summary.html +++ b/dependency-check-maven/apidocs/org/slf4j/impl/package-summary.html @@ -2,10 +2,10 @@ - + -org.slf4j.impl (Dependency-Check Maven Plugin 1.3.5 API) - +org.slf4j.impl (Dependency-Check Maven Plugin 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/dependency-check-maven/apidocs/overview-summary.html b/dependency-check-maven/apidocs/overview-summary.html index 8d2e9781a..e44a1d787 100644 --- a/dependency-check-maven/apidocs/overview-summary.html +++ b/dependency-check-maven/apidocs/overview-summary.html @@ -2,10 +2,10 @@ - + -Overview (Dependency-Check Maven Plugin 1.3.5 API) - +Overview (Dependency-Check Maven Plugin 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.slf4j.html b/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.slf4j.html index ea0cadbc2..7950e7794 100644 --- a/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.slf4j.html +++ b/dependency-check-maven/cobertura/frame-summary-org.owasp.dependencycheck.maven.slf4j.html @@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/frame-summary-org.slf4j.impl.html b/dependency-check-maven/cobertura/frame-summary-org.slf4j.impl.html index 506f684f1..8acaff248 100644 --- a/dependency-check-maven/cobertura/frame-summary-org.slf4j.impl.html +++ b/dependency-check-maven/cobertura/frame-summary-org.slf4j.impl.html @@ -37,6 +37,6 @@ var classTable = new SortableTable(document.getElementById("classResults"), ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/frame-summary.html b/dependency-check-maven/cobertura/frame-summary.html index 7c737db53..d29026f4a 100644 --- a/dependency-check-maven/cobertura/frame-summary.html +++ b/dependency-check-maven/cobertura/frame-summary.html @@ -16,8 +16,8 @@ - - + + @@ -27,6 +27,6 @@ var packageTable = new SortableTable(document.getElementById("packageResults"), ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    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 d80bb1b13..2f0b1f6d6 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.AggregateMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.AggregateMojo.html @@ -12,7 +12,7 @@
     
    Package # Classes Line Coverage Branch Coverage Complexity
    All Packages10
    2%
    25/879
    0%
    3/490
    		3.681
    org.owasp.dependencycheck.maven7
    0%
    0/724
    0%
    0/430
    		4.538
    All Packages10
    2%
    25/883
    0%
    3/494
    		3.667
    org.owasp.dependencycheck.maven7
    0%
    0/728
    0%
    0/434
    		4.506
    org.owasp.dependencycheck.maven.slf4j2
    10%
    15/142
    5%
    3/60
    		2.061
    org.slf4j.impl1
    76%
    10/13
    N/A
    N/A
    		1
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    AggregateMojo
    0%
    0/126
    0%
    0/92
    		6.3
    AggregateMojo
    0%
    0/126
    0%
    0/96
    		6.4
     
    @@ -234,7 +234,7 @@  130   
          *
     131   - 
          * @return the last projecct in the reactor
    + 
          * @return the last project in the reactor
     132   
          */
     133   @@ -269,7 +269,7 @@  150   
         private boolean skipProject(MavenProject project) {
     151  0 
             final String skip = (String) project.getProperties().get("maven.site.skip");
    -  152  0 
             return "true".equalsIgnoreCase(skip);
    +  152  0 
             return "true".equalsIgnoreCase(skip) && isGeneratingSite();
     153   
         }
     154   @@ -535,6 +535,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    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 fe3a0eb88..392aabdc7 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.BaseDependencyCheckMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.BaseDependencyCheckMojo.html @@ -12,7 +12,7 @@
     
    - +
    Classes in this File Line Coverage Branch Coverage Complexity
    BaseDependencyCheckMojo
    0%
    0/311
    0%
    0/162
    		4.733
    BaseDependencyCheckMojo
    0%
    0/315
    0%
    0/162
    		4.613
     
    @@ -783,1087 +783,1117 @@ 
         @Override
     389   
         public void execute() throws MojoExecutionException, MojoFailureException {
    -  390  0 
             if (skip) {
    -  391  0 
                 getLog().info("Skipping " + getName(Locale.US));
    -  392   +  390  0 
             generatingSite = false;
    +  391  0 
             if (skip) {
    +  392  0 
                 getLog().info("Skipping " + getName(Locale.US));
    +  393   
             } else {
    -  393  0 
                 validateAggregate();
    -  394  0 
                 project.setContextValue(getOutputDirectoryContextKey(), this.outputDirectory);
    -  395  0 
                 runCheck();
    -  396   +  394  0 
                 validateAggregate();
    +  395  0 
                 project.setContextValue(getOutputDirectoryContextKey(), this.outputDirectory);
    +  396  0 
                 runCheck();
    +  397   
             }
    -  397  0 
         }
    -  398   - 
     
    +  398  0 
         }
     399   - 
         /**
    + 
     
     400   - 
          * Checks if the aggregate configuration parameter has been set to true. If it has a MojoExecutionException is thrown because
    + 
         /**
     401   - 
          * the aggregate configuration parameter is no longer supported.
    + 
          * Checks if the aggregate configuration parameter has been set to true. If it has a MojoExecutionException is thrown because
     402   - 
          *
    + 
          * the aggregate configuration parameter is no longer supported.
     403   - 
          * @throws MojoExecutionException thrown if aggregate is set to true
    + 
          *
     404   - 
          */
    + 
          * @throws MojoExecutionException thrown if aggregate is set to true
     405   + 
          */
    +  406   
         private void validateAggregate() throws MojoExecutionException {
    -  406  0 
             if (aggregate != null && aggregate) {
    -  407  0 
                 final String msg = "Aggregate configuration detected - as of dependency-check 1.2.8 this no longer supported. "
    -  408   +  407  0 
             if (aggregate != null && aggregate) {
    +  408  0 
                 final String msg = "Aggregate configuration detected - as of dependency-check 1.2.8 this no longer supported. "
    +  409   
                         + "Please use the aggregate goal instead.";
    -  409  0 
                 throw new MojoExecutionException(msg);
    -  410   +  410  0 
                 throw new MojoExecutionException(msg);
    +  411   
             }
    -  411  0 
         }
    -  412   - 
     
    +  412  0 
         }
     413   - 
         /**
    + 
     
     414   - 
          * Generates the Dependency-Check Site Report.
    + 
         /**
     415   - 
          *
    -  416   - 
          * @param sink the sink to write the report to
    -  417   - 
          * @param locale the locale to use when generating the report
    -  418   - 
          * @throws MavenReportException if a maven report exception occurs
    -  419   - 
          * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead.
    -  420   - 
          */
    -  421   - 
         @Override
    -  422   - 
         @Deprecated
    -  423   - 
         public final void generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException {
    -  424  0 
             generate((Sink) sink, locale);
    -  425  0 
         }
    -  426   - 
     
    -  427   - 
         /**
    -  428   
          * Generates the Dependency-Check Site Report.
    -  429   +  416   
          *
    -  430   +  417   
          * @param sink the sink to write the report to
    -  431   +  418   
          * @param locale the locale to use when generating the report
    -  432   +  419   
          * @throws MavenReportException if a maven report exception occurs
    +  420   + 
          * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead.
    +  421   + 
          */
    +  422   + 
         @Override
    +  423   + 
         @Deprecated
    +  424   + 
         public final void generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException {
    +  425  0 
             generate((Sink) sink, locale);
    +  426  0 
         }
    +  427   + 
     
    +  428   + 
         /**
    +  429   + 
          * A flag indicating whether or not the maven site is being generated.
    +  430   + 
          */
    +  431  0 
         private boolean generatingSite = false;
    +  432   + 
     
     433   - 
          */
    + 
         /**
     434   - 
         public void generate(Sink sink, Locale locale) throws MavenReportException {
    + 
          * Returns true if the Maven site is being generated.
     435   - 
             try {
    -  436  0 
                 validateAggregate();
    -  437  0 
             } catch (MojoExecutionException ex) {
    -  438  0 
                 throw new MavenReportException(ex.getMessage());
    -  439  0 
             }
    -  440  0 
             project.setContextValue(getOutputDirectoryContextKey(), getReportOutputDirectory());
    + 
          *
    +  436   + 
          * @return true if the Maven site is being generated
    +  437   + 
          */
    +  438   + 
         protected boolean isGeneratingSite() {
    +  439  0 
             return generatingSite;
    +  440   + 
         }
     441   - 
             try {
    -  442  0 
                 runCheck();
    -  443  0 
             } catch (MojoExecutionException ex) {
    -  444  0 
                 throw new MavenReportException(ex.getMessage(), ex);
    -  445  0 
             } catch (MojoFailureException ex) {
    -  446  0 
                 getLog().warn("Vulnerabilities were identifies that exceed the CVSS threshold for failing the build");
    -  447  0 
             }
    -  448  0 
         }
    + 
     
    +  442   + 
         /**
    +  443   + 
          * Generates the Dependency-Check Site Report.
    +  444   + 
          *
    +  445   + 
          * @param sink the sink to write the report to
    +  446   + 
          * @param locale the locale to use when generating the report
    +  447   + 
          * @throws MavenReportException if a maven report exception occurs
    +  448   + 
          */
     449   - 
     
    -  450   - 
         /**
    + 
         public void generate(Sink sink, Locale locale) throws MavenReportException {
    +  450  0 
             generatingSite = true;
     451   - 
          * Returns the correct output directory depending on if a site is being executed or not.
    -  452   - 
          *
    -  453   - 
          * @return the directory to write the report(s)
    -  454   - 
          * @throws MojoExecutionException thrown if there is an error loading the file path
    -  455   - 
          */
    -  456   - 
         protected File getCorrectOutputDirectory() throws MojoExecutionException {
    -  457  0 
             return getCorrectOutputDirectory(this.project);
    -  458   - 
         }
    -  459   - 
     
    -  460   - 
         /**
    -  461   - 
          * Returns the correct output directory depending on if a site is being executed or not.
    -  462   - 
          *
    -  463   - 
          * @param current the Maven project to get the output directory from
    -  464   - 
          * @return the directory to write the report(s)
    -  465   - 
          */
    -  466   - 
         protected File getCorrectOutputDirectory(MavenProject current) {
    -  467  0 
             final Object obj = current.getContextValue(getOutputDirectoryContextKey());
    -  468  0 
             if (obj != null && obj instanceof File) {
    -  469  0 
                 return (File) obj;
    -  470   - 
             }
    -  471  0 
             File target = new File(current.getBuild().getDirectory());
    -  472  0 
             if (target.getParentFile() != null && "target".equals(target.getParentFile().getName())) {
    -  473  0 
                 target = target.getParentFile();
    -  474   - 
             }
    -  475  0 
             return target;
    -  476   - 
         }
    -  477   - 
     
    -  478   - 
         /**
    -  479   - 
          * Returns the correct output directory depending on if a site is being executed or not.
    -  480   - 
          *
    -  481   - 
          * @param current the Maven project to get the output directory from
    -  482   - 
          * @return the directory to write the report(s)
    -  483   - 
          */
    -  484   - 
         protected File getDataFile(MavenProject current) {
    -  485  0 
             if (getLog().isDebugEnabled()) {
    -  486  0 
                 getLog().debug(String.format("Getting data filefor %s using key '%s'", current.getName(), getDataFileContextKey()));
    -  487   - 
             }
    -  488  0 
             final Object obj = current.getContextValue(getDataFileContextKey());
    -  489  0 
             if (obj != null) {
    -  490  0 
                 if (obj instanceof String) {
    -  491  0 
                     final File f = new File((String) obj);
    -  492  0 
                     return f;
    -  493   - 
                 }
    -  494   - 
             } else {
    -  495  0 
                 if (getLog().isDebugEnabled()) {
    -  496  0 
                     getLog().debug("Context value not found");
    -  497   - 
                 }
    -  498   - 
             }
    -  499  0 
             return null;
    -  500   - 
         }
    -  501   - 
     
    -  502   - 
         /**
    -  503   - 
          * Scans the project's artifacts and adds them to the engine's dependency list.
    -  504   - 
          *
    -  505   - 
          * @param project the project to scan the dependencies of
    -  506   - 
          * @param engine the engine to use to scan the dependencies
    -  507   - 
          */
    -  508   - 
         protected void scanArtifacts(MavenProject project, Engine engine) {
    -  509  0 
             for (Artifact a : project.getArtifacts()) {
    -  510  0 
                 if (excludeFromScan(a)) {
    -  511  0 
                     continue;
    -  512   - 
                 }
    -  513  0 
                 final List<Dependency> deps = engine.scan(a.getFile().getAbsoluteFile());
    -  514  0 
                 if (deps != null) {
    -  515  0 
                     if (deps.size() == 1) {
    -  516  0 
                         final Dependency d = deps.get(0);
    -  517  0 
                         if (d != null) {
    -  518  0 
                             final MavenArtifact ma = new MavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion());
    -  519  0 
                             d.addAsEvidence("pom", ma, Confidence.HIGHEST);
    -  520  0 
                             d.addProjectReference(project.getName());
    -  521  0 
                             if (getLog().isDebugEnabled()) {
    -  522  0 
                                 getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(),
    -  523  0 
                                         d.getDisplayFileName()));
    -  524   - 
                             }
    -  525   - 
                         }
    -  526  0 
                     } else {
    -  527  0 
                         if (getLog().isDebugEnabled()) {
    -  528  0 
                             final String msg = String.format("More then 1 dependency was identified in first pass scan of '%s:%s:%s'",
    -  529  0 
                                     a.getGroupId(), a.getArtifactId(), a.getVersion());
    -  530  0 
                             getLog().debug(msg);
    -  531   - 
                         }
    -  532   - 
                     }
    -  533   - 
                 }
    -  534  0 
             }
    -  535  0 
         }
    -  536   - 
     
    -  537   - 
         /**
    -  538   - 
          * Executes the dependency-check scan and generates the necassary report.
    -  539   - 
          *
    -  540   - 
          * @throws MojoExecutionException thrown if there is an exception running the scan
    -  541   - 
          * @throws MojoFailureException thrown if dependency-check is configured to fail the build
    -  542   - 
          */
    -  543   - 
         public abstract void runCheck() throws MojoExecutionException, MojoFailureException;
    -  544   - 
     
    -  545   - 
         /**
    -  546   - 
          * Sets the Reporting output directory.
    -  547   - 
          *
    -  548   - 
          * @param directory the output directory
    -  549   - 
          */
    -  550   - 
         @Override
    -  551   - 
         public void setReportOutputDirectory(File directory) {
    -  552  0 
             reportOutputDirectory = directory;
    -  553  0 
         }
    -  554   - 
     
    -  555   - 
         /**
    -  556   - 
          * Returns the report output directory.
    -  557   - 
          *
    -  558   - 
          * @return the report output directory
    -  559   - 
          */
    -  560   - 
         @Override
    -  561   - 
         public File getReportOutputDirectory() {
    -  562  0 
             return reportOutputDirectory;
    -  563   - 
         }
    -  564   - 
     
    -  565   - 
         /**
    -  566   - 
          * Returns the output directory.
    -  567   - 
          *
    -  568   - 
          * @return the output directory
    -  569   - 
          */
    -  570   - 
         public File getOutputDirectory() {
    -  571  0 
             return outputDirectory;
    -  572   - 
         }
    -  573   - 
     
    -  574   - 
         /**
    -  575   - 
          * Returns whether this is an external report. This method always returns true.
    -  576   - 
          *
    -  577   - 
          * @return <code>true</code>
    -  578   - 
          */
    -  579   - 
         @Override
    -  580   - 
         public final boolean isExternalReport() {
    -  581  0 
             return true;
    -  582   - 
         }
    -  583   - 
     
    -  584   - 
         /**
    -  585   - 
          * Returns the output name.
    -  586   - 
          *
    -  587   - 
          * @return the output name
    -  588   - 
          */
    -  589   - 
         @Override
    -  590   - 
         public String getOutputName() {
    -  591  0 
             if ("HTML".equalsIgnoreCase(this.format) || "ALL".equalsIgnoreCase(this.format)) {
    -  592  0 
                 return "dependency-check-report";
    -  593  0 
             } else if ("XML".equalsIgnoreCase(this.format)) {
    -  594  0 
                 return "dependency-check-report.xml#";
    -  595  0 
             } else if ("VULN".equalsIgnoreCase(this.format)) {
    -  596  0 
                 return "dependency-check-vulnerability";
    -  597   - 
             } else {
    -  598  0 
                 getLog().warn("Unknown report format used during site generation.");
    -  599  0 
                 return "dependency-check-report";
    -  600   - 
             }
    -  601   - 
         }
    -  602   - 
     
    -  603   - 
         /**
    -  604   - 
          * Returns the category name.
    -  605   - 
          *
    -  606   - 
          * @return the category name
    -  607   - 
          */
    -  608   - 
         @Override
    -  609   - 
         public String getCategoryName() {
    -  610  0 
             return MavenReport.CATEGORY_PROJECT_REPORTS;
    -  611   - 
         }
    -  612   - 
         //</editor-fold>
    -  613   - 
     
    -  614   - 
         /**
    -  615   - 
          * Initializes a new <code>Engine</code> that can be used for scanning.
    -  616   - 
          *
    -  617   - 
          * @return a newly instantiated <code>Engine</code>
    -  618   - 
          * @throws DatabaseException thrown if there is a database exception
    -  619   - 
          */
    -  620   - 
         protected Engine initializeEngine() throws DatabaseException {
    -  621  0 
             populateSettings();
    -  622  0 
             return new Engine(this.project,
    -  623   - 
                     this.reactorProjects);
    -  624   - 
         }
    -  625   - 
     
    -  626   - 
         /**
    -  627   - 
          * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties
    -  628   - 
          * required to change the proxy url, port, and connection timeout.
    -  629   - 
          */
    -  630   - 
         protected void populateSettings() {
    -  631  0 
             Settings.initialize();
    -  632  0 
             InputStream mojoProperties = null;
    -  633   
             try {
    -  634  0 
                 mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
    -  635  0 
                 Settings.mergeProperties(mojoProperties);
    -  636  0 
             } catch (IOException ex) {
    -  637  0 
                 getLog().warn("Unable to load the dependency-check ant task.properties file.");
    -  638  0 
                 if (getLog().isDebugEnabled()) {
    -  639  0 
                     getLog().debug("", ex);
    +  452  0 
                 validateAggregate();
    +  453  0 
             } catch (MojoExecutionException ex) {
    +  454  0 
                 throw new MavenReportException(ex.getMessage());
    +  455  0 
             }
    +  456  0 
             project.setContextValue(getOutputDirectoryContextKey(), getReportOutputDirectory());
    +  457   + 
             try {
    +  458  0 
                 runCheck();
    +  459  0 
             } catch (MojoExecutionException ex) {
    +  460  0 
                 throw new MavenReportException(ex.getMessage(), ex);
    +  461  0 
             } catch (MojoFailureException ex) {
    +  462  0 
                 getLog().warn("Vulnerabilities were identifies that exceed the CVSS threshold for failing the build");
    +  463  0 
             }
    +  464  0 
         }
    +  465   + 
     
    +  466   + 
         /**
    +  467   + 
          * Returns the correct output directory depending on if a site is being executed or not.
    +  468   + 
          *
    +  469   + 
          * @return the directory to write the report(s)
    +  470   + 
          * @throws MojoExecutionException thrown if there is an error loading the file path
    +  471   + 
          */
    +  472   + 
         protected File getCorrectOutputDirectory() throws MojoExecutionException {
    +  473  0 
             return getCorrectOutputDirectory(this.project);
    +  474   + 
         }
    +  475   + 
     
    +  476   + 
         /**
    +  477   + 
          * Returns the correct output directory depending on if a site is being executed or not.
    +  478   + 
          *
    +  479   + 
          * @param current the Maven project to get the output directory from
    +  480   + 
          * @return the directory to write the report(s)
    +  481   + 
          */
    +  482   + 
         protected File getCorrectOutputDirectory(MavenProject current) {
    +  483  0 
             final Object obj = current.getContextValue(getOutputDirectoryContextKey());
    +  484  0 
             if (obj != null && obj instanceof File) {
    +  485  0 
                 return (File) obj;
    +  486   + 
             }
    +  487  0 
             File target = new File(current.getBuild().getDirectory());
    +  488  0 
             if (target.getParentFile() != null && "target".equals(target.getParentFile().getName())) {
    +  489  0 
                 target = target.getParentFile();
    +  490   + 
             }
    +  491  0 
             return target;
    +  492   + 
         }
    +  493   + 
     
    +  494   + 
         /**
    +  495   + 
          * Returns the correct output directory depending on if a site is being executed or not.
    +  496   + 
          *
    +  497   + 
          * @param current the Maven project to get the output directory from
    +  498   + 
          * @return the directory to write the report(s)
    +  499   + 
          */
    +  500   + 
         protected File getDataFile(MavenProject current) {
    +  501  0 
             if (getLog().isDebugEnabled()) {
    +  502  0 
                 getLog().debug(String.format("Getting data filefor %s using key '%s'", current.getName(), getDataFileContextKey()));
    +  503   + 
             }
    +  504  0 
             final Object obj = current.getContextValue(getDataFileContextKey());
    +  505  0 
             if (obj != null) {
    +  506  0 
                 if (obj instanceof String) {
    +  507  0 
                     final File f = new File((String) obj);
    +  508  0 
                     return f;
    +  509   + 
                 }
    +  510   + 
             } else {
    +  511  0 
                 if (getLog().isDebugEnabled()) {
    +  512  0 
                     getLog().debug("Context value not found");
    +  513   + 
                 }
    +  514   + 
             }
    +  515  0 
             return null;
    +  516   + 
         }
    +  517   + 
     
    +  518   + 
         /**
    +  519   + 
          * Scans the project's artifacts and adds them to the engine's dependency list.
    +  520   + 
          *
    +  521   + 
          * @param project the project to scan the dependencies of
    +  522   + 
          * @param engine the engine to use to scan the dependencies
    +  523   + 
          */
    +  524   + 
         protected void scanArtifacts(MavenProject project, Engine engine) {
    +  525  0 
             for (Artifact a : project.getArtifacts()) {
    +  526  0 
                 if (excludeFromScan(a)) {
    +  527  0 
                     continue;
    +  528   + 
                 }
    +  529  0 
                 final List<Dependency> deps = engine.scan(a.getFile().getAbsoluteFile());
    +  530  0 
                 if (deps != null) {
    +  531  0 
                     if (deps.size() == 1) {
    +  532  0 
                         final Dependency d = deps.get(0);
    +  533  0 
                         if (d != null) {
    +  534  0 
                             final MavenArtifact ma = new MavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion());
    +  535  0 
                             d.addAsEvidence("pom", ma, Confidence.HIGHEST);
    +  536  0 
                             d.addProjectReference(project.getName());
    +  537  0 
                             if (getLog().isDebugEnabled()) {
    +  538  0 
                                 getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(),
    +  539  0 
                                         d.getDisplayFileName()));
    +  540   + 
                             }
    +  541   + 
                         }
    +  542  0 
                     } else {
    +  543  0 
                         if (getLog().isDebugEnabled()) {
    +  544  0 
                             final String msg = String.format("More then 1 dependency was identified in first pass scan of '%s:%s:%s'",
    +  545  0 
                                     a.getGroupId(), a.getArtifactId(), a.getVersion());
    +  546  0 
                             getLog().debug(msg);
    +  547   + 
                         }
    +  548   + 
                     }
    +  549   + 
                 }
    +  550  0 
             }
    +  551  0 
         }
    +  552   + 
     
    +  553   + 
         /**
    +  554   + 
          * Executes the dependency-check scan and generates the necassary report.
    +  555   + 
          *
    +  556   + 
          * @throws MojoExecutionException thrown if there is an exception running the scan
    +  557   + 
          * @throws MojoFailureException thrown if dependency-check is configured to fail the build
    +  558   + 
          */
    +  559   + 
         public abstract void runCheck() throws MojoExecutionException, MojoFailureException;
    +  560   + 
     
    +  561   + 
         /**
    +  562   + 
          * Sets the Reporting output directory.
    +  563   + 
          *
    +  564   + 
          * @param directory the output directory
    +  565   + 
          */
    +  566   + 
         @Override
    +  567   + 
         public void setReportOutputDirectory(File directory) {
    +  568  0 
             reportOutputDirectory = directory;
    +  569  0 
         }
    +  570   + 
     
    +  571   + 
         /**
    +  572   + 
          * Returns the report output directory.
    +  573   + 
          *
    +  574   + 
          * @return the report output directory
    +  575   + 
          */
    +  576   + 
         @Override
    +  577   + 
         public File getReportOutputDirectory() {
    +  578  0 
             return reportOutputDirectory;
    +  579   + 
         }
    +  580   + 
     
    +  581   + 
         /**
    +  582   + 
          * Returns the output directory.
    +  583   + 
          *
    +  584   + 
          * @return the output directory
    +  585   + 
          */
    +  586   + 
         public File getOutputDirectory() {
    +  587  0 
             return outputDirectory;
    +  588   + 
         }
    +  589   + 
     
    +  590   + 
         /**
    +  591   + 
          * Returns whether this is an external report. This method always returns true.
    +  592   + 
          *
    +  593   + 
          * @return <code>true</code>
    +  594   + 
          */
    +  595   + 
         @Override
    +  596   + 
         public final boolean isExternalReport() {
    +  597  0 
             return true;
    +  598   + 
         }
    +  599   + 
     
    +  600   + 
         /**
    +  601   + 
          * Returns the output name.
    +  602   + 
          *
    +  603   + 
          * @return the output name
    +  604   + 
          */
    +  605   + 
         @Override
    +  606   + 
         public String getOutputName() {
    +  607  0 
             if ("HTML".equalsIgnoreCase(this.format) || "ALL".equalsIgnoreCase(this.format)) {
    +  608  0 
                 return "dependency-check-report";
    +  609  0 
             } else if ("XML".equalsIgnoreCase(this.format)) {
    +  610  0 
                 return "dependency-check-report.xml#";
    +  611  0 
             } else if ("VULN".equalsIgnoreCase(this.format)) {
    +  612  0 
                 return "dependency-check-vulnerability";
    +  613   + 
             } else {
    +  614  0 
                 getLog().warn("Unknown report format used during site generation.");
    +  615  0 
                 return "dependency-check-report";
    +  616   + 
             }
    +  617   + 
         }
    +  618   + 
     
    +  619   + 
         /**
    +  620   + 
          * Returns the category name.
    +  621   + 
          *
    +  622   + 
          * @return the category name
    +  623   + 
          */
    +  624   + 
         @Override
    +  625   + 
         public String getCategoryName() {
    +  626  0 
             return MavenReport.CATEGORY_PROJECT_REPORTS;
    +  627   + 
         }
    +  628   + 
         //</editor-fold>
    +  629   + 
     
    +  630   + 
         /**
    +  631   + 
          * Initializes a new <code>Engine</code> that can be used for scanning.
    +  632   + 
          *
    +  633   + 
          * @return a newly instantiated <code>Engine</code>
    +  634   + 
          * @throws DatabaseException thrown if there is a database exception
    +  635   + 
          */
    +  636   + 
         protected Engine initializeEngine() throws DatabaseException {
    +  637  0 
             populateSettings();
    +  638  0 
             return new Engine(this.project,
    +  639   + 
                     this.reactorProjects);
     640   - 
                 }
    + 
         }
     641   - 
             } finally {
    -  642  0 
                 if (mojoProperties != null) {
    + 
     
    +  642   + 
         /**
     643   - 
                     try {
    -  644  0 
                         mojoProperties.close();
    -  645  0 
                     } catch (IOException ex) {
    -  646  0 
                         if (getLog().isDebugEnabled()) {
    -  647  0 
                             getLog().debug("", ex);
    -  648   - 
                         }
    -  649  0 
                     }
    -  650   - 
                 }
    -  651   - 
             }
    -  652  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.AUTO_UPDATE, autoUpdate);
    -  653   - 
     
    -  654  0 
             if (externalReport != null) {
    -  655  0 
                 getLog().warn("The 'externalReport' option was set; this configuration option has been removed. "
    + 
          * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties
    +  644   + 
          * required to change the proxy url, port, and connection timeout.
    +  645   + 
          */
    +  646   + 
         protected void populateSettings() {
    +  647  0 
             Settings.initialize();
    +  648  0 
             InputStream mojoProperties = null;
    +  649   + 
             try {
    +  650  0 
                 mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
    +  651  0 
                 Settings.mergeProperties(mojoProperties);
    +  652  0 
             } catch (IOException ex) {
    +  653  0 
                 getLog().warn("Unable to load the dependency-check ant task.properties file.");
    +  654  0 
                 if (getLog().isDebugEnabled()) {
    +  655  0 
                     getLog().debug("", ex);
     656   - 
                         + "Please update the dependency-check-maven plugin's configuration");
    + 
                 }
     657   - 
             }
    -  658   - 
     
    -  659  0 
             if (proxyUrl != null && !proxyUrl.isEmpty()) {
    -  660  0 
                 getLog().warn("Deprecated configuration detected, proxyUrl will be ignored; use the maven settings " + "to configure the proxy instead");
    -  661   - 
             }
    -  662  0 
             final Proxy proxy = getMavenProxy();
    -  663  0 
             if (proxy != null) {
    -  664  0 
                 Settings.setString(Settings.KEYS.PROXY_SERVER, proxy.getHost());
    -  665  0 
                 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort()));
    -  666  0 
                 final String userName = proxy.getUsername();
    -  667  0 
                 final String password = proxy.getPassword();
    -  668  0 
                 Settings.setStringIfNotNull(Settings.KEYS.PROXY_USERNAME, userName);
    -  669  0 
                 Settings.setStringIfNotNull(Settings.KEYS.PROXY_PASSWORD, password);
    -  670  0 
                 Settings.setStringIfNotNull(Settings.KEYS.PROXY_NON_PROXY_HOSTS, proxy.getNonProxyHosts());
    -  671   - 
             }
    -  672   - 
     
    -  673  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
    -  674  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
    -  675   - 
     
    -  676   - 
             //File Type Analyzer Settings
    -  677  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
    -  678  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
    -  679  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled);
    -  680  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
    -  681  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
    -  682  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_USES_PROXY, nexusUsesProxy);
    -  683  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
    -  684  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
    -  685  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
    -  686  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
    -  687   - 
     
    -  688  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_DISTRIBUTION_ENABLED, pyDistributionAnalyzerEnabled);
    -  689  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_PACKAGE_ENABLED, pyPackageAnalyzerEnabled);
    -  690  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, rubygemsAnalyzerEnabled);
    -  691  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, opensslAnalyzerEnabled);
    -  692  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CMAKE_ENABLED, cmakeAnalyzerEnabled);
    -  693  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_AUTOCONF_ENABLED, autoconfAnalyzerEnabled);
    -  694  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_COMPOSER_LOCK_ENABLED, composerAnalyzerEnabled);
    -  695  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, nodeAnalyzerEnabled);
    -  696   - 
     
    -  697   - 
             //Database configuration
    -  698  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
    -  699  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
    -  700  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
    -  701   - 
     
    -  702  0 
             if (databaseUser == null && databasePassword == null && serverId != null) {
    -  703  0 
                 final Server server = settingsXml.getServer(serverId);
    -  704  0 
                 if (server != null) {
    -  705  0 
                     databaseUser = server.getUsername();
    -  706   + 
             } finally {
    +  658  0 
                 if (mojoProperties != null) {
    +  659   
                     try {
    -  707   - 
                         //The following fix was copied from:
    -  708   - 
                         //   https://github.com/bsorrentino/maven-confluence-plugin/blob/master/maven-confluence-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/AbstractBaseConfluenceMojo.java
    -  709   - 
                         //
    -  710   - 
                         // FIX to resolve
    -  711   - 
                         // org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException:
    -  712   - 
                         // java.io.FileNotFoundException: ~/.settings-security.xml (No such file or directory)
    -  713   - 
                         //
    -  714  0 
                         if (securityDispatcher instanceof DefaultSecDispatcher) {
    -  715  0 
                             ((DefaultSecDispatcher) securityDispatcher).setConfigurationFile("~/.m2/settings-security.xml");
    -  716   +  660  0 
                         mojoProperties.close();
    +  661  0 
                     } catch (IOException ex) {
    +  662  0 
                         if (getLog().isDebugEnabled()) {
    +  663  0 
                             getLog().debug("", ex);
    +  664   
                         }
    +  665  0 
                     }
    +  666   + 
                 }
    +  667   + 
             }
    +  668  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.AUTO_UPDATE, autoUpdate);
    +  669   + 
     
    +  670  0 
             if (externalReport != null) {
    +  671  0 
                 getLog().warn("The 'externalReport' option was set; this configuration option has been removed. "
    +  672   + 
                         + "Please update the dependency-check-maven plugin's configuration");
    +  673   + 
             }
    +  674   + 
     
    +  675  0 
             if (proxyUrl != null && !proxyUrl.isEmpty()) {
    +  676  0 
                 getLog().warn("Deprecated configuration detected, proxyUrl will be ignored; use the maven settings " + "to configure the proxy instead");
    +  677   + 
             }
    +  678  0 
             final Proxy proxy = getMavenProxy();
    +  679  0 
             if (proxy != null) {
    +  680  0 
                 Settings.setString(Settings.KEYS.PROXY_SERVER, proxy.getHost());
    +  681  0 
                 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort()));
    +  682  0 
                 final String userName = proxy.getUsername();
    +  683  0 
                 final String password = proxy.getPassword();
    +  684  0 
                 Settings.setStringIfNotNull(Settings.KEYS.PROXY_USERNAME, userName);
    +  685  0 
                 Settings.setStringIfNotNull(Settings.KEYS.PROXY_PASSWORD, password);
    +  686  0 
                 Settings.setStringIfNotNull(Settings.KEYS.PROXY_NON_PROXY_HOSTS, proxy.getNonProxyHosts());
    +  687   + 
             }
    +  688   + 
     
    +  689  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout);
    +  690  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
    +  691   + 
     
    +  692   + 
             //File Type Analyzer Settings
    +  693  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled);
    +  694  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled);
    +  695  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled);
    +  696  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled);
    +  697  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
    +  698  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_USES_PROXY, nexusUsesProxy);
    +  699  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled);
    +  700  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled);
    +  701  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions);
    +  702  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono);
    +  703   + 
     
    +  704  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_DISTRIBUTION_ENABLED, pyDistributionAnalyzerEnabled);
    +  705  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_PACKAGE_ENABLED, pyPackageAnalyzerEnabled);
    +  706  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, rubygemsAnalyzerEnabled);
    +  707  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, opensslAnalyzerEnabled);
    +  708  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CMAKE_ENABLED, cmakeAnalyzerEnabled);
    +  709  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_AUTOCONF_ENABLED, autoconfAnalyzerEnabled);
    +  710  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_COMPOSER_LOCK_ENABLED, composerAnalyzerEnabled);
    +  711  0 
             Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, nodeAnalyzerEnabled);
    +  712   + 
     
    +  713   + 
             //Database configuration
    +  714  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
    +  715  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
    +  716  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
     717   
     
    -  718  0 
                         databasePassword = securityDispatcher.decrypt(server.getPassword());
    -  719  0 
                     } catch (SecDispatcherException ex) {
    -  720  0 
                         if (ex.getCause() instanceof FileNotFoundException
    -  721  0 
                                 || (ex.getCause() != null && ex.getCause().getCause() instanceof FileNotFoundException)) {
    +  718  0 
             if (databaseUser == null && databasePassword == null && serverId != null) {
    +  719  0 
                 final Server server = settingsXml.getServer(serverId);
    +  720  0 
                 if (server != null) {
    +  721  0 
                     databaseUser = server.getUsername();
     722   - 
                             //maybe its not encrypted?
    -  723  0 
                             final String tmp = server.getPassword();
    -  724  0 
                             if (tmp.startsWith("{") && tmp.endsWith("}")) {
    -  725  0 
                                 getLog().error(String.format(
    + 
                     try {
    +  723   + 
                         //The following fix was copied from:
    +  724   + 
                         //   https://github.com/bsorrentino/maven-confluence-plugin/blob/master/maven-confluence-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/AbstractBaseConfluenceMojo.java
    +  725   + 
                         //
     726   - 
                                         "Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s",
    -  727  0 
                                         serverId, ex.getMessage()));
    + 
                         // FIX to resolve
    +  727   + 
                         // org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException:
     728   - 
                             } else {
    -  729  0 
                                 databasePassword = tmp;
    -  730   - 
                             }
    -  731  0 
                         } else {
    -  732  0 
                             getLog().error(String.format(
    -  733   - 
                                     "Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s",
    -  734  0 
                                     serverId, ex.getMessage()));
    -  735   + 
                         // java.io.FileNotFoundException: ~/.settings-security.xml (No such file or directory)
    +  729   + 
                         //
    +  730  0 
                         if (securityDispatcher instanceof DefaultSecDispatcher) {
    +  731  0 
                             ((DefaultSecDispatcher) securityDispatcher).setConfigurationFile("~/.m2/settings-security.xml");
    +  732   
                         }
    -  736  0 
                     }
    -  737   - 
                 } else {
    -  738  0 
                     getLog().error(String.format("Server '%s' not found in the settings.xml file", serverId));
    -  739   - 
                 }
    -  740   - 
             }
    -  741   +  733   
     
    -  742  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_USER, databaseUser);
    -  743  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_PASSWORD, databasePassword);
    -  744  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
    -  745   - 
     
    -  746  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
    -  747  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
    -  748  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
    -  749  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
    -  750  0 
             Settings.setIntIfNotNull(Settings.KEYS.CVE_CHECK_VALID_FOR_HOURS, cveValidForHours);
    -  751   - 
     
    -  752  0 
         }
    -  753   - 
     
    -  754   - 
         /**
    -  755   - 
          * Returns the maven proxy.
    -  756   - 
          *
    -  757   - 
          * @return the maven proxy
    -  758   - 
          */
    -  759   - 
         private Proxy getMavenProxy() {
    -  760  0 
             if (mavenSettings != null) {
    -  761  0 
                 final List<Proxy> proxies = mavenSettings.getProxies();
    -  762  0 
                 if (proxies != null && !proxies.isEmpty()) {
    -  763  0 
                     if (mavenSettingsProxyId != null) {
    -  764  0 
                         for (Proxy proxy : proxies) {
    -  765  0 
                             if (mavenSettingsProxyId.equalsIgnoreCase(proxy.getId())) {
    -  766  0 
                                 return proxy;
    -  767   +  734  0 
                         databasePassword = securityDispatcher.decrypt(server.getPassword());
    +  735  0 
                     } catch (SecDispatcherException ex) {
    +  736  0 
                         if (ex.getCause() instanceof FileNotFoundException
    +  737  0 
                                 || (ex.getCause() != null && ex.getCause().getCause() instanceof FileNotFoundException)) {
    +  738   + 
                             //maybe its not encrypted?
    +  739  0 
                             final String tmp = server.getPassword();
    +  740  0 
                             if (tmp.startsWith("{") && tmp.endsWith("}")) {
    +  741  0 
                                 getLog().error(String.format(
    +  742   + 
                                         "Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s",
    +  743  0 
                                         serverId, ex.getMessage()));
    +  744   + 
                             } else {
    +  745  0 
                                 databasePassword = tmp;
    +  746   
                             }
    -  768  0 
                         }
    -  769  0 
                     } else if (proxies.size() == 1) {
    -  770  0 
                         return proxies.get(0);
    -  771   - 
                     } else {
    -  772  0 
                         getLog().warn("Multiple proxy definitions exist in the Maven settings. In the dependency-check "
    -  773   - 
                                 + "configuration set the mavenSettingsProxyId so that the correct proxy will be used.");
    -  774  0 
                         throw new IllegalStateException("Ambiguous proxy definition");
    -  775   - 
                     }
    -  776   +  747  0 
                         } else {
    +  748  0 
                             getLog().error(String.format(
    +  749   + 
                                     "Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s",
    +  750  0 
                                     serverId, ex.getMessage()));
    +  751   + 
                         }
    +  752  0 
                     }
    +  753   + 
                 } else {
    +  754  0 
                     getLog().error(String.format("Server '%s' not found in the settings.xml file", serverId));
    +  755   
                 }
    -  777   +  756   
             }
    -  778  0 
             return null;
    -  779   - 
         }
    -  780   +  757   
     
    -  781   +  758  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_USER, databaseUser);
    +  759  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DB_PASSWORD, databasePassword);
    +  760  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
    +  761   + 
     
    +  762  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified);
    +  763  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified);
    +  764  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base);
    +  765  0 
             Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base);
    +  766  0 
             Settings.setIntIfNotNull(Settings.KEYS.CVE_CHECK_VALID_FOR_HOURS, cveValidForHours);
    +  767   + 
     
    +  768  0 
         }
    +  769   + 
     
    +  770   
         /**
    -  782   - 
          * Tests is the artifact should be included in the scan (i.e. is the dependency in a scope that is being scanned).
    -  783   +  771   + 
          * Returns the maven proxy.
    +  772   
          *
    -  784   - 
          * @param a the Artifact to test
    -  785   - 
          * @return <code>true</code> if the artifact is in an excluded scope; otherwise <code>false</code>
    -  786   +  773   + 
          * @return the maven proxy
    +  774   
          */
    +  775   + 
         private Proxy getMavenProxy() {
    +  776  0 
             if (mavenSettings != null) {
    +  777  0 
                 final List<Proxy> proxies = mavenSettings.getProxies();
    +  778  0 
                 if (proxies != null && !proxies.isEmpty()) {
    +  779  0 
                     if (mavenSettingsProxyId != null) {
    +  780  0 
                         for (Proxy proxy : proxies) {
    +  781  0 
                             if (mavenSettingsProxyId.equalsIgnoreCase(proxy.getId())) {
    +  782  0 
                                 return proxy;
    +  783   + 
                             }
    +  784  0 
                         }
    +  785  0 
                     } else if (proxies.size() == 1) {
    +  786  0 
                         return proxies.get(0);
     787   - 
         protected boolean excludeFromScan(Artifact a) {
    -  788  0 
             if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
    -  789  0 
                 return true;
    -  790   - 
             }
    -  791  0 
             if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
    -  792  0 
                 return true;
    + 
                     } else {
    +  788  0 
                         getLog().warn("Multiple proxy definitions exist in the Maven settings. In the dependency-check "
    +  789   + 
                                 + "configuration set the mavenSettingsProxyId so that the correct proxy will be used.");
    +  790  0 
                         throw new IllegalStateException("Ambiguous proxy definition");
    +  791   + 
                     }
    +  792   + 
                 }
     793   
             }
    -  794  0 
             if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
    -  795  0 
                 return true;
    +  794  0 
             return null;
    +  795   + 
         }
     796   - 
             }
    -  797  0 
             return false;
    + 
     
    +  797   + 
         /**
     798   - 
         }
    + 
          * Tests is the artifact should be included in the scan (i.e. is the dependency in a scope that is being scanned).
     799   - 
     
    + 
          *
     800   - 
         /**
    + 
          * @param a the Artifact to test
     801   - 
          * Returns a reference to the current project. This method is used instead of auto-binding the project via component
    + 
          * @return <code>true</code> if the artifact is in an excluded scope; otherwise <code>false</code>
     802   - 
          * annotation in concrete implementations of this. If the child has a <code>@Component MavenProject project;</code> defined
    + 
          */
     803   - 
          * then the abstract class (i.e. this class) will not have access to the current project (just the way Maven works with the
    -  804   - 
          * binding).
    -  805   - 
          *
    + 
         protected boolean excludeFromScan(Artifact a) {
    +  804  0 
             if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
    +  805  0 
                 return true;
     806   - 
          * @return returns a reference to the current project
    -  807   - 
          */
    -  808   - 
         protected MavenProject getProject() {
    -  809  0 
             return project;
    -  810   - 
         }
    -  811   - 
     
    -  812   - 
         /**
    -  813   - 
          * Returns the list of Maven Projects in this build.
    -  814   - 
          *
    -  815   - 
          * @return the list of Maven Projects in this build
    -  816   - 
          */
    -  817   - 
         protected List<MavenProject> getReactorProjects() {
    -  818  0 
             return reactorProjects;
    -  819   - 
         }
    -  820   - 
     
    -  821   - 
         /**
    -  822   - 
          * Returns the report format.
    -  823   - 
          *
    -  824   - 
          * @return the report format
    -  825   - 
          */
    -  826   - 
         protected String getFormat() {
    -  827  0 
             return format;
    -  828   - 
         }
    -  829   - 
     
    -  830   - 
         /**
    -  831   - 
          * Generates the reports for a given dependency-check engine.
    -  832   - 
          *
    -  833   - 
          * @param engine a dependency-check engine
    -  834   - 
          * @param p the maven project
    -  835   - 
          * @param outputDir the directory path to write the report(s).
    -  836   - 
          */
    -  837   - 
         protected void writeReports(Engine engine, MavenProject p, File outputDir) {
    -  838  0 
             DatabaseProperties prop = null;
    -  839  0 
             CveDB cve = null;
    -  840   - 
             try {
    -  841  0 
                 cve = new CveDB();
    -  842  0 
                 cve.open();
    -  843  0 
                 prop = cve.getDatabaseProperties();
    -  844  0 
             } catch (DatabaseException ex) {
    -  845  0 
                 if (getLog().isDebugEnabled()) {
    -  846  0 
                     getLog().debug("Unable to retrieve DB Properties", ex);
    -  847   - 
                 }
    -  848   - 
             } finally {
    -  849  0 
                 if (cve != null) {
    -  850  0 
                     cve.close();
    -  851   - 
                 }
    -  852   
             }
    -  853  0 
             final ReportGenerator r = new ReportGenerator(p.getName(), engine.getDependencies(), engine.getAnalyzers(), prop);
    -  854   +  807  0 
             if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
    +  808  0 
                 return true;
    +  809   + 
             }
    +  810  0 
             if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
    +  811  0 
                 return true;
    +  812   + 
             }
    +  813  0 
             return false;
    +  814   + 
         }
    +  815   + 
     
    +  816   + 
         /**
    +  817   + 
          * Returns a reference to the current project. This method is used instead of auto-binding the project via component
    +  818   + 
          * annotation in concrete implementations of this. If the child has a <code>@Component MavenProject project;</code> defined
    +  819   + 
          * then the abstract class (i.e. this class) will not have access to the current project (just the way Maven works with the
    +  820   + 
          * binding).
    +  821   + 
          *
    +  822   + 
          * @return returns a reference to the current project
    +  823   + 
          */
    +  824   + 
         protected MavenProject getProject() {
    +  825  0 
             return project;
    +  826   + 
         }
    +  827   + 
     
    +  828   + 
         /**
    +  829   + 
          * Returns the list of Maven Projects in this build.
    +  830   + 
          *
    +  831   + 
          * @return the list of Maven Projects in this build
    +  832   + 
          */
    +  833   + 
         protected List<MavenProject> getReactorProjects() {
    +  834  0 
             return reactorProjects;
    +  835   + 
         }
    +  836   + 
     
    +  837   + 
         /**
    +  838   + 
          * Returns the report format.
    +  839   + 
          *
    +  840   + 
          * @return the report format
    +  841   + 
          */
    +  842   + 
         protected String getFormat() {
    +  843  0 
             return format;
    +  844   + 
         }
    +  845   + 
     
    +  846   + 
         /**
    +  847   + 
          * Generates the reports for a given dependency-check engine.
    +  848   + 
          *
    +  849   + 
          * @param engine a dependency-check engine
    +  850   + 
          * @param p the maven project
    +  851   + 
          * @param outputDir the directory path to write the report(s).
    +  852   + 
          */
    +  853   + 
         protected void writeReports(Engine engine, MavenProject p, File outputDir) {
    +  854  0 
             DatabaseProperties prop = null;
    +  855  0 
             CveDB cve = null;
    +  856   
             try {
    -  855  0 
                 r.generateReports(outputDir.getAbsolutePath(), format);
    -  856  0 
             } catch (IOException ex) {
    -  857  0 
                 getLog().error(
    -  858   - 
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    -  859  0 
                 if (getLog().isDebugEnabled()) {
    -  860  0 
                     getLog().debug("", ex);
    -  861   +  857  0 
                 cve = new CveDB();
    +  858  0 
                 cve.open();
    +  859  0 
                 prop = cve.getDatabaseProperties();
    +  860  0 
             } catch (DatabaseException ex) {
    +  861  0 
                 if (getLog().isDebugEnabled()) {
    +  862  0 
                     getLog().debug("Unable to retrieve DB Properties", ex);
    +  863   
                 }
    -  862  0 
             } catch (Throwable ex) {
    -  863  0 
                 getLog().error(
     864   - 
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    -  865  0 
                 if (getLog().isDebugEnabled()) {
    -  866  0 
                     getLog().debug("", ex);
    + 
             } finally {
    +  865  0 
                 if (cve != null) {
    +  866  0 
                     cve.close();
     867   
                 }
    -  868  0 
             }
    -  869  0 
         }
    +  868   + 
             }
    +  869  0 
             final ReportGenerator r = new ReportGenerator(p.getName(), engine.getDependencies(), engine.getAnalyzers(), prop);
     870   - 
     
    -  871   - 
         //<editor-fold defaultstate="collapsed" desc="Methods to fail build or show summary">
    -  872   - 
         /**
    -  873   - 
          * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the
    -  874   - 
          * configuration.
    -  875   - 
          *
    -  876   - 
          * @param dependencies the list of dependency objects
    -  877   - 
          * @throws MojoFailureException thrown if a CVSS score is found that is higher then the threshold set
    -  878   - 
          */
    -  879   - 
         protected void checkForFailure(List<Dependency> dependencies) throws MojoFailureException {
    -  880  0 
             if (failBuildOnCVSS <= 10) {
    -  881  0 
                 final StringBuilder ids = new StringBuilder();
    -  882  0 
                 for (Dependency d : dependencies) {
    -  883  0 
                     boolean addName = true;
    -  884  0 
                     for (Vulnerability v : d.getVulnerabilities()) {
    -  885  0 
                         if (v.getCvssScore() >= failBuildOnCVSS) {
    -  886  0 
                             if (addName) {
    -  887  0 
                                 addName = false;
    -  888  0 
                                 ids.append(NEW_LINE).append(d.getFileName()).append(": ");
    -  889  0 
                                 ids.append(v.getName());
    -  890   - 
                             } else {
    -  891  0 
                                 ids.append(", ").append(v.getName());
    -  892   - 
                             }
    -  893   - 
                         }
    -  894  0 
                     }
    -  895  0 
                 }
    -  896  0 
                 if (ids.length() > 0) {
    -  897  0 
                     final String msg = String.format("%n%nDependency-Check Failure:%n"
    -  898   - 
                             + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
    -  899  0 
                             + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString());
    -  900  0 
                     throw new MojoFailureException(msg);
    -  901   - 
                 }
    -  902   - 
             }
    -  903  0 
         }
    -  904   - 
     
    -  905   - 
         /**
    -  906   - 
          * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries.
    -  907   - 
          *
    -  908   - 
          * @param mp the Maven project for which the summary is shown
    -  909   - 
          * @param dependencies a list of dependency objects
    -  910   - 
          */
    -  911   - 
         protected void showSummary(MavenProject mp, List<Dependency> dependencies) {
    -  912  0 
             if (showSummary) {
    -  913  0 
                 final StringBuilder summary = new StringBuilder();
    -  914  0 
                 for (Dependency d : dependencies) {
    -  915  0 
                     boolean firstEntry = true;
    -  916  0 
                     final StringBuilder ids = new StringBuilder();
    -  917  0 
                     for (Vulnerability v : d.getVulnerabilities()) {
    -  918  0 
                         if (firstEntry) {
    -  919  0 
                             firstEntry = false;
    -  920   - 
                         } else {
    -  921  0 
                             ids.append(", ");
    -  922   - 
                         }
    -  923  0 
                         ids.append(v.getName());
    -  924  0 
                     }
    -  925  0 
                     if (ids.length() > 0) {
    -  926  0 
                         summary.append(d.getFileName()).append(" (");
    -  927  0 
                         firstEntry = true;
    -  928  0 
                         for (Identifier id : d.getIdentifiers()) {
    -  929  0 
                             if (firstEntry) {
    -  930  0 
                                 firstEntry = false;
    -  931   - 
                             } else {
    -  932  0 
                                 summary.append(", ");
    -  933   - 
                             }
    -  934  0 
                             summary.append(id.getValue());
    -  935  0 
                         }
    -  936  0 
                         summary.append(") : ").append(ids).append(NEW_LINE);
    -  937   - 
                     }
    -  938  0 
                 }
    -  939  0 
                 if (summary.length() > 0) {
    -  940  0 
                     final String msg = String.format("%n%n" + "One or more dependencies were identified with known vulnerabilities in %s:%n%n%s"
    -  941  0 
                             + "%n%nSee the dependency-check report for more details.%n%n", mp.getName(), summary.toString());
    -  942  0 
                     getLog().warn(msg);
    -  943   - 
                 }
    -  944   - 
             }
    -  945  0 
         }
    -  946   - 
     
    -  947   - 
         //</editor-fold>
    -  948   - 
         //<editor-fold defaultstate="collapsed" desc="Methods to read/write the serialized data file">
    -  949   - 
         /**
    -  950   - 
          * Returns the key used to store the path to the data file that is saved by <code>writeDataFile()</code>. This key is used in
    -  951   - 
          * the <code>MavenProject.(set|get)ContextValue</code>.
    -  952   - 
          *
    -  953   - 
          * @return the key used to store the path to the data file
    -  954   - 
          */
    -  955   - 
         protected String getDataFileContextKey() {
    -  956  0 
             return "dependency-check-path-" + dataFileName;
    -  957   - 
         }
    -  958   - 
     
    -  959   - 
         /**
    -  960   - 
          * Returns the key used to store the path to the output directory. When generating the report in the
    -  961   - 
          * <code>executeAggregateReport()</code> the output directory should be obtained by using this key.
    -  962   - 
          *
    -  963   - 
          * @return the key used to store the path to the output directory
    -  964   - 
          */
    -  965   - 
         protected String getOutputDirectoryContextKey() {
    -  966  0 
             return "dependency-output-dir-" + dataFileName;
    -  967   - 
         }
    -  968   - 
     
    -  969   - 
         /**
    -  970   - 
          * Writes the scan data to disk. This is used to serialize the scan data between the "check" and "aggregate" phase.
    -  971   - 
          *
    -  972   - 
          * @param mp the mMven project for which the data file was created
    -  973   - 
          * @param writeTo the directory to write the data file
    -  974   - 
          * @param dependencies the list of dependencies to serialize
    -  975   - 
          */
    -  976   - 
         protected void writeDataFile(MavenProject mp, File writeTo, List<Dependency> dependencies) {
    -  977   - 
             File file;
    -  978   - 
             //check to see if this was already written out
    -  979  0 
             if (mp.getContextValue(this.getDataFileContextKey()) == null) {
    -  980  0 
                 if (writeTo == null) {
    -  981  0 
                     file = new File(mp.getBuild().getDirectory());
    -  982  0 
                     file = new File(file, dataFileName);
    -  983   - 
                 } else {
    -  984  0 
                     file = new File(writeTo, dataFileName);
    -  985   - 
                 }
    -  986  0 
                 final File parent = file.getParentFile();
    -  987  0 
                 if (!parent.isDirectory() && parent.mkdirs()) {
    -  988  0 
                     getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.",
    -  989  0 
                             parent.getAbsolutePath()));
    -  990   - 
                 }
    -  991   - 
     
    -  992  0 
                 ObjectOutputStream out = null;
    -  993   - 
                 try {
    -  994  0 
                     if (dependencies != null) {
    -  995  0 
                         out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
    -  996  0 
                         out.writeObject(dependencies);
    -  997   - 
                     }
    -  998  0 
                     if (getLog().isDebugEnabled()) {
    -  999  0 
                         getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s",
    -  1000  0 
                                 file.getAbsolutePath(), mp.getName(), this.getDataFileContextKey()));
    -  1001   - 
                     }
    -  1002  0 
                     mp.setContextValue(this.getDataFileContextKey(), file.getAbsolutePath());
    -  1003  0 
                 } catch (IOException ex) {
    -  1004  0 
                     getLog().warn("Unable to create data file used for report aggregation; "
    -  1005   - 
                             + "if report aggregation is being used the results may be incomplete.");
    -  1006  0 
                     if (getLog().isDebugEnabled()) {
    -  1007  0 
                         getLog().debug(ex.getMessage(), ex);
    -  1008   - 
                     }
    -  1009   - 
                 } finally {
    -  1010  0 
                     if (out != null) {
    -  1011   - 
                         try {
    -  1012  0 
                             out.close();
    -  1013  0 
                         } catch (IOException ex) {
    -  1014  0 
                             if (getLog().isDebugEnabled()) {
    -  1015  0 
                                 getLog().debug("ignore", ex);
    -  1016   - 
                             }
    -  1017  0 
                         }
    -  1018   - 
                     }
    -  1019   - 
                 }
    -  1020   - 
             }
    -  1021  0 
         }
    -  1022   - 
     
    -  1023   - 
         /**
    -  1024   - 
          * Reads the serialized scan data from disk. This is used to serialize the scan data between the "check" and "aggregate"
    -  1025   - 
          * phase.
    -  1026   - 
          *
    -  1027   - 
          * @param project the Maven project to read the data file from
    -  1028   - 
          * @return a <code>Engine</code> object populated with dependencies if the serialized data file exists; otherwise
    -  1029   - 
          * <code>null</code> is returned
    -  1030   - 
          */
    -  1031   - 
         protected List<Dependency> readDataFile(MavenProject project) {
    -  1032  0 
             final Object oPath = project.getContextValue(this.getDataFileContextKey());
    -  1033  0 
             if (oPath == null) {
    -  1034  0 
                 return null;
    -  1035   - 
             }
    -  1036  0 
             List<Dependency> ret = null;
    -  1037  0 
             final String path = (String) oPath;
    -  1038   - 
             //ObjectInputStream ois = null;
    -  1039  0 
             ExpectedOjectInputStream ois = null;
    -  1040   
             try {
    -  1041   - 
                 //ois = new ObjectInputStream(new FileInputStream(path));
    -  1042  0 
                 ois = new ExpectedOjectInputStream(new FileInputStream(path),
    -  1043   - 
                         "java.util.ArrayList",
    -  1044   - 
                         "java.util.HashSet",
    -  1045   - 
                         "java.util.TreeSet",
    -  1046   - 
                         "java.lang.AbstractSet",
    -  1047   - 
                         "java.lang.AbstractCollection",
    -  1048   - 
                         "java.lang.Enum",
    -  1049   - 
                         "org.owasp.dependencycheck.dependency.Confidence",
    -  1050   - 
                         "org.owasp.dependencycheck.dependency.Dependency",
    -  1051   - 
                         "org.owasp.dependencycheck.dependency.Evidence",
    -  1052   - 
                         "org.owasp.dependencycheck.dependency.EvidenceCollection",
    -  1053   - 
                         "org.owasp.dependencycheck.dependency.Identifier",
    -  1054   - 
                         "org.owasp.dependencycheck.dependency.Reference",
    -  1055   - 
                         "org.owasp.dependencycheck.dependency.Vulnerability",
    -  1056   - 
                         "org.owasp.dependencycheck.dependency.VulnerabilityComparator",
    -  1057   - 
                         "org.owasp.dependencycheck.dependency.VulnerableSoftware");
    -  1058  0 
                 ret = (List<Dependency>) ois.readObject();
    -  1059  0 
             } catch (FileNotFoundException ex) {
    -  1060   - 
                 //TODO fix logging
    -  1061  0 
                 getLog().error("", ex);
    -  1062  0 
             } catch (IOException ex) {
    -  1063  0 
                 getLog().error("", ex);
    -  1064  0 
             } catch (ClassNotFoundException ex) {
    -  1065  0 
                 getLog().error("", ex);
    -  1066   - 
             } finally {
    -  1067  0 
                 if (ois != null) {
    -  1068   - 
                     try {
    -  1069  0 
                         ois.close();
    -  1070  0 
                     } catch (IOException ex) {
    -  1071  0 
                         getLog().error("", ex);
    -  1072  0 
                     }
    -  1073   +  871  0 
                 r.generateReports(outputDir.getAbsolutePath(), format);
    +  872  0 
             } catch (IOException ex) {
    +  873  0 
                 getLog().error(
    +  874   + 
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    +  875  0 
                 if (getLog().isDebugEnabled()) {
    +  876  0 
                     getLog().debug("", ex);
    +  877   
                 }
    -  1074   +  878  0 
             } catch (Throwable ex) {
    +  879  0 
                 getLog().error(
    +  880   + 
                         "Unexpected exception occurred during analysis; please see the verbose error log for more details.");
    +  881  0 
                 if (getLog().isDebugEnabled()) {
    +  882  0 
                     getLog().debug("", ex);
    +  883   + 
                 }
    +  884  0 
             }
    +  885  0 
         }
    +  886   + 
     
    +  887   + 
         //<editor-fold defaultstate="collapsed" desc="Methods to fail build or show summary">
    +  888   + 
         /**
    +  889   + 
          * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the
    +  890   + 
          * configuration.
    +  891   + 
          *
    +  892   + 
          * @param dependencies the list of dependency objects
    +  893   + 
          * @throws MojoFailureException thrown if a CVSS score is found that is higher then the threshold set
    +  894   + 
          */
    +  895   + 
         protected void checkForFailure(List<Dependency> dependencies) throws MojoFailureException {
    +  896  0 
             if (failBuildOnCVSS <= 10) {
    +  897  0 
                 final StringBuilder ids = new StringBuilder();
    +  898  0 
                 for (Dependency d : dependencies) {
    +  899  0 
                     boolean addName = true;
    +  900  0 
                     for (Vulnerability v : d.getVulnerabilities()) {
    +  901  0 
                         if (v.getCvssScore() >= failBuildOnCVSS) {
    +  902  0 
                             if (addName) {
    +  903  0 
                                 addName = false;
    +  904  0 
                                 ids.append(NEW_LINE).append(d.getFileName()).append(": ");
    +  905  0 
                                 ids.append(v.getName());
    +  906   + 
                             } else {
    +  907  0 
                                 ids.append(", ").append(v.getName());
    +  908   + 
                             }
    +  909   + 
                         }
    +  910  0 
                     }
    +  911  0 
                 }
    +  912  0 
                 if (ids.length() > 0) {
    +  913  0 
                     final String msg = String.format("%n%nDependency-Check Failure:%n"
    +  914   + 
                             + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n"
    +  915  0 
                             + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString());
    +  916  0 
                     throw new MojoFailureException(msg);
    +  917   + 
                 }
    +  918   
             }
    -  1075  0 
             return ret;
    -  1076   - 
         }
    -  1077   +  919  0 
         }
    +  920   + 
     
    +  921   + 
         /**
    +  922   + 
          * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries.
    +  923   + 
          *
    +  924   + 
          * @param mp the Maven project for which the summary is shown
    +  925   + 
          * @param dependencies a list of dependency objects
    +  926   + 
          */
    +  927   + 
         protected void showSummary(MavenProject mp, List<Dependency> dependencies) {
    +  928  0 
             if (showSummary) {
    +  929  0 
                 final StringBuilder summary = new StringBuilder();
    +  930  0 
                 for (Dependency d : dependencies) {
    +  931  0 
                     boolean firstEntry = true;
    +  932  0 
                     final StringBuilder ids = new StringBuilder();
    +  933  0 
                     for (Vulnerability v : d.getVulnerabilities()) {
    +  934  0 
                         if (firstEntry) {
    +  935  0 
                             firstEntry = false;
    +  936   + 
                         } else {
    +  937  0 
                             ids.append(", ");
    +  938   + 
                         }
    +  939  0 
                         ids.append(v.getName());
    +  940  0 
                     }
    +  941  0 
                     if (ids.length() > 0) {
    +  942  0 
                         summary.append(d.getFileName()).append(" (");
    +  943  0 
                         firstEntry = true;
    +  944  0 
                         for (Identifier id : d.getIdentifiers()) {
    +  945  0 
                             if (firstEntry) {
    +  946  0 
                                 firstEntry = false;
    +  947   + 
                             } else {
    +  948  0 
                                 summary.append(", ");
    +  949   + 
                             }
    +  950  0 
                             summary.append(id.getValue());
    +  951  0 
                         }
    +  952  0 
                         summary.append(") : ").append(ids).append(NEW_LINE);
    +  953   + 
                     }
    +  954  0 
                 }
    +  955  0 
                 if (summary.length() > 0) {
    +  956  0 
                     final String msg = String.format("%n%n" + "One or more dependencies were identified with known vulnerabilities in %s:%n%n%s"
    +  957  0 
                             + "%n%nSee the dependency-check report for more details.%n%n", mp.getName(), summary.toString());
    +  958  0 
                     getLog().warn(msg);
    +  959   + 
                 }
    +  960   + 
             }
    +  961  0 
         }
    +  962   + 
     
    +  963   
         //</editor-fold>
    -  1078   +  964   + 
         //<editor-fold defaultstate="collapsed" desc="Methods to read/write the serialized data file">
    +  965   + 
         /**
    +  966   + 
          * Returns the key used to store the path to the data file that is saved by <code>writeDataFile()</code>. This key is used in
    +  967   + 
          * the <code>MavenProject.(set|get)ContextValue</code>.
    +  968   + 
          *
    +  969   + 
          * @return the key used to store the path to the data file
    +  970   + 
          */
    +  971   + 
         protected String getDataFileContextKey() {
    +  972  0 
             return "dependency-check-path-" + dataFileName;
    +  973   + 
         }
    +  974   + 
     
    +  975   + 
         /**
    +  976   + 
          * Returns the key used to store the path to the output directory. When generating the report in the
    +  977   + 
          * <code>executeAggregateReport()</code> the output directory should be obtained by using this key.
    +  978   + 
          *
    +  979   + 
          * @return the key used to store the path to the output directory
    +  980   + 
          */
    +  981   + 
         protected String getOutputDirectoryContextKey() {
    +  982  0 
             return "dependency-output-dir-" + dataFileName;
    +  983   + 
         }
    +  984   + 
     
    +  985   + 
         /**
    +  986   + 
          * Writes the scan data to disk. This is used to serialize the scan data between the "check" and "aggregate" phase.
    +  987   + 
          *
    +  988   + 
          * @param mp the mMven project for which the data file was created
    +  989   + 
          * @param writeTo the directory to write the data file
    +  990   + 
          * @param dependencies the list of dependencies to serialize
    +  991   + 
          */
    +  992   + 
         protected void writeDataFile(MavenProject mp, File writeTo, List<Dependency> dependencies) {
    +  993   + 
             File file;
    +  994   + 
             //check to see if this was already written out
    +  995  0 
             if (mp.getContextValue(this.getDataFileContextKey()) == null) {
    +  996  0 
                 if (writeTo == null) {
    +  997  0 
                     file = new File(mp.getBuild().getDirectory());
    +  998  0 
                     file = new File(file, dataFileName);
    +  999   + 
                 } else {
    +  1000  0 
                     file = new File(writeTo, dataFileName);
    +  1001   + 
                 }
    +  1002  0 
                 final File parent = file.getParentFile();
    +  1003  0 
                 if (!parent.isDirectory() && parent.mkdirs()) {
    +  1004  0 
                     getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.",
    +  1005  0 
                             parent.getAbsolutePath()));
    +  1006   + 
                 }
    +  1007   + 
     
    +  1008  0 
                 ObjectOutputStream out = null;
    +  1009   + 
                 try {
    +  1010  0 
                     if (dependencies != null) {
    +  1011  0 
                         out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
    +  1012  0 
                         out.writeObject(dependencies);
    +  1013   + 
                     }
    +  1014  0 
                     if (getLog().isDebugEnabled()) {
    +  1015  0 
                         getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s",
    +  1016  0 
                                 file.getAbsolutePath(), mp.getName(), this.getDataFileContextKey()));
    +  1017   + 
                     }
    +  1018  0 
                     mp.setContextValue(this.getDataFileContextKey(), file.getAbsolutePath());
    +  1019  0 
                 } catch (IOException ex) {
    +  1020  0 
                     getLog().warn("Unable to create data file used for report aggregation; "
    +  1021   + 
                             + "if report aggregation is being used the results may be incomplete.");
    +  1022  0 
                     if (getLog().isDebugEnabled()) {
    +  1023  0 
                         getLog().debug(ex.getMessage(), ex);
    +  1024   + 
                     }
    +  1025   + 
                 } finally {
    +  1026  0 
                     if (out != null) {
    +  1027   + 
                         try {
    +  1028  0 
                             out.close();
    +  1029  0 
                         } catch (IOException ex) {
    +  1030  0 
                             if (getLog().isDebugEnabled()) {
    +  1031  0 
                                 getLog().debug("ignore", ex);
    +  1032   + 
                             }
    +  1033  0 
                         }
    +  1034   + 
                     }
    +  1035   + 
                 }
    +  1036   + 
             }
    +  1037  0 
         }
    +  1038   + 
     
    +  1039   + 
         /**
    +  1040   + 
          * Reads the serialized scan data from disk. This is used to serialize the scan data between the "check" and "aggregate"
    +  1041   + 
          * phase.
    +  1042   + 
          *
    +  1043   + 
          * @param project the Maven project to read the data file from
    +  1044   + 
          * @return a <code>Engine</code> object populated with dependencies if the serialized data file exists; otherwise
    +  1045   + 
          * <code>null</code> is returned
    +  1046   + 
          */
    +  1047   + 
         protected List<Dependency> readDataFile(MavenProject project) {
    +  1048  0 
             final Object oPath = project.getContextValue(this.getDataFileContextKey());
    +  1049  0 
             if (oPath == null) {
    +  1050  0 
                 return null;
    +  1051   + 
             }
    +  1052  0 
             List<Dependency> ret = null;
    +  1053  0 
             final String path = (String) oPath;
    +  1054   + 
             //ObjectInputStream ois = null;
    +  1055  0 
             ExpectedOjectInputStream ois = null;
    +  1056   + 
             try {
    +  1057   + 
                 //ois = new ObjectInputStream(new FileInputStream(path));
    +  1058  0 
                 ois = new ExpectedOjectInputStream(new FileInputStream(path),
    +  1059   + 
                         "java.util.ArrayList",
    +  1060   + 
                         "java.util.HashSet",
    +  1061   + 
                         "java.util.TreeSet",
    +  1062   + 
                         "java.lang.AbstractSet",
    +  1063   + 
                         "java.lang.AbstractCollection",
    +  1064   + 
                         "java.lang.Enum",
    +  1065   + 
                         "org.owasp.dependencycheck.dependency.Confidence",
    +  1066   + 
                         "org.owasp.dependencycheck.dependency.Dependency",
    +  1067   + 
                         "org.owasp.dependencycheck.dependency.Evidence",
    +  1068   + 
                         "org.owasp.dependencycheck.dependency.EvidenceCollection",
    +  1069   + 
                         "org.owasp.dependencycheck.dependency.Identifier",
    +  1070   + 
                         "org.owasp.dependencycheck.dependency.Reference",
    +  1071   + 
                         "org.owasp.dependencycheck.dependency.Vulnerability",
    +  1072   + 
                         "org.owasp.dependencycheck.dependency.VulnerabilityComparator",
    +  1073   + 
                         "org.owasp.dependencycheck.dependency.VulnerableSoftware",
    +  1074   + 
                         "org.owasp.dependencycheck.data.cpe.IndexEntry");
    +  1075  0 
                 ret = (List<Dependency>) ois.readObject();
    +  1076  0 
             } catch (FileNotFoundException ex) {
    +  1077   + 
                 //TODO fix logging
    +  1078  0 
                 getLog().error("", ex);
    +  1079  0 
             } catch (IOException ex) {
    +  1080  0 
                 getLog().error("", ex);
    +  1081  0 
             } catch (ClassNotFoundException ex) {
    +  1082  0 
                 getLog().error("", ex);
    +  1083   + 
             } finally {
    +  1084  0 
                 if (ois != null) {
    +  1085   + 
                     try {
    +  1086  0 
                         ois.close();
    +  1087  0 
                     } catch (IOException ex) {
    +  1088  0 
                         getLog().error("", ex);
    +  1089  0 
                     }
    +  1090   + 
                 }
    +  1091   + 
             }
    +  1092  0 
             return ret;
    +  1093   + 
         }
    +  1094   + 
         //</editor-fold>
    +  1095   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    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 7ace84cb4..79d2e285b 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.CheckMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.CheckMojo.html @@ -237,6 +237,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    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 6b3b46f55..7ddd8fbc2 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.Engine.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.Engine.html @@ -403,6 +403,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    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 b9f081204..af80e1d02 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.HelpMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.HelpMojo.html @@ -770,6 +770,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.PurgeMojo.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.PurgeMojo.html index a74a4a663..931f06e56 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.PurgeMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.PurgeMojo.html @@ -217,6 +217,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.UpdateMojo.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.UpdateMojo.html index 037441fb6..65f061717 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.UpdateMojo.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.UpdateMojo.html @@ -199,6 +199,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerAdapter.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerAdapter.html index 8197b4155..0aea169e5 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerAdapter.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerAdapter.html @@ -551,6 +551,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerFactory.html b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerFactory.html index 17c74eeef..78de21b5c 100644 --- a/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerFactory.html +++ b/dependency-check-maven/cobertura/org.owasp.dependencycheck.maven.slf4j.MavenLoggerFactory.html @@ -127,6 +127,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/cobertura/org.slf4j.impl.StaticLoggerBinder.html b/dependency-check-maven/cobertura/org.slf4j.impl.StaticLoggerBinder.html index ec2bdefaf..55884c53f 100644 --- a/dependency-check-maven/cobertura/org.slf4j.impl.StaticLoggerBinder.html +++ b/dependency-check-maven/cobertura/org.slf4j.impl.StaticLoggerBinder.html @@ -228,6 +228,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:29 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:12 PM.
    diff --git a/dependency-check-maven/configuration.html b/dependency-check-maven/configuration.html index 387d2d7af..8f4400fbb 100644 --- a/dependency-check-maven/configuration.html +++ b/dependency-check-maven/configuration.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Goals @@ -52,7 +52,7 @@ diff --git a/dependency-check-maven/dependency-analysis.html b/dependency-check-maven/dependency-analysis.html index eab3f3954..90895a39f 100644 --- a/dependency-check-maven/dependency-analysis.html +++ b/dependency-check-maven/dependency-analysis.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Dependencies Report @@ -52,7 +52,7 @@ @@ -256,7 +256,7 @@ org.owasp dependency-check-core -1.3.5 +1.3.6 compile jar @@ -264,7 +264,7 @@ org.owasp dependency-check-utils -1.3.5 +1.3.6 compile jar @@ -320,7 +320,7 @@ org.jmockit jmockit -1.21 +1.22 test jar @@ -353,6 +353,14 @@ Type Optional +org.slf4j +slf4j-api +1.7.21 +compile + +jar +false + org.apache.maven.doxia doxia-sink-api 1.0 @@ -360,7 +368,7 @@ jar false - + org.apache.maven maven-model 3.3.3 @@ -368,14 +376,6 @@ jar false - -org.slf4j -slf4j-api -1.7.16 -compile - -jar -false org.apache.maven maven-artifact diff --git a/dependency-check-maven/dependency-updates-report.html b/dependency-check-maven/dependency-updates-report.html index 3bc984075..a091a3ea1 100644 --- a/dependency-check-maven/dependency-updates-report.html +++ b/dependency-check-maven/dependency-updates-report.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Dependency Updates Report @@ -52,7 +52,7 @@ @@ -247,7 +247,7 @@ # of dependencies using the latest version available -18 +23 # of dependencies where the next version available is smaller than an incremental version update @@ -255,15 +255,15 @@ # of dependencies where the next version available is an incremental version update -7 +3 # of dependencies where the next version available is a minor version update -8 +6 # of dependencies where the next version available is a major version update -0 +1

    Dependency Management

    @@ -280,27 +280,27 @@ - + - + - + - + - + - + @@ -352,6 +352,18 @@ + + + + + + + + + + + + @@ -363,7 +375,7 @@ - + @@ -375,7 +387,7 @@ - + @@ -387,7 +399,7 @@ - + @@ -399,11 +411,11 @@ - + - + @@ -411,7 +423,7 @@ - + @@ -423,7 +435,7 @@ - + @@ -435,7 +447,7 @@ - + @@ -447,7 +459,7 @@ - + @@ -459,7 +471,7 @@ - + @@ -471,7 +483,7 @@ - + @@ -483,7 +495,7 @@ - + @@ -495,7 +507,7 @@ - + @@ -507,7 +519,7 @@ - + @@ -519,7 +531,7 @@ - + @@ -531,18 +543,6 @@ - - - - - - - - - - - - @@ -592,16 +592,16 @@ - + - + - + @@ -616,27 +616,27 @@ - + - + - + - + - + - + @@ -682,7 +682,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -722,7 +722,7 @@
    Next Minor Next Major
    ch.qos.logback logback-classic1.1.51.1.7 jar 1.1.6
    ch.qos.logback logback-core1.1.51.1.7 jar 1.1.6
    commons-collectionscommons-collections3.2.2jar20030418.083655
    commons-io commons-io
    junit junit
    org.apache.ant ant
    org.apache.ant ant-testutil
    org.apache.commons commons-compress1.101.11 jar
    org.apache.commons commons-lang3 3.4
    org.apache.lucene lucene-analyzers-common 4.8.0 5.0.0
    org.apache.lucene lucene-core 4.8.0 5.0.0
    org.apache.lucene lucene-queryparser 4.8.0 5.0.0
    org.apache.lucene lucene-test-framework 4.8.0 5.0.0
    org.apache.maven maven-core3.3.9
    org.apache.maven maven-plugin-api3.3.9
    org.apache.maven maven-settings3.3.9
    org.apache.maven.plugin-testing maven-plugin-testing-harness
    org.apache.maven.plugin-tools maven-plugin-annotations
    org.apache.maven.pluginsmaven-site-plugin3.4jar3.5
    org.apache.maven.reporting
    org.jmockit jmockit1.211.22 test jar 1.22
    org.slf4j slf4j-api1.7.161.7.21 jar 1.7.18
    org.slf4j slf4j-simple1.7.161.7.21 jar 1.7.18
    org.owasp dependency-check-core1.3.51.3.6 compile jar org.owasp dependency-check-utils1.3.51.3.6 compile jar
    - + @@ -731,7 +731,7 @@ - + @@ -740,16 +740,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-classic
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    ch.qos.logback:logback-core

    - + @@ -758,7 +755,7 @@ - + @@ -767,10 +764,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-core
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    com.google.code.findbugs:annotations

    @@ -871,6 +865,33 @@
    Type jar
    +

    commons-collections:commons-collections

    + + + + + + + + + + + + + + + + + + + + + + + + +
    Status There is at least one newer major version available. Major updates are rarely passive.
    Group Idcommons-collections
    Artifact Idcommons-collections
    Current Version3.2.2
    Scope
    Classifier
    Typejar
    Newer versions20030418.083655 Next Major
    20031027.000000
    20040102.233541
    20040616 Latest Major
    +

    commons-io:commons-io

    @@ -980,7 +1001,7 @@ - + @@ -1043,7 +1064,7 @@ -
    commons-compress
    Current Version1.10
    1.11
    Scope
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-core

    @@ -1070,7 +1091,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-queryparser

    @@ -1097,7 +1118,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-test-framework

    @@ -1124,7 +1145,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.maven:maven-core

    @@ -1255,33 +1276,6 @@
    Type jar
    -

    org.apache.maven.plugins:maven-site-plugin

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Idorg.apache.maven.plugins
    Artifact Idmaven-site-plugin
    Current Version3.4
    Scope
    Classifier
    Typejar
    Newer versions3.5 Next Minor
    -

    org.apache.maven.reporting:maven-reporting-api

    @@ -1382,7 +1376,7 @@
    - + @@ -1391,7 +1385,7 @@ - + @@ -1400,10 +1394,7 @@ - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
     No newer versions available.
    Group Id org.jmockit
    jmockit
    Current Version1.21
    1.22
    Scope test
    Typejar
    Newer versions1.22 Next Minor
    +jar

    org.jsoup:jsoup

    @@ -1442,7 +1433,7 @@ - + @@ -1466,7 +1457,7 @@ - + @@ -1481,7 +1472,7 @@
    dependency-check-core
    Current Version1.3.5
    1.3.6
    Scope compile
    dependency-check-utils
    Current Version1.3.5
    1.3.6
    Scope compile
    - + @@ -1490,7 +1481,7 @@ - + @@ -1499,16 +1490,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-api
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.slf4j:slf4j-simple

    - + @@ -1517,7 +1505,7 @@ - + @@ -1526,10 +1514,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-simple
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.sonatype.plexus:plexus-sec-dispatcher

    diff --git a/dependency-check-maven/findbugs.html b/dependency-check-maven/findbugs.html index 1d88f700b..82096de33 100644 --- a/dependency-check-maven/findbugs.html +++ b/dependency-check-maven/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-maven – FindBugs Bug Detector Report @@ -52,7 +52,7 @@ diff --git a/dependency-check-maven/help-mojo.html b/dependency-check-maven/help-mojo.html index 8fc7553a5..8d6b7c4f1 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 @@ -52,7 +52,7 @@ @@ -156,7 +156,7 @@

    Full name:

    -

    org.owasp:dependency-check-maven:1.3.5.1:help

    +

    org.owasp:dependency-check-maven:1.3.6:help

    Description:

    diff --git a/dependency-check-maven/index.html b/dependency-check-maven/index.html index 1bfff8b77..6bb768c64 100644 --- a/dependency-check-maven/index.html +++ b/dependency-check-maven/index.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Usage @@ -52,7 +52,7 @@ @@ -166,7 +166,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> <executions> <execution> <goals> @@ -197,7 +197,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> <reportSets> <reportSet> <reports> @@ -228,7 +228,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> <configuration> <failBuildOnCVSS>8</failBuildOnCVSS> </configuration> @@ -261,7 +261,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> <configuration> <skipProvidedScope>true</skipProvidedScope> <skipRuntimeScope>true</skipRuntimeScope> @@ -295,10 +295,10 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> <configuration> - <cveUrl12Modified>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-modified.xml</cveUrl12Modified> - <cveUrl20Modified>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-2.0-modified.xml</cveUrl20Modified> + <cveUrl12Modified>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-Modified.xml.gz</cveUrl12Modified> + <cveUrl20Modified>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-2.0-Modified.xml.gz</cveUrl20Modified> <cveUrl12Base>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-%d.xml</cveUrl12Base> <cveUrl20Base>http://internal-mirror.mycorp.com/downloads/nist/nvdcve-2.0-%d.xml</cveUrl20Base> </configuration> @@ -331,7 +331,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> <executions> <execution> <goals> diff --git a/dependency-check-maven/integration.html b/dependency-check-maven/integration.html index ec7958f16..19292b341 100644 --- a/dependency-check-maven/integration.html +++ b/dependency-check-maven/integration.html @@ -1,15 +1,15 @@ - + - dependency-check-maven – Continuous Integration + dependency-check-maven – CI Management @@ -52,7 +52,7 @@ @@ -104,14 +104,14 @@
  • - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -123,30 +123,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-maven/issue-tracking.html b/dependency-check-maven/issue-tracking.html index 834a0cad8..275da4566 100644 --- a/dependency-check-maven/issue-tracking.html +++ b/dependency-check-maven/issue-tracking.html @@ -1,15 +1,15 @@ - + - dependency-check-maven – Issue Tracking + dependency-check-maven – Issue Management @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -202,8 +202,8 @@

    Overview

    This project uses github to manage its issues.

    -

    Issue Tracking

    -

    Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.

    +

    Issue Management

    +

    Issues, bugs, and feature requests should be submitted to the following issue management system for this project.

    https://github.com/jeremylong/DependencyCheck/issues
    diff --git a/dependency-check-maven/license.html b/dependency-check-maven/license.html index de6b9fa0f..e71d7b29d 100644 --- a/dependency-check-maven/license.html +++ b/dependency-check-maven/license.html @@ -1,15 +1,15 @@ - + - dependency-check-maven – Project License + dependency-check-maven – Project Licenses @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - Project License + Licenses
    • @@ -197,15 +197,15 @@
    -
    + +

    Overview

    Typically the licenses listed for the project are that of the project itself, and not of dependencies.

    -

    Project License

    +

    Project Licenses

    The Apache Software License, Version 2.0

    -
    -
    +
                                      Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/dependency-check-maven/mail-lists.html b/dependency-check-maven/mail-lists.html
index 000fa524e..c64c9d0d9 100644
--- a/dependency-check-maven/mail-lists.html
+++ b/dependency-check-maven/mail-lists.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-maven – Project Mailing Lists
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Project Mailing Lists
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5.1
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -104,16 +104,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -123,30 +123,30 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
diff --git a/dependency-check-maven/plugin-info.html b/dependency-check-maven/plugin-info.html
index a70cd703d..2ebb16da8 100644
--- a/dependency-check-maven/plugin-info.html
+++ b/dependency-check-maven/plugin-info.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-maven – Plugin Documentation
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Plugin Documentation
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5.1
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -302,7 +302,7 @@ have any known published vulnerabilities.
    <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> </plugin> ... </plugins> @@ -312,7 +312,7 @@ have any known published vulnerabilities. <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> </plugin> ... </plugins> @@ -324,7 +324,7 @@ have any known published vulnerabilities. <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.3.5.1</version> + <version>1.3.6</version> </plugin> ... </plugins> diff --git a/dependency-check-maven/plugin-updates-report.html b/dependency-check-maven/plugin-updates-report.html index 5f2acf293..b7aafce5c 100644 --- a/dependency-check-maven/plugin-updates-report.html +++ b/dependency-check-maven/plugin-updates-report.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Plugin Updates Report @@ -52,7 +52,7 @@ diff --git a/dependency-check-maven/pmd.html b/dependency-check-maven/pmd.html index e661fcda3..162d8053d 100644 --- a/dependency-check-maven/pmd.html +++ b/dependency-check-maven/pmd.html @@ -1,13 +1,13 @@ - + dependency-check-maven – PMD Results @@ -52,7 +52,7 @@ @@ -253,7 +253,7 @@ Line Useless parentheses. -721
    +737 diff --git a/dependency-check-maven/project-info.html b/dependency-check-maven/project-info.html index 60fe86d60..b1283d913 100644 --- a/dependency-check-maven/project-info.html +++ b/dependency-check-maven/project-info.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Project Information @@ -52,7 +52,7 @@ @@ -102,16 +102,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -123,30 +123,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -208,25 +208,25 @@ Document Description -Continuous Integration +CI Management This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis. -Project Summary +Summary This document lists other related information of this project Mailing Lists This document provides subscription and archive information for this project's mailing lists. -Issue Tracking +Issue Management This document provides information on the issue management system used in this project. -Project Team +Team This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another. -Source Repository +Source Code Management This document lists ways to access the online source repository. -Project License +Licenses This document lists the project license(s). diff --git a/dependency-check-maven/project-reports.html b/dependency-check-maven/project-reports.html index 98581a7ed..3285a51b6 100644 --- a/dependency-check-maven/project-reports.html +++ b/dependency-check-maven/project-reports.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Generated Reports @@ -52,7 +52,7 @@ diff --git a/dependency-check-maven/project-summary.html b/dependency-check-maven/project-summary.html index 554afa717..44496b672 100644 --- a/dependency-check-maven/project-summary.html +++ b/dependency-check-maven/project-summary.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Project Summary @@ -52,7 +52,7 @@ @@ -104,14 +104,14 @@
  • - + - Continuous Integration + CI Management
  • - Project Summary + Summary
  • @@ -123,30 +123,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -241,7 +241,7 @@ dependency-check-maven Version -1.3.5.1 +1.3.6 Type maven-plugin diff --git a/dependency-check-maven/purge-mojo.html b/dependency-check-maven/purge-mojo.html index 112c8e918..9d6f95761 100644 --- a/dependency-check-maven/purge-mojo.html +++ b/dependency-check-maven/purge-mojo.html @@ -1,13 +1,13 @@ - + dependency-check-maven – dependency-check:purge @@ -52,7 +52,7 @@ @@ -158,7 +158,7 @@

    Full name:

    -

    org.owasp:dependency-check-maven:1.3.5.1:purge

    +

    org.owasp:dependency-check-maven:1.3.6:purge

    Description:

    diff --git a/dependency-check-maven/source-repository.html b/dependency-check-maven/source-repository.html index f69b4d1ba..a10c7b83e 100644 --- a/dependency-check-maven/source-repository.html +++ b/dependency-check-maven/source-repository.html @@ -1,15 +1,15 @@ - + - dependency-check-maven – Source Repository + dependency-check-maven – Source Code Management @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-maven/surefire-report.html b/dependency-check-maven/surefire-report.html index 4d17377a1..139f3b89d 100644 --- a/dependency-check-maven/surefire-report.html +++ b/dependency-check-maven/surefire-report.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Surefire Report @@ -52,7 +52,7 @@ @@ -276,7 +276,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.687
    +0.447

    Note: failures are anticipated and checked for with assertions while errors are unanticipated.


    Package List

    @@ -297,7 +297,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.687
    +0.447

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

    org.owasp.dependencycheck.maven

    @@ -319,7 +319,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.687

    +0.447

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -329,7 +329,7 @@ function toggleDisplay(elementId) { testScanArtifacts -0.006

    +0
    diff --git a/dependency-check-maven/taglist.html b/dependency-check-maven/taglist.html index afd698900..5c432ad83 100644 --- a/dependency-check-maven/taglist.html +++ b/dependency-check-maven/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Tag List report @@ -52,7 +52,7 @@ @@ -262,7 +262,7 @@ Line fix logging -1060 +1077 org.owasp.dependencycheck.maven.BaseDependencyCheckMojoTest Line diff --git a/dependency-check-maven/team-list.html b/dependency-check-maven/team-list.html index 27ec71b14..f4ea78eee 100644 --- a/dependency-check-maven/team-list.html +++ b/dependency-check-maven/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-maven – Project Team @@ -52,7 +52,7 @@ @@ -104,16 +104,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,28 +125,28 @@
  • - + - Issue Tracking + Issue Management
  • - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -199,9 +199,9 @@
    -

    The Team

    +

    Project Team

    A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.

    -

    The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    +

    The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    Members

    The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.

    diff --git a/dependency-check-maven/update-only-mojo.html b/dependency-check-maven/update-only-mojo.html index 6bd8765c4..e060ad0ad 100644 --- a/dependency-check-maven/update-only-mojo.html +++ b/dependency-check-maven/update-only-mojo.html @@ -1,13 +1,13 @@ - + dependency-check-maven – dependency-check:update-only @@ -52,7 +52,7 @@
    • - + /
      • @@ -64,9 +64,9 @@
    • dependency-check:update-only
      • -
    • | Last Published: 2016-03-05
      • +
    • | Last Published: 2016-04-09
    • - Version: 1.3.5.1 + Version: 1.3.6
    @@ -158,7 +158,7 @@

    Full name:

    -

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

    +

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

    Description:

    diff --git a/dependency-check-maven/xref-test/index.html b/dependency-check-maven/xref-test/index.html index 7dfb63d88..dee866063 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.3.5 Reference + Dependency-Check Maven Plugin 1.3.6 Reference diff --git a/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-frame.html b/dependency-check-maven/xref-test/org/owasp/dependencycheck/maven/package-frame.html index 7353388bf..6caf5e568 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.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.3.6 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 7e32fe9c8..5f863e62c 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.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.3.6 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 1c69617c0..5b9d7ac4c 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.3.5 Reference + Dependency-Check Maven Plugin 1.3.6 Reference diff --git a/dependency-check-maven/xref-test/overview-summary.html b/dependency-check-maven/xref-test/overview-summary.html index ce161a768..e86d3f429 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.3.5 Reference + Dependency-Check Maven Plugin 1.3.6 Reference @@ -24,7 +24,7 @@
    -

    Dependency-Check Maven Plugin 1.3.5 Reference

    +

    Dependency-Check Maven Plugin 1.3.6 Reference

    diff --git a/dependency-check-maven/xref/index.html b/dependency-check-maven/xref/index.html index 7dfb63d88..dee866063 100644 --- a/dependency-check-maven/xref/index.html +++ b/dependency-check-maven/xref/index.html @@ -4,7 +4,7 @@ - Dependency-Check Maven Plugin 1.3.5 Reference + Dependency-Check Maven Plugin 1.3.6 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 4007bd390..c4241a087 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/AggregateMojo.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/AggregateMojo.html @@ -136,7 +136,7 @@ 128/**129 * Gets the last project in the reactor - taking into account skipped projects.130 * -131 * @return the last projecct in the reactor +131 * @return the last project in the reactor132 */133private MavenProject getLastProject() { 134for (int x = getReactorProjects().size() - 1; x >= 0; x--) { @@ -157,7 +157,7 @@ 149 */150privateboolean skipProject(MavenProject project) { 151final String skip = (String) project.getProperties().get("maven.site.skip"); -152return"true".equalsIgnoreCase(skip); +152return"true".equalsIgnoreCase(skip) && isGeneratingSite(); 153 } 154155/** 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 71df2a974..dffa5c22a 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html @@ -395,695 +395,712 @@ 387 */388 @Override 389publicvoid execute() throws MojoExecutionException, MojoFailureException { -390if (skip) { -391 getLog().info("Skipping " + getName(Locale.US)); -392 } else { -393 validateAggregate(); -394 project.setContextValue(getOutputDirectoryContextKey(), this.outputDirectory); -395 runCheck(); -396 } -397 } -398 -399/** -400 * Checks if the aggregate configuration parameter has been set to true. If it has a MojoExecutionException is thrown because -401 * the aggregate configuration parameter is no longer supported. -402 * -403 * @throws MojoExecutionException thrown if aggregate is set to true -404 */ -405privatevoid validateAggregate() throws MojoExecutionException { -406if (aggregate != null && aggregate) { -407final String msg = "Aggregate configuration detected - as of dependency-check 1.2.8 this no longer supported. " -408 + "Please use the aggregate goal instead."; -409thrownew MojoExecutionException(msg); -410 } -411 } -412 -413/** -414 * Generates the Dependency-Check Site Report. -415 * -416 * @param sink the sink to write the report to -417 * @param locale the locale to use when generating the report -418 * @throws MavenReportException if a maven report exception occurs -419 * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead. -420 */ -421 @Override -422 @Deprecated -423publicfinalvoid generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException { -424 generate((Sink) sink, locale); -425 } -426 -427/** -428 * Generates the Dependency-Check Site Report. -429 * -430 * @param sink the sink to write the report to -431 * @param locale the locale to use when generating the report -432 * @throws MavenReportException if a maven report exception occurs -433 */ -434publicvoid generate(Sink sink, Locale locale) throws MavenReportException { -435try { -436 validateAggregate(); -437 } catch (MojoExecutionException ex) { -438thrownew MavenReportException(ex.getMessage()); -439 } -440 project.setContextValue(getOutputDirectoryContextKey(), getReportOutputDirectory()); -441try { -442 runCheck(); -443 } catch (MojoExecutionException ex) { -444thrownew MavenReportException(ex.getMessage(), ex); -445 } catch (MojoFailureException ex) { -446 getLog().warn("Vulnerabilities were identifies that exceed the CVSS threshold for failing the build"); -447 } -448 } -449 -450/** -451 * Returns the correct output directory depending on if a site is being executed or not. -452 * -453 * @return the directory to write the report(s) -454 * @throws MojoExecutionException thrown if there is an error loading the file path -455 */ -456protected File getCorrectOutputDirectory() throws MojoExecutionException { -457return getCorrectOutputDirectory(this.project); -458 } -459 -460/** -461 * Returns the correct output directory depending on if a site is being executed or not. -462 * -463 * @param current the Maven project to get the output directory from -464 * @return the directory to write the report(s) -465 */ -466protected File getCorrectOutputDirectory(MavenProject current) { -467final Object obj = current.getContextValue(getOutputDirectoryContextKey()); -468if (obj != null && obj instanceof File) { -469return (File) obj; -470 } -471 File target = new File(current.getBuild().getDirectory()); -472if (target.getParentFile() != null && "target".equals(target.getParentFile().getName())) { -473 target = target.getParentFile(); -474 } -475return target; -476 } -477 -478/** -479 * Returns the correct output directory depending on if a site is being executed or not. -480 * -481 * @param current the Maven project to get the output directory from -482 * @return the directory to write the report(s) -483 */ -484protected File getDataFile(MavenProject current) { -485if (getLog().isDebugEnabled()) { -486 getLog().debug(String.format("Getting data filefor %s using key '%s'", current.getName(), getDataFileContextKey())); -487 } -488final Object obj = current.getContextValue(getDataFileContextKey()); -489if (obj != null) { -490if (obj instanceof String) { -491final File f = new File((String) obj); -492return f; -493 } -494 } else { -495if (getLog().isDebugEnabled()) { -496 getLog().debug("Context value not found"); -497 } -498 } -499returnnull; -500 } -501 -502/** -503 * Scans the project's artifacts and adds them to the engine's dependency list. -504 * -505 * @param project the project to scan the dependencies of -506 * @param engine the engine to use to scan the dependencies -507 */ -508protectedvoid scanArtifacts(MavenProject project, Engine engine) { -509for (Artifact a : project.getArtifacts()) { -510if (excludeFromScan(a)) { -511continue; -512 } -513final List<Dependency> deps = engine.scan(a.getFile().getAbsoluteFile()); -514if (deps != null) { -515if (deps.size() == 1) { -516final Dependency d = deps.get(0); -517if (d != null) { -518final MavenArtifact ma = new MavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion()); -519 d.addAsEvidence("pom", ma, Confidence.HIGHEST); -520 d.addProjectReference(project.getName()); -521if (getLog().isDebugEnabled()) { -522 getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(), -523 d.getDisplayFileName())); -524 } -525 } -526 } else { -527if (getLog().isDebugEnabled()) { -528final String msg = String.format("More then 1 dependency was identified in first pass scan of '%s:%s:%s'", -529 a.getGroupId(), a.getArtifactId(), a.getVersion()); -530 getLog().debug(msg); -531 } -532 } -533 } -534 } -535 } -536 -537/** -538 * Executes the dependency-check scan and generates the necassary report. -539 * -540 * @throws MojoExecutionException thrown if there is an exception running the scan -541 * @throws MojoFailureException thrown if dependency-check is configured to fail the build -542 */ -543publicabstractvoid runCheck() throws MojoExecutionException, MojoFailureException; -544 -545/** -546 * Sets the Reporting output directory. -547 * -548 * @param directory the output directory -549 */ -550 @Override -551publicvoid setReportOutputDirectory(File directory) { -552 reportOutputDirectory = directory; -553 } -554 -555/** -556 * Returns the report output directory. -557 * -558 * @return the report output directory -559 */ -560 @Override -561public File getReportOutputDirectory() { -562return reportOutputDirectory; -563 } -564 -565/** -566 * Returns the output directory. -567 * -568 * @return the output directory -569 */ -570public File getOutputDirectory() { -571return outputDirectory; -572 } -573 -574/** -575 * Returns whether this is an external report. This method always returns true. -576 * -577 * @return <code>true</code> -578 */ -579 @Override -580publicfinalboolean isExternalReport() { -581returntrue; -582 } -583 -584/** -585 * Returns the output name. -586 * -587 * @return the output name -588 */ -589 @Override -590public String getOutputName() { -591if ("HTML".equalsIgnoreCase(this.format) || "ALL".equalsIgnoreCase(this.format)) { -592return"dependency-check-report"; -593 } elseif ("XML".equalsIgnoreCase(this.format)) { -594return"dependency-check-report.xml#"; -595 } elseif ("VULN".equalsIgnoreCase(this.format)) { -596return"dependency-check-vulnerability"; -597 } else { -598 getLog().warn("Unknown report format used during site generation."); -599return"dependency-check-report"; -600 } -601 } -602 -603/** -604 * Returns the category name. -605 * -606 * @return the category name -607 */ -608 @Override -609public String getCategoryName() { -610return MavenReport.CATEGORY_PROJECT_REPORTS; -611 } -612//</editor-fold> -613 -614/** -615 * Initializes a new <code>Engine</code> that can be used for scanning. -616 * -617 * @return a newly instantiated <code>Engine</code> -618 * @throws DatabaseException thrown if there is a database exception -619 */ -620protectedEngine initializeEngine() throws DatabaseException { -621 populateSettings(); -622returnnewEngine(this.project, -623this.reactorProjects); -624 } -625 -626/** -627 * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties -628 * required to change the proxy url, port, and connection timeout. -629 */ -630protectedvoid populateSettings() { -631 Settings.initialize(); -632 InputStream mojoProperties = null; -633try { -634 mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE); -635 Settings.mergeProperties(mojoProperties); -636 } catch (IOException ex) { -637 getLog().warn("Unable to load the dependency-check ant task.properties file."); -638if (getLog().isDebugEnabled()) { -639 getLog().debug("", ex); -640 } -641 } finally { -642if (mojoProperties != null) { -643try { -644 mojoProperties.close(); -645 } catch (IOException ex) { -646if (getLog().isDebugEnabled()) { -647 getLog().debug("", ex); -648 } -649 } -650 } -651 } -652 Settings.setBooleanIfNotNull(Settings.KEYS.AUTO_UPDATE, autoUpdate); -653 -654if (externalReport != null) { -655 getLog().warn("The 'externalReport' option was set; this configuration option has been removed. " -656 + "Please update the dependency-check-maven plugin's configuration"); -657 } -658 -659if (proxyUrl != null && !proxyUrl.isEmpty()) { -660 getLog().warn("Deprecated configuration detected, proxyUrl will be ignored; use the maven settings " + "to configure the proxy instead"); -661 } -662final Proxy proxy = getMavenProxy(); -663if (proxy != null) { -664 Settings.setString(Settings.KEYS.PROXY_SERVER, proxy.getHost()); -665 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort())); -666final String userName = proxy.getUsername(); -667final String password = proxy.getPassword(); -668 Settings.setStringIfNotNull(Settings.KEYS.PROXY_USERNAME, userName); -669 Settings.setStringIfNotNull(Settings.KEYS.PROXY_PASSWORD, password); -670 Settings.setStringIfNotNull(Settings.KEYS.PROXY_NON_PROXY_HOSTS, proxy.getNonProxyHosts()); -671 } -672 -673 Settings.setStringIfNotEmpty(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout); -674 Settings.setStringIfNotEmpty(Settings.KEYS.SUPPRESSION_FILE, suppressionFile); -675 -676//File Type Analyzer Settings -677 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled); -678 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled); -679 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled); -680 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled); -681 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl); -682 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_USES_PROXY, nexusUsesProxy); -683 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled); -684 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled); -685 Settings.setStringIfNotEmpty(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions); -686 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono); -687 -688 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_DISTRIBUTION_ENABLED, pyDistributionAnalyzerEnabled); -689 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_PACKAGE_ENABLED, pyPackageAnalyzerEnabled); -690 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, rubygemsAnalyzerEnabled); -691 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, opensslAnalyzerEnabled); -692 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CMAKE_ENABLED, cmakeAnalyzerEnabled); -693 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_AUTOCONF_ENABLED, autoconfAnalyzerEnabled); -694 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_COMPOSER_LOCK_ENABLED, composerAnalyzerEnabled); -695 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, nodeAnalyzerEnabled); -696 -697//Database configuration -698 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName); -699 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath); -700 Settings.setStringIfNotEmpty(Settings.KEYS.DB_CONNECTION_STRING, connectionString); -701 -702if (databaseUser == null && databasePassword == null && serverId != null) { -703final Server server = settingsXml.getServer(serverId); -704if (server != null) { -705 databaseUser = server.getUsername(); -706try { -707//The following fix was copied from: -708// https://github.com/bsorrentino/maven-confluence-plugin/blob/master/maven-confluence-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/AbstractBaseConfluenceMojo.java -709// -710// FIX to resolve -711// org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException: -712// java.io.FileNotFoundException: ~/.settings-security.xml (No such file or directory) -713// -714if (securityDispatcher instanceof DefaultSecDispatcher) { -715 ((DefaultSecDispatcher) securityDispatcher).setConfigurationFile("~/.m2/settings-security.xml"); -716 } +390 generatingSite = false; +391if (skip) { +392 getLog().info("Skipping " + getName(Locale.US)); +393 } else { +394 validateAggregate(); +395 project.setContextValue(getOutputDirectoryContextKey(), this.outputDirectory); +396 runCheck(); +397 } +398 } +399 +400/** +401 * Checks if the aggregate configuration parameter has been set to true. If it has a MojoExecutionException is thrown because +402 * the aggregate configuration parameter is no longer supported. +403 * +404 * @throws MojoExecutionException thrown if aggregate is set to true +405 */ +406privatevoid validateAggregate() throws MojoExecutionException { +407if (aggregate != null && aggregate) { +408final String msg = "Aggregate configuration detected - as of dependency-check 1.2.8 this no longer supported. " +409 + "Please use the aggregate goal instead."; +410thrownew MojoExecutionException(msg); +411 } +412 } +413 +414/** +415 * Generates the Dependency-Check Site Report. +416 * +417 * @param sink the sink to write the report to +418 * @param locale the locale to use when generating the report +419 * @throws MavenReportException if a maven report exception occurs +420 * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead. +421 */ +422 @Override +423 @Deprecated +424publicfinalvoid generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException { +425 generate((Sink) sink, locale); +426 } +427 +428/** +429 * A flag indicating whether or not the maven site is being generated. +430 */ +431privateboolean generatingSite = false; +432 +433/** +434 * Returns true if the Maven site is being generated. +435 * +436 * @return true if the Maven site is being generated +437 */ +438protectedboolean isGeneratingSite() { +439return generatingSite; +440 } +441 +442/** +443 * Generates the Dependency-Check Site Report. +444 * +445 * @param sink the sink to write the report to +446 * @param locale the locale to use when generating the report +447 * @throws MavenReportException if a maven report exception occurs +448 */ +449publicvoid generate(Sink sink, Locale locale) throws MavenReportException { +450 generatingSite = true; +451try { +452 validateAggregate(); +453 } catch (MojoExecutionException ex) { +454thrownew MavenReportException(ex.getMessage()); +455 } +456 project.setContextValue(getOutputDirectoryContextKey(), getReportOutputDirectory()); +457try { +458 runCheck(); +459 } catch (MojoExecutionException ex) { +460thrownew MavenReportException(ex.getMessage(), ex); +461 } catch (MojoFailureException ex) { +462 getLog().warn("Vulnerabilities were identifies that exceed the CVSS threshold for failing the build"); +463 } +464 } +465 +466/** +467 * Returns the correct output directory depending on if a site is being executed or not. +468 * +469 * @return the directory to write the report(s) +470 * @throws MojoExecutionException thrown if there is an error loading the file path +471 */ +472protected File getCorrectOutputDirectory() throws MojoExecutionException { +473return getCorrectOutputDirectory(this.project); +474 } +475 +476/** +477 * Returns the correct output directory depending on if a site is being executed or not. +478 * +479 * @param current the Maven project to get the output directory from +480 * @return the directory to write the report(s) +481 */ +482protected File getCorrectOutputDirectory(MavenProject current) { +483final Object obj = current.getContextValue(getOutputDirectoryContextKey()); +484if (obj != null && obj instanceof File) { +485return (File) obj; +486 } +487 File target = new File(current.getBuild().getDirectory()); +488if (target.getParentFile() != null && "target".equals(target.getParentFile().getName())) { +489 target = target.getParentFile(); +490 } +491return target; +492 } +493 +494/** +495 * Returns the correct output directory depending on if a site is being executed or not. +496 * +497 * @param current the Maven project to get the output directory from +498 * @return the directory to write the report(s) +499 */ +500protected File getDataFile(MavenProject current) { +501if (getLog().isDebugEnabled()) { +502 getLog().debug(String.format("Getting data filefor %s using key '%s'", current.getName(), getDataFileContextKey())); +503 } +504final Object obj = current.getContextValue(getDataFileContextKey()); +505if (obj != null) { +506if (obj instanceof String) { +507final File f = new File((String) obj); +508return f; +509 } +510 } else { +511if (getLog().isDebugEnabled()) { +512 getLog().debug("Context value not found"); +513 } +514 } +515returnnull; +516 } +517 +518/** +519 * Scans the project's artifacts and adds them to the engine's dependency list. +520 * +521 * @param project the project to scan the dependencies of +522 * @param engine the engine to use to scan the dependencies +523 */ +524protectedvoid scanArtifacts(MavenProject project, Engine engine) { +525for (Artifact a : project.getArtifacts()) { +526if (excludeFromScan(a)) { +527continue; +528 } +529final List<Dependency> deps = engine.scan(a.getFile().getAbsoluteFile()); +530if (deps != null) { +531if (deps.size() == 1) { +532final Dependency d = deps.get(0); +533if (d != null) { +534final MavenArtifact ma = new MavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion()); +535 d.addAsEvidence("pom", ma, Confidence.HIGHEST); +536 d.addProjectReference(project.getName()); +537if (getLog().isDebugEnabled()) { +538 getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(), +539 d.getDisplayFileName())); +540 } +541 } +542 } else { +543if (getLog().isDebugEnabled()) { +544final String msg = String.format("More then 1 dependency was identified in first pass scan of '%s:%s:%s'", +545 a.getGroupId(), a.getArtifactId(), a.getVersion()); +546 getLog().debug(msg); +547 } +548 } +549 } +550 } +551 } +552 +553/** +554 * Executes the dependency-check scan and generates the necassary report. +555 * +556 * @throws MojoExecutionException thrown if there is an exception running the scan +557 * @throws MojoFailureException thrown if dependency-check is configured to fail the build +558 */ +559publicabstractvoid runCheck() throws MojoExecutionException, MojoFailureException; +560 +561/** +562 * Sets the Reporting output directory. +563 * +564 * @param directory the output directory +565 */ +566 @Override +567publicvoid setReportOutputDirectory(File directory) { +568 reportOutputDirectory = directory; +569 } +570 +571/** +572 * Returns the report output directory. +573 * +574 * @return the report output directory +575 */ +576 @Override +577public File getReportOutputDirectory() { +578return reportOutputDirectory; +579 } +580 +581/** +582 * Returns the output directory. +583 * +584 * @return the output directory +585 */ +586public File getOutputDirectory() { +587return outputDirectory; +588 } +589 +590/** +591 * Returns whether this is an external report. This method always returns true. +592 * +593 * @return <code>true</code> +594 */ +595 @Override +596publicfinalboolean isExternalReport() { +597returntrue; +598 } +599 +600/** +601 * Returns the output name. +602 * +603 * @return the output name +604 */ +605 @Override +606public String getOutputName() { +607if ("HTML".equalsIgnoreCase(this.format) || "ALL".equalsIgnoreCase(this.format)) { +608return"dependency-check-report"; +609 } elseif ("XML".equalsIgnoreCase(this.format)) { +610return"dependency-check-report.xml#"; +611 } elseif ("VULN".equalsIgnoreCase(this.format)) { +612return"dependency-check-vulnerability"; +613 } else { +614 getLog().warn("Unknown report format used during site generation."); +615return"dependency-check-report"; +616 } +617 } +618 +619/** +620 * Returns the category name. +621 * +622 * @return the category name +623 */ +624 @Override +625public String getCategoryName() { +626return MavenReport.CATEGORY_PROJECT_REPORTS; +627 } +628//</editor-fold> +629 +630/** +631 * Initializes a new <code>Engine</code> that can be used for scanning. +632 * +633 * @return a newly instantiated <code>Engine</code> +634 * @throws DatabaseException thrown if there is a database exception +635 */ +636protectedEngine initializeEngine() throws DatabaseException { +637 populateSettings(); +638returnnewEngine(this.project, +639this.reactorProjects); +640 } +641 +642/** +643 * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties +644 * required to change the proxy url, port, and connection timeout. +645 */ +646protectedvoid populateSettings() { +647 Settings.initialize(); +648 InputStream mojoProperties = null; +649try { +650 mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE); +651 Settings.mergeProperties(mojoProperties); +652 } catch (IOException ex) { +653 getLog().warn("Unable to load the dependency-check ant task.properties file."); +654if (getLog().isDebugEnabled()) { +655 getLog().debug("", ex); +656 } +657 } finally { +658if (mojoProperties != null) { +659try { +660 mojoProperties.close(); +661 } catch (IOException ex) { +662if (getLog().isDebugEnabled()) { +663 getLog().debug("", ex); +664 } +665 } +666 } +667 } +668 Settings.setBooleanIfNotNull(Settings.KEYS.AUTO_UPDATE, autoUpdate); +669 +670if (externalReport != null) { +671 getLog().warn("The 'externalReport' option was set; this configuration option has been removed. " +672 + "Please update the dependency-check-maven plugin's configuration"); +673 } +674 +675if (proxyUrl != null && !proxyUrl.isEmpty()) { +676 getLog().warn("Deprecated configuration detected, proxyUrl will be ignored; use the maven settings " + "to configure the proxy instead"); +677 } +678final Proxy proxy = getMavenProxy(); +679if (proxy != null) { +680 Settings.setString(Settings.KEYS.PROXY_SERVER, proxy.getHost()); +681 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort())); +682final String userName = proxy.getUsername(); +683final String password = proxy.getPassword(); +684 Settings.setStringIfNotNull(Settings.KEYS.PROXY_USERNAME, userName); +685 Settings.setStringIfNotNull(Settings.KEYS.PROXY_PASSWORD, password); +686 Settings.setStringIfNotNull(Settings.KEYS.PROXY_NON_PROXY_HOSTS, proxy.getNonProxyHosts()); +687 } +688 +689 Settings.setStringIfNotEmpty(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout); +690 Settings.setStringIfNotEmpty(Settings.KEYS.SUPPRESSION_FILE, suppressionFile); +691 +692//File Type Analyzer Settings +693 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled); +694 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled); +695 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled); +696 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled); +697 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl); +698 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_USES_PROXY, nexusUsesProxy); +699 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled); +700 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled); +701 Settings.setStringIfNotEmpty(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions); +702 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono); +703 +704 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_DISTRIBUTION_ENABLED, pyDistributionAnalyzerEnabled); +705 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_PACKAGE_ENABLED, pyPackageAnalyzerEnabled); +706 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, rubygemsAnalyzerEnabled); +707 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, opensslAnalyzerEnabled); +708 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CMAKE_ENABLED, cmakeAnalyzerEnabled); +709 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_AUTOCONF_ENABLED, autoconfAnalyzerEnabled); +710 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_COMPOSER_LOCK_ENABLED, composerAnalyzerEnabled); +711 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, nodeAnalyzerEnabled); +712 +713//Database configuration +714 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName); +715 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath); +716 Settings.setStringIfNotEmpty(Settings.KEYS.DB_CONNECTION_STRING, connectionString); 717 -718 databasePassword = securityDispatcher.decrypt(server.getPassword()); -719 } catch (SecDispatcherException ex) { -720if (ex.getCause() instanceof FileNotFoundException -721 || (ex.getCause() != null && ex.getCause().getCause() instanceof FileNotFoundException)) { -722//maybe its not encrypted? -723final String tmp = server.getPassword(); -724if (tmp.startsWith("{") && tmp.endsWith("}")) { -725 getLog().error(String.format( -726"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", -727 serverId, ex.getMessage())); -728 } else { -729 databasePassword = tmp; -730 } -731 } else { -732 getLog().error(String.format( -733"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", -734 serverId, ex.getMessage())); -735 } -736 } -737 } else { -738 getLog().error(String.format("Server '%s' not found in the settings.xml file", serverId)); -739 } -740 } -741 -742 Settings.setStringIfNotEmpty(Settings.KEYS.DB_USER, databaseUser); -743 Settings.setStringIfNotEmpty(Settings.KEYS.DB_PASSWORD, databasePassword); -744 Settings.setStringIfNotEmpty(Settings.KEYS.DATA_DIRECTORY, dataDirectory); -745 -746 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified); -747 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified); -748 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base); -749 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base); -750 Settings.setIntIfNotNull(Settings.KEYS.CVE_CHECK_VALID_FOR_HOURS, cveValidForHours); -751 -752 } -753 -754/** -755 * Returns the maven proxy. -756 * -757 * @return the maven proxy -758 */ -759private Proxy getMavenProxy() { -760if (mavenSettings != null) { -761final List<Proxy> proxies = mavenSettings.getProxies(); -762if (proxies != null && !proxies.isEmpty()) { -763if (mavenSettingsProxyId != null) { -764for (Proxy proxy : proxies) { -765if (mavenSettingsProxyId.equalsIgnoreCase(proxy.getId())) { -766return proxy; -767 } -768 } -769 } elseif (proxies.size() == 1) { -770return proxies.get(0); -771 } else { -772 getLog().warn("Multiple proxy definitions exist in the Maven settings. In the dependency-check " -773 + "configuration set the mavenSettingsProxyId so that the correct proxy will be used."); -774thrownew IllegalStateException("Ambiguous proxy definition"); -775 } -776 } -777 } -778returnnull; -779 } -780 -781/** -782 * Tests is the artifact should be included in the scan (i.e. is the dependency in a scope that is being scanned). -783 * -784 * @param a the Artifact to test -785 * @return <code>true</code> if the artifact is in an excluded scope; otherwise <code>false</code> -786 */ -787protectedboolean excludeFromScan(Artifact a) { -788if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) { -789returntrue; -790 } -791if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) { -792returntrue; +718if (databaseUser == null && databasePassword == null && serverId != null) { +719final Server server = settingsXml.getServer(serverId); +720if (server != null) { +721 databaseUser = server.getUsername(); +722try { +723//The following fix was copied from: +724// https://github.com/bsorrentino/maven-confluence-plugin/blob/master/maven-confluence-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/AbstractBaseConfluenceMojo.java +725// +726// FIX to resolve +727// org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException: +728// java.io.FileNotFoundException: ~/.settings-security.xml (No such file or directory) +729// +730if (securityDispatcher instanceof DefaultSecDispatcher) { +731 ((DefaultSecDispatcher) securityDispatcher).setConfigurationFile("~/.m2/settings-security.xml"); +732 } +733 +734 databasePassword = securityDispatcher.decrypt(server.getPassword()); +735 } catch (SecDispatcherException ex) { +736if (ex.getCause() instanceof FileNotFoundException +737 || (ex.getCause() != null && ex.getCause().getCause() instanceof FileNotFoundException)) { +738//maybe its not encrypted? +739final String tmp = server.getPassword(); +740if (tmp.startsWith("{") && tmp.endsWith("}")) { +741 getLog().error(String.format( +742"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", +743 serverId, ex.getMessage())); +744 } else { +745 databasePassword = tmp; +746 } +747 } else { +748 getLog().error(String.format( +749"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", +750 serverId, ex.getMessage())); +751 } +752 } +753 } else { +754 getLog().error(String.format("Server '%s' not found in the settings.xml file", serverId)); +755 } +756 } +757 +758 Settings.setStringIfNotEmpty(Settings.KEYS.DB_USER, databaseUser); +759 Settings.setStringIfNotEmpty(Settings.KEYS.DB_PASSWORD, databasePassword); +760 Settings.setStringIfNotEmpty(Settings.KEYS.DATA_DIRECTORY, dataDirectory); +761 +762 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified); +763 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified); +764 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base); +765 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base); +766 Settings.setIntIfNotNull(Settings.KEYS.CVE_CHECK_VALID_FOR_HOURS, cveValidForHours); +767 +768 } +769 +770/** +771 * Returns the maven proxy. +772 * +773 * @return the maven proxy +774 */ +775private Proxy getMavenProxy() { +776if (mavenSettings != null) { +777final List<Proxy> proxies = mavenSettings.getProxies(); +778if (proxies != null && !proxies.isEmpty()) { +779if (mavenSettingsProxyId != null) { +780for (Proxy proxy : proxies) { +781if (mavenSettingsProxyId.equalsIgnoreCase(proxy.getId())) { +782return proxy; +783 } +784 } +785 } elseif (proxies.size() == 1) { +786return proxies.get(0); +787 } else { +788 getLog().warn("Multiple proxy definitions exist in the Maven settings. In the dependency-check " +789 + "configuration set the mavenSettingsProxyId so that the correct proxy will be used."); +790thrownew IllegalStateException("Ambiguous proxy definition"); +791 } +792 } 793 } -794if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) { -795returntrue; -796 } -797return false; -798 } -799 -800/** -801 * Returns a reference to the current project. This method is used instead of auto-binding the project via component -802 * annotation in concrete implementations of this. If the child has a <code>@Component MavenProject project;</code> defined -803 * then the abstract class (i.e. this class) will not have access to the current project (just the way Maven works with the -804 * binding). -805 * -806 * @return returns a reference to the current project -807 */ -808protected MavenProject getProject() { -809return project; -810 } -811 -812/** -813 * Returns the list of Maven Projects in this build. -814 * -815 * @return the list of Maven Projects in this build -816 */ -817protected List<MavenProject> getReactorProjects() { -818return reactorProjects; -819 } -820 -821/** -822 * Returns the report format. -823 * -824 * @return the report format -825 */ -826protected String getFormat() { -827return format; -828 } -829 -830/** -831 * Generates the reports for a given dependency-check engine. -832 * -833 * @param engine a dependency-check engine -834 * @param p the maven project -835 * @param outputDir the directory path to write the report(s). -836 */ -837protectedvoid writeReports(Engine engine, MavenProject p, File outputDir) { -838 DatabaseProperties prop = null; -839 CveDB cve = null; -840try { -841 cve = new CveDB(); -842 cve.open(); -843 prop = cve.getDatabaseProperties(); -844 } catch (DatabaseException ex) { -845if (getLog().isDebugEnabled()) { -846 getLog().debug("Unable to retrieve DB Properties", ex); -847 } -848 } finally { -849if (cve != null) { -850 cve.close(); -851 } -852 } -853final ReportGenerator r = new ReportGenerator(p.getName(), engine.getDependencies(), engine.getAnalyzers(), prop); -854try { -855 r.generateReports(outputDir.getAbsolutePath(), format); -856 } catch (IOException ex) { -857 getLog().error( -858"Unexpected exception occurred during analysis; please see the verbose error log for more details."); -859if (getLog().isDebugEnabled()) { -860 getLog().debug("", ex); -861 } -862 } catch (Throwable ex) { -863 getLog().error( -864"Unexpected exception occurred during analysis; please see the verbose error log for more details."); -865if (getLog().isDebugEnabled()) { -866 getLog().debug("", ex); +794returnnull; +795 } +796 +797/** +798 * Tests is the artifact should be included in the scan (i.e. is the dependency in a scope that is being scanned). +799 * +800 * @param a the Artifact to test +801 * @return <code>true</code> if the artifact is in an excluded scope; otherwise <code>false</code> +802 */ +803protectedboolean excludeFromScan(Artifact a) { +804if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) { +805returntrue; +806 } +807if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) { +808returntrue; +809 } +810if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) { +811returntrue; +812 } +813return false; +814 } +815 +816/** +817 * Returns a reference to the current project. This method is used instead of auto-binding the project via component +818 * annotation in concrete implementations of this. If the child has a <code>@Component MavenProject project;</code> defined +819 * then the abstract class (i.e. this class) will not have access to the current project (just the way Maven works with the +820 * binding). +821 * +822 * @return returns a reference to the current project +823 */ +824protected MavenProject getProject() { +825return project; +826 } +827 +828/** +829 * Returns the list of Maven Projects in this build. +830 * +831 * @return the list of Maven Projects in this build +832 */ +833protected List<MavenProject> getReactorProjects() { +834return reactorProjects; +835 } +836 +837/** +838 * Returns the report format. +839 * +840 * @return the report format +841 */ +842protected String getFormat() { +843return format; +844 } +845 +846/** +847 * Generates the reports for a given dependency-check engine. +848 * +849 * @param engine a dependency-check engine +850 * @param p the maven project +851 * @param outputDir the directory path to write the report(s). +852 */ +853protectedvoid writeReports(Engine engine, MavenProject p, File outputDir) { +854 DatabaseProperties prop = null; +855 CveDB cve = null; +856try { +857 cve = new CveDB(); +858 cve.open(); +859 prop = cve.getDatabaseProperties(); +860 } catch (DatabaseException ex) { +861if (getLog().isDebugEnabled()) { +862 getLog().debug("Unable to retrieve DB Properties", ex); +863 } +864 } finally { +865if (cve != null) { +866 cve.close(); 867 } 868 } -869 } -870 -871//<editor-fold defaultstate="collapsed" desc="Methods to fail build or show summary"> -872/** -873 * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the -874 * configuration. -875 * -876 * @param dependencies the list of dependency objects -877 * @throws MojoFailureException thrown if a CVSS score is found that is higher then the threshold set -878 */ -879protectedvoid checkForFailure(List<Dependency> dependencies) throws MojoFailureException { -880if (failBuildOnCVSS <= 10) { -881final StringBuilder ids = new StringBuilder(); -882for (Dependency d : dependencies) { -883boolean addName = true; -884for (Vulnerability v : d.getVulnerabilities()) { -885if (v.getCvssScore() >= failBuildOnCVSS) { -886if (addName) { -887 addName = false; -888 ids.append(NEW_LINE).append(d.getFileName()).append(": "); -889 ids.append(v.getName()); -890 } else { -891 ids.append(", ").append(v.getName()); -892 } -893 } -894 } -895 } -896if (ids.length() > 0) { -897final String msg = String.format("%n%nDependency-Check Failure:%n" -898 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n" -899 + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString()); -900thrownew MojoFailureException(msg); -901 } -902 } -903 } -904 -905/** -906 * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries. -907 * -908 * @param mp the Maven project for which the summary is shown -909 * @param dependencies a list of dependency objects -910 */ -911protectedvoid showSummary(MavenProject mp, List<Dependency> dependencies) { -912if (showSummary) { -913final StringBuilder summary = new StringBuilder(); -914for (Dependency d : dependencies) { -915boolean firstEntry = true; -916final StringBuilder ids = new StringBuilder(); -917for (Vulnerability v : d.getVulnerabilities()) { -918if (firstEntry) { -919 firstEntry = false; -920 } else { -921 ids.append(", "); -922 } -923 ids.append(v.getName()); -924 } -925if (ids.length() > 0) { -926 summary.append(d.getFileName()).append(" ("); -927 firstEntry = true; -928for (Identifier id : d.getIdentifiers()) { -929if (firstEntry) { -930 firstEntry = false; -931 } else { -932 summary.append(", "); -933 } -934 summary.append(id.getValue()); -935 } -936 summary.append(") : ").append(ids).append(NEW_LINE); -937 } -938 } -939if (summary.length() > 0) { -940final String msg = String.format("%n%n" + "One or more dependencies were identified with known vulnerabilities in %s:%n%n%s" -941 + "%n%nSee the dependency-check report for more details.%n%n", mp.getName(), summary.toString()); -942 getLog().warn(msg); -943 } -944 } -945 } -946 -947//</editor-fold> -948//<editor-fold defaultstate="collapsed" desc="Methods to read/write the serialized data file"> -949/** -950 * Returns the key used to store the path to the data file that is saved by <code>writeDataFile()</code>. This key is used in -951 * the <code>MavenProject.(set|get)ContextValue</code>. -952 * -953 * @return the key used to store the path to the data file -954 */ -955protected String getDataFileContextKey() { -956return"dependency-check-path-" + dataFileName; -957 } -958 -959/** -960 * Returns the key used to store the path to the output directory. When generating the report in the -961 * <code>executeAggregateReport()</code> the output directory should be obtained by using this key. -962 * -963 * @return the key used to store the path to the output directory -964 */ -965protected String getOutputDirectoryContextKey() { -966return"dependency-output-dir-" + dataFileName; -967 } -968 -969/** -970 * Writes the scan data to disk. This is used to serialize the scan data between the "check" and "aggregate" phase. -971 * -972 * @param mp the mMven project for which the data file was created -973 * @param writeTo the directory to write the data file -974 * @param dependencies the list of dependencies to serialize -975 */ -976protectedvoid writeDataFile(MavenProject mp, File writeTo, List<Dependency> dependencies) { -977 File file; -978//check to see if this was already written out -979if (mp.getContextValue(this.getDataFileContextKey()) == null) { -980if (writeTo == null) { -981 file = new File(mp.getBuild().getDirectory()); -982 file = new File(file, dataFileName); -983 } else { -984 file = new File(writeTo, dataFileName); -985 } -986final File parent = file.getParentFile(); -987if (!parent.isDirectory() && parent.mkdirs()) { -988 getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.", -989 parent.getAbsolutePath())); -990 } -991 -992 ObjectOutputStream out = null; -993try { -994if (dependencies != null) { -995 out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file))); -996 out.writeObject(dependencies); -997 } -998if (getLog().isDebugEnabled()) { -999 getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s", -1000 file.getAbsolutePath(), mp.getName(), this.getDataFileContextKey())); -1001 } -1002 mp.setContextValue(this.getDataFileContextKey(), file.getAbsolutePath()); -1003 } catch (IOException ex) { -1004 getLog().warn("Unable to create data file used for report aggregation; " -1005 + "if report aggregation is being used the results may be incomplete."); -1006if (getLog().isDebugEnabled()) { -1007 getLog().debug(ex.getMessage(), ex); -1008 } -1009 } finally { -1010if (out != null) { -1011try { -1012 out.close(); -1013 } catch (IOException ex) { -1014if (getLog().isDebugEnabled()) { -1015 getLog().debug("ignore", ex); -1016 } -1017 } -1018 } -1019 } -1020 } -1021 } -1022 -1023/** -1024 * Reads the serialized scan data from disk. This is used to serialize the scan data between the "check" and "aggregate" -1025 * phase. -1026 * -1027 * @param project the Maven project to read the data file from -1028 * @return a <code>Engine</code> object populated with dependencies if the serialized data file exists; otherwise -1029 * <code>null</code> is returned -1030 */ -1031protected List<Dependency> readDataFile(MavenProject project) { -1032final Object oPath = project.getContextValue(this.getDataFileContextKey()); -1033if (oPath == null) { -1034returnnull; -1035 } -1036 List<Dependency> ret = null; -1037final String path = (String) oPath; -1038//ObjectInputStream ois = null; -1039 ExpectedOjectInputStream ois = null; -1040try { -1041//ois = new ObjectInputStream(new FileInputStream(path)); -1042 ois = new ExpectedOjectInputStream(new FileInputStream(path), -1043"java.util.ArrayList", -1044"java.util.HashSet", -1045"java.util.TreeSet", -1046"java.lang.AbstractSet", -1047"java.lang.AbstractCollection", -1048"java.lang.Enum", -1049"org.owasp.dependencycheck.dependency.Confidence", -1050"org.owasp.dependencycheck.dependency.Dependency", -1051"org.owasp.dependencycheck.dependency.Evidence", -1052"org.owasp.dependencycheck.dependency.EvidenceCollection", -1053"org.owasp.dependencycheck.dependency.Identifier", -1054"org.owasp.dependencycheck.dependency.Reference", -1055"org.owasp.dependencycheck.dependency.Vulnerability", -1056"org.owasp.dependencycheck.dependency.VulnerabilityComparator", -1057"org.owasp.dependencycheck.dependency.VulnerableSoftware"); -1058 ret = (List<Dependency>) ois.readObject(); -1059 } catch (FileNotFoundException ex) { -1060//TODO fix logging -1061 getLog().error("", ex); -1062 } catch (IOException ex) { -1063 getLog().error("", ex); -1064 } catch (ClassNotFoundException ex) { -1065 getLog().error("", ex); -1066 } finally { -1067if (ois != null) { -1068try { -1069 ois.close(); -1070 } catch (IOException ex) { -1071 getLog().error("", ex); -1072 } -1073 } -1074 } -1075return ret; -1076 } -1077//</editor-fold> -1078 } +869final ReportGenerator r = new ReportGenerator(p.getName(), engine.getDependencies(), engine.getAnalyzers(), prop); +870try { +871 r.generateReports(outputDir.getAbsolutePath(), format); +872 } catch (IOException ex) { +873 getLog().error( +874"Unexpected exception occurred during analysis; please see the verbose error log for more details."); +875if (getLog().isDebugEnabled()) { +876 getLog().debug("", ex); +877 } +878 } catch (Throwable ex) { +879 getLog().error( +880"Unexpected exception occurred during analysis; please see the verbose error log for more details."); +881if (getLog().isDebugEnabled()) { +882 getLog().debug("", ex); +883 } +884 } +885 } +886 +887//<editor-fold defaultstate="collapsed" desc="Methods to fail build or show summary"> +888/** +889 * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the +890 * configuration. +891 * +892 * @param dependencies the list of dependency objects +893 * @throws MojoFailureException thrown if a CVSS score is found that is higher then the threshold set +894 */ +895protectedvoid checkForFailure(List<Dependency> dependencies) throws MojoFailureException { +896if (failBuildOnCVSS <= 10) { +897final StringBuilder ids = new StringBuilder(); +898for (Dependency d : dependencies) { +899boolean addName = true; +900for (Vulnerability v : d.getVulnerabilities()) { +901if (v.getCvssScore() >= failBuildOnCVSS) { +902if (addName) { +903 addName = false; +904 ids.append(NEW_LINE).append(d.getFileName()).append(": "); +905 ids.append(v.getName()); +906 } else { +907 ids.append(", ").append(v.getName()); +908 } +909 } +910 } +911 } +912if (ids.length() > 0) { +913final String msg = String.format("%n%nDependency-Check Failure:%n" +914 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n" +915 + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString()); +916thrownew MojoFailureException(msg); +917 } +918 } +919 } +920 +921/** +922 * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries. +923 * +924 * @param mp the Maven project for which the summary is shown +925 * @param dependencies a list of dependency objects +926 */ +927protectedvoid showSummary(MavenProject mp, List<Dependency> dependencies) { +928if (showSummary) { +929final StringBuilder summary = new StringBuilder(); +930for (Dependency d : dependencies) { +931boolean firstEntry = true; +932final StringBuilder ids = new StringBuilder(); +933for (Vulnerability v : d.getVulnerabilities()) { +934if (firstEntry) { +935 firstEntry = false; +936 } else { +937 ids.append(", "); +938 } +939 ids.append(v.getName()); +940 } +941if (ids.length() > 0) { +942 summary.append(d.getFileName()).append(" ("); +943 firstEntry = true; +944for (Identifier id : d.getIdentifiers()) { +945if (firstEntry) { +946 firstEntry = false; +947 } else { +948 summary.append(", "); +949 } +950 summary.append(id.getValue()); +951 } +952 summary.append(") : ").append(ids).append(NEW_LINE); +953 } +954 } +955if (summary.length() > 0) { +956final String msg = String.format("%n%n" + "One or more dependencies were identified with known vulnerabilities in %s:%n%n%s" +957 + "%n%nSee the dependency-check report for more details.%n%n", mp.getName(), summary.toString()); +958 getLog().warn(msg); +959 } +960 } +961 } +962 +963//</editor-fold> +964//<editor-fold defaultstate="collapsed" desc="Methods to read/write the serialized data file"> +965/** +966 * Returns the key used to store the path to the data file that is saved by <code>writeDataFile()</code>. This key is used in +967 * the <code>MavenProject.(set|get)ContextValue</code>. +968 * +969 * @return the key used to store the path to the data file +970 */ +971protected String getDataFileContextKey() { +972return"dependency-check-path-" + dataFileName; +973 } +974 +975/** +976 * Returns the key used to store the path to the output directory. When generating the report in the +977 * <code>executeAggregateReport()</code> the output directory should be obtained by using this key. +978 * +979 * @return the key used to store the path to the output directory +980 */ +981protected String getOutputDirectoryContextKey() { +982return"dependency-output-dir-" + dataFileName; +983 } +984 +985/** +986 * Writes the scan data to disk. This is used to serialize the scan data between the "check" and "aggregate" phase. +987 * +988 * @param mp the mMven project for which the data file was created +989 * @param writeTo the directory to write the data file +990 * @param dependencies the list of dependencies to serialize +991 */ +992protectedvoid writeDataFile(MavenProject mp, File writeTo, List<Dependency> dependencies) { +993 File file; +994//check to see if this was already written out +995if (mp.getContextValue(this.getDataFileContextKey()) == null) { +996if (writeTo == null) { +997 file = new File(mp.getBuild().getDirectory()); +998 file = new File(file, dataFileName); +999 } else { +1000 file = new File(writeTo, dataFileName); +1001 } +1002final File parent = file.getParentFile(); +1003if (!parent.isDirectory() && parent.mkdirs()) { +1004 getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.", +1005 parent.getAbsolutePath())); +1006 } +1007 +1008 ObjectOutputStream out = null; +1009try { +1010if (dependencies != null) { +1011 out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file))); +1012 out.writeObject(dependencies); +1013 } +1014if (getLog().isDebugEnabled()) { +1015 getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s", +1016 file.getAbsolutePath(), mp.getName(), this.getDataFileContextKey())); +1017 } +1018 mp.setContextValue(this.getDataFileContextKey(), file.getAbsolutePath()); +1019 } catch (IOException ex) { +1020 getLog().warn("Unable to create data file used for report aggregation; " +1021 + "if report aggregation is being used the results may be incomplete."); +1022if (getLog().isDebugEnabled()) { +1023 getLog().debug(ex.getMessage(), ex); +1024 } +1025 } finally { +1026if (out != null) { +1027try { +1028 out.close(); +1029 } catch (IOException ex) { +1030if (getLog().isDebugEnabled()) { +1031 getLog().debug("ignore", ex); +1032 } +1033 } +1034 } +1035 } +1036 } +1037 } +1038 +1039/** +1040 * Reads the serialized scan data from disk. This is used to serialize the scan data between the "check" and "aggregate" +1041 * phase. +1042 * +1043 * @param project the Maven project to read the data file from +1044 * @return a <code>Engine</code> object populated with dependencies if the serialized data file exists; otherwise +1045 * <code>null</code> is returned +1046 */ +1047protected List<Dependency> readDataFile(MavenProject project) { +1048final Object oPath = project.getContextValue(this.getDataFileContextKey()); +1049if (oPath == null) { +1050returnnull; +1051 } +1052 List<Dependency> ret = null; +1053final String path = (String) oPath; +1054//ObjectInputStream ois = null; +1055 ExpectedOjectInputStream ois = null; +1056try { +1057//ois = new ObjectInputStream(new FileInputStream(path)); +1058 ois = new ExpectedOjectInputStream(new FileInputStream(path), +1059"java.util.ArrayList", +1060"java.util.HashSet", +1061"java.util.TreeSet", +1062"java.lang.AbstractSet", +1063"java.lang.AbstractCollection", +1064"java.lang.Enum", +1065"org.owasp.dependencycheck.dependency.Confidence", +1066"org.owasp.dependencycheck.dependency.Dependency", +1067"org.owasp.dependencycheck.dependency.Evidence", +1068"org.owasp.dependencycheck.dependency.EvidenceCollection", +1069"org.owasp.dependencycheck.dependency.Identifier", +1070"org.owasp.dependencycheck.dependency.Reference", +1071"org.owasp.dependencycheck.dependency.Vulnerability", +1072"org.owasp.dependencycheck.dependency.VulnerabilityComparator", +1073"org.owasp.dependencycheck.dependency.VulnerableSoftware", +1074"org.owasp.dependencycheck.data.cpe.IndexEntry"); +1075 ret = (List<Dependency>) ois.readObject(); +1076 } catch (FileNotFoundException ex) { +1077//TODO fix logging +1078 getLog().error("", ex); +1079 } catch (IOException ex) { +1080 getLog().error("", ex); +1081 } catch (ClassNotFoundException ex) { +1082 getLog().error("", ex); +1083 } finally { +1084if (ois != null) { +1085try { +1086 ois.close(); +1087 } catch (IOException ex) { +1088 getLog().error("", ex); +1089 } +1090 } +1091 } +1092return ret; +1093 } +1094//</editor-fold> +1095 }
    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 bc2f2ca60..c3a524c02 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.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.3.6 Reference Package org.owasp.dependencycheck.maven 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 3a0677030..f01dd43e5 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.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check Maven Plugin 1.3.6 Reference Package org.owasp.dependencycheck.maven diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html index 5485b521d..7d6317c1b 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.3.5 Reference Package org.owasp.dependencycheck.maven.slf4j + Dependency-Check Maven Plugin 1.3.6 Reference Package org.owasp.dependencycheck.maven.slf4j diff --git a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html index 13093aac7..7f17de225 100644 --- a/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html +++ b/dependency-check-maven/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.3.5 Reference Package org.owasp.dependencycheck.maven.slf4j + Dependency-Check Maven Plugin 1.3.6 Reference Package org.owasp.dependencycheck.maven.slf4j diff --git a/dependency-check-maven/xref/org/slf4j/impl/package-frame.html b/dependency-check-maven/xref/org/slf4j/impl/package-frame.html index 64b47ccc3..44fe05721 100644 --- a/dependency-check-maven/xref/org/slf4j/impl/package-frame.html +++ b/dependency-check-maven/xref/org/slf4j/impl/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.3.5 Reference Package org.slf4j.impl + Dependency-Check Maven Plugin 1.3.6 Reference Package org.slf4j.impl diff --git a/dependency-check-maven/xref/org/slf4j/impl/package-summary.html b/dependency-check-maven/xref/org/slf4j/impl/package-summary.html index f38910b3b..6f519baf4 100644 --- a/dependency-check-maven/xref/org/slf4j/impl/package-summary.html +++ b/dependency-check-maven/xref/org/slf4j/impl/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Maven Plugin 1.3.5 Reference Package org.slf4j.impl + Dependency-Check Maven Plugin 1.3.6 Reference Package org.slf4j.impl diff --git a/dependency-check-maven/xref/overview-frame.html b/dependency-check-maven/xref/overview-frame.html index d3098897d..ca78cdf02 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.3.5 Reference + Dependency-Check Maven Plugin 1.3.6 Reference diff --git a/dependency-check-maven/xref/overview-summary.html b/dependency-check-maven/xref/overview-summary.html index 919079a15..f5eb8c197 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.3.5 Reference + Dependency-Check Maven Plugin 1.3.6 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check Maven Plugin 1.3.5 Reference

    +

    Dependency-Check Maven Plugin 1.3.6 Reference

    diff --git a/dependency-check-utils/apidocs/allclasses-frame.html b/dependency-check-utils/apidocs/allclasses-frame.html index 23484d407..3f6b0db5d 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.3.5 API) - +All Classes (Dependency-Check Utils 1.3.6 API) + diff --git a/dependency-check-utils/apidocs/allclasses-noframe.html b/dependency-check-utils/apidocs/allclasses-noframe.html index 3132e3341..1e5583b1f 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.3.5 API) - +All Classes (Dependency-Check Utils 1.3.6 API) + diff --git a/dependency-check-utils/apidocs/constant-values.html b/dependency-check-utils/apidocs/constant-values.html index 040a9c966..81e97cf24 100644 --- a/dependency-check-utils/apidocs/constant-values.html +++ b/dependency-check-utils/apidocs/constant-values.html @@ -2,10 +2,10 @@ - + -Constant Field Values (Dependency-Check Utils 1.3.5 API) - +Constant Field Values (Dependency-Check Utils 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ 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 40068374a..4e32560a6 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,10 +2,10 @@ - + -org.owasp.dependencycheck.utils (Dependency-Check Utils 1.3.5 API) - +org.owasp.dependencycheck.utils (Dependency-Check Utils 1.3.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    diff --git a/dependency-check-utils/cobertura/frame-summary.html b/dependency-check-utils/cobertura/frame-summary.html index 54b636890..64aa897ea 100644 --- a/dependency-check-utils/cobertura/frame-summary.html +++ b/dependency-check-utils/cobertura/frame-summary.html @@ -16,8 +16,8 @@
    - - + +
    Package # Classes Line Coverage Branch Coverage Complexity
    All Packages12
    27%
    129/472
    20%
    36/174
    		3.068
    org.owasp.dependencycheck.utils12
    27%
    129/472
    20%
    36/174
    		3.068
    All Packages12
    28%
    135/473
    21%
    37/176
    		3.082
    org.owasp.dependencycheck.utils12
    28%
    135/473
    21%
    37/176
    		3.082
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 e61895254..aba197386 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Checksum.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Checksum.html @@ -272,6 +272,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 46c5bbeb0..48e167009 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 885db1a47..eee6c4d80 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Downloader.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Downloader.html @@ -512,6 +512,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    diff --git a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExpectedOjectInputStream.html b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExpectedOjectInputStream.html index 330719d00..6dc44ecaa 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExpectedOjectInputStream.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExpectedOjectInputStream.html @@ -142,7 +142,7 @@  64   
         protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
     65  7 
             if (!this.expected.contains(desc.getName())) {
    -  66  1 
                 throw new InvalidClassException("Unexpected deserialization", desc.getName());
    +  66  1 
                 throw new InvalidClassException("Unexpected deserialization ", desc.getName());
     67   
             }
     68  6 
             return super.resolveClass(desc);
    @@ -152,6 +152,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 6324833ef..aea48e744 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 6e61cc7e6..029b17fc8 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.FileUtils.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.FileUtils.html @@ -222,6 +222,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 627c973a2..4ca6c6c0e 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 a435fe7ed..b294261ea 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Settings.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.Settings.html @@ -12,8 +12,8 @@
     
    - - + +
    Classes in this File Line Coverage Branch Coverage Complexity
    Settings
    44%
    78/175
    35%
    22/62
    		2.667
    Settings$KEYS
    0%
    0/2
    N/A
    N/A
    		2.667
    Settings
    47%
    84/176
    35%
    23/64
    		2.697
    Settings$KEYS
    0%
    0/2
    N/A
    N/A
    		2.697
     
    @@ -865,9 +865,9 @@ 
          */
     454   
         public static void setString(String key, String value) {
    -  455  7 
             localSettings.get().props.setProperty(key, value);
    -  456  7 
             LOGGER.debug("Setting: {}='{}'", key, value);
    -  457  7 
         }
    +  455  8 
             localSettings.get().props.setProperty(key, value);
    +  456  8 
             LOGGER.debug("Setting: {}='{}'", key, value);
    +  457  8 
         }
     458   
     
     459   @@ -1224,8 +1224,8 @@ 
          */
     667   
         public static String getString(String key, String defaultValue) {
    -  668  5 
             final String str = System.getProperty(key, localSettings.get().props.getProperty(key, defaultValue));
    -  669  5 
             return str;
    +  668  6 
             final String str = System.getProperty(key, localSettings.get().props.getProperty(key, defaultValue));
    +  669  6 
             return str;
     670   
         }
     671   @@ -1283,7 +1283,7 @@ 
          */
     701   
         public static String getString(String key) {
    -  702  17 
             return System.getProperty(key, localSettings.get().props.getProperty(key));
    +  702  19 
             return System.getProperty(key, localSettings.get().props.getProperty(key));
     703   
         }
     704   @@ -1361,190 +1361,193 @@ 
             int value;
     743   
             try {
    -  744  0 
                 value = Integer.parseInt(Settings.getString(key));
    -  745  0 
             } catch (NumberFormatException ex) {
    -  746  0 
                 LOGGER.trace("Could not convert property '{}' to an int.", key, ex);
    -  747  0 
                 value = defaultValue;
    -  748  0 
             }
    -  749  0 
             return value;
    -  750   - 
         }
    -  751   - 
     
    +  744  1 
                 value = Integer.parseInt(Settings.getString(key));
    +  745  1 
             } catch (NumberFormatException ex) {
    +  746  1 
                 if (!Settings.getString(key, "").isEmpty()) {
    +  747  1 
                     LOGGER.debug("Could not convert property '{}={}' to an int; using {} instead.", key, Settings.getString(key), defaultValue);
    +  748   + 
                 }
    +  749  1 
                 value = defaultValue;
    +  750  0 
             }
    +  751  1 
             return value;
     752   - 
         /**
    + 
         }
     753   - 
          * Returns a long value from the properties file. If the value was specified as a system property or passed in via the
    + 
     
     754   - 
          * -Dprop=value argument - this method will return the value from the system properties before the values in the contained
    + 
         /**
     755   - 
          * configuration file.
    + 
          * Returns a long value from the properties file. If the value was specified as a system property or passed in via the
     756   - 
          *
    + 
          * -Dprop=value argument - this method will return the value from the system properties before the values in the contained
     757   - 
          * @param key the key to lookup within the properties file
    + 
          * configuration file.
     758   - 
          * @return the property from the properties file
    + 
          *
     759   - 
          * @throws InvalidSettingException is thrown if there is an error retrieving the setting
    + 
          * @param key the key to lookup within the properties file
     760   - 
          */
    + 
          * @return the property from the properties file
     761   - 
         public static long getLong(String key) throws InvalidSettingException {
    + 
          * @throws InvalidSettingException is thrown if there is an error retrieving the setting
     762   + 
          */
    +  763   + 
         public static long getLong(String key) throws InvalidSettingException {
    +  764   
             try {
    -  763  1 
                 return Long.parseLong(Settings.getString(key));
    -  764  0 
             } catch (NumberFormatException ex) {
    -  765  0 
                 throw new InvalidSettingException("Could not convert property '" + key + "' to a long.", ex);
    -  766   - 
             }
    -  767   - 
         }
    +  765  1 
                 return Long.parseLong(Settings.getString(key));
    +  766  0 
             } catch (NumberFormatException ex) {
    +  767  0 
                 throw new InvalidSettingException("Could not convert property '" + key + "' to a long.", ex);
     768   - 
     
    + 
             }
     769   - 
         /**
    + 
         }
     770   - 
          * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the
    + 
     
     771   - 
          * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the
    + 
         /**
     772   - 
          * contained configuration file.
    -  773   - 
          *
    -  774   - 
          * @param key the key to lookup within the properties file
    -  775   - 
          * @return the property from the properties file
    -  776   - 
          * @throws InvalidSettingException is thrown if there is an error retrieving the setting
    -  777   - 
          */
    -  778   - 
         public static boolean getBoolean(String key) throws InvalidSettingException {
    -  779  1 
             return Boolean.parseBoolean(Settings.getString(key));
    -  780   - 
         }
    -  781   - 
     
    -  782   - 
         /**
    -  783   
          * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the
    -  784   +  773   
          * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the
    -  785   +  774   
          * contained configuration file.
    -  786   +  775   
          *
    -  787   +  776   
          * @param key the key to lookup within the properties file
    -  788   - 
          * @param defaultValue the default value to return if the setting does not exist
    -  789   +  777   
          * @return the property from the properties file
    -  790   +  778   
          * @throws InvalidSettingException is thrown if there is an error retrieving the setting
    +  779   + 
          */
    +  780   + 
         public static boolean getBoolean(String key) throws InvalidSettingException {
    +  781  1 
             return Boolean.parseBoolean(Settings.getString(key));
    +  782   + 
         }
    +  783   + 
     
    +  784   + 
         /**
    +  785   + 
          * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the
    +  786   + 
          * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the
    +  787   + 
          * contained configuration file.
    +  788   + 
          *
    +  789   + 
          * @param key the key to lookup within the properties file
    +  790   + 
          * @param defaultValue the default value to return if the setting does not exist
     791   - 
          */
    + 
          * @return the property from the properties file
     792   - 
         public static boolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException {
    -  793  1 
             return Boolean.parseBoolean(Settings.getString(key, Boolean.toString(defaultValue)));
    + 
          * @throws InvalidSettingException is thrown if there is an error retrieving the setting
    +  793   + 
          */
     794   - 
         }
    -  795   - 
     
    + 
         public static boolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException {
    +  795  1 
             return Boolean.parseBoolean(Settings.getString(key, Boolean.toString(defaultValue)));
     796   - 
         /**
    + 
         }
     797   - 
          * Returns a connection string from the configured properties. If the connection string contains a %s, this method will
    -  798   - 
          * determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not
    -  799   - 
          * exists it will be created.
    -  800   - 
          *
    -  801   - 
          * @param connectionStringKey the property file key for the connection string
    -  802   - 
          * @param dbFileNameKey the settings key for the db filename
    -  803   - 
          * @return the connection string
    -  804   - 
          * @throws IOException thrown the data directory cannot be created
    -  805   - 
          * @throws InvalidSettingException thrown if there is an invalid setting
    -  806   - 
          */
    -  807   - 
         public static String getConnectionString(String connectionStringKey, String dbFileNameKey)
    -  808   - 
                 throws IOException, InvalidSettingException {
    -  809  2 
             final String connStr = Settings.getString(connectionStringKey);
    -  810  2 
             if (connStr == null) {
    -  811  1 
                 final String msg = String.format("Invalid properties file; %s is missing.", connectionStringKey);
    -  812  1 
                 throw new InvalidSettingException(msg);
    -  813   - 
             }
    -  814  1 
             if (connStr.contains("%s")) {
    -  815  1 
                 final File directory = getDataDirectory();
    -  816  1 
                 String fileName = null;
    -  817  1 
                 if (dbFileNameKey != null) {
    -  818  1 
                     fileName = Settings.getString(dbFileNameKey);
    -  819   - 
                 }
    -  820  1 
                 if (fileName == null) {
    -  821  0 
                     final String msg = String.format("Invalid properties file to get a file based connection string; '%s' must be defined.",
    -  822   - 
                             dbFileNameKey);
    -  823  0 
                     throw new InvalidSettingException(msg);
    -  824   - 
                 }
    -  825  1 
                 if (connStr.startsWith("jdbc:h2:file:") && fileName.endsWith(".h2.db")) {
    -  826  1 
                     fileName = fileName.substring(0, fileName.length() - 6);
    -  827   - 
                 }
    -  828   - 
                 // yes, for H2 this path won't actually exists - but this is sufficient to get the value needed
    -  829  1 
                 final File dbFile = new File(directory, fileName);
    -  830  1 
                 final String cString = String.format(connStr, dbFile.getCanonicalPath());
    -  831  1 
                 LOGGER.debug("Connection String: '{}'", cString);
    -  832  1 
                 return cString;
    -  833   - 
             }
    -  834  0 
             return connStr;
    -  835   - 
         }
    -  836   
     
    -  837   +  798   
         /**
    -  838   - 
          * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the
    -  839   - 
          * embedded H2 database. This is public solely for some unit tests; otherwise this should be private.
    -  840   +  799   + 
          * Returns a connection string from the configured properties. If the connection string contains a %s, this method will
    +  800   + 
          * determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not
    +  801   + 
          * exists it will be created.
    +  802   
          *
    -  841   - 
          * @return the data directory to store data files
    -  842   - 
          * @throws IOException is thrown if an IOException occurs of course...
    -  843   +  803   + 
          * @param connectionStringKey the property file key for the connection string
    +  804   + 
          * @param dbFileNameKey the settings key for the db filename
    +  805   + 
          * @return the connection string
    +  806   + 
          * @throws IOException thrown the data directory cannot be created
    +  807   + 
          * @throws InvalidSettingException thrown if there is an invalid setting
    +  808   
          */
    -  844   - 
         public static File getDataDirectory() throws IOException {
    -  845  1 
             final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);
    -  846  1 
             if (path.exists() || path.mkdirs()) {
    -  847  1 
                 return path;
    -  848   +  809   + 
         public static String getConnectionString(String connectionStringKey, String dbFileNameKey)
    +  810   + 
                 throws IOException, InvalidSettingException {
    +  811  2 
             final String connStr = Settings.getString(connectionStringKey);
    +  812  2 
             if (connStr == null) {
    +  813  1 
                 final String msg = String.format("Invalid properties file; %s is missing.", connectionStringKey);
    +  814  1 
                 throw new InvalidSettingException(msg);
    +  815   
             }
    -  849  0 
             throw new IOException(String.format("Unable to create the data directory '%s'", path.getAbsolutePath()));
    -  850   +  816  1 
             if (connStr.contains("%s")) {
    +  817  1 
                 final File directory = getDataDirectory();
    +  818  1 
                 String fileName = null;
    +  819  1 
                 if (dbFileNameKey != null) {
    +  820  1 
                     fileName = Settings.getString(dbFileNameKey);
    +  821   + 
                 }
    +  822  1 
                 if (fileName == null) {
    +  823  0 
                     final String msg = String.format("Invalid properties file to get a file based connection string; '%s' must be defined.",
    +  824   + 
                             dbFileNameKey);
    +  825  0 
                     throw new InvalidSettingException(msg);
    +  826   + 
                 }
    +  827  1 
                 if (connStr.startsWith("jdbc:h2:file:") && fileName.endsWith(".h2.db")) {
    +  828  1 
                     fileName = fileName.substring(0, fileName.length() - 6);
    +  829   + 
                 }
    +  830   + 
                 // yes, for H2 this path won't actually exists - but this is sufficient to get the value needed
    +  831  1 
                 final File dbFile = new File(directory, fileName);
    +  832  1 
                 final String cString = String.format(connStr, dbFile.getCanonicalPath());
    +  833  1 
                 LOGGER.debug("Connection String: '{}'", cString);
    +  834  1 
                 return cString;
    +  835   + 
             }
    +  836  0 
             return connStr;
    +  837   
         }
    -  851   +  838   + 
     
    +  839   + 
         /**
    +  840   + 
          * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the
    +  841   + 
          * embedded H2 database. This is public solely for some unit tests; otherwise this should be private.
    +  842   + 
          *
    +  843   + 
          * @return the data directory to store data files
    +  844   + 
          * @throws IOException is thrown if an IOException occurs of course...
    +  845   + 
          */
    +  846   + 
         public static File getDataDirectory() throws IOException {
    +  847  1 
             final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);
    +  848  1 
             if (path.exists() || path.mkdirs()) {
    +  849  1 
                 return path;
    +  850   + 
             }
    +  851  0 
             throw new IOException(String.format("Unable to create the data directory '%s'", path.getAbsolutePath()));
    +  852   + 
         }
    +  853   
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 856e9edba..3dff6e5f2 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFactory.html @@ -292,6 +292,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    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 860ba905c..02acfe045 100644 --- a/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html +++ b/dependency-check-utils/cobertura/org.owasp.dependencycheck.utils.URLConnectionFailureException.html @@ -147,6 +147,6 @@ 
     }
    -
    Report generated by Cobertura 2.1.1 on 3/5/16 1:21 PM.
    +
    Report generated by Cobertura 2.1.1 on 4/9/16 8:05 PM.
    diff --git a/dependency-check-utils/dependency-analysis.html b/dependency-check-utils/dependency-analysis.html index 8616a5726..1f539f023 100644 --- a/dependency-check-utils/dependency-analysis.html +++ b/dependency-check-utils/dependency-analysis.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Dependencies Report @@ -52,7 +52,7 @@ @@ -243,7 +243,7 @@ org.slf4j slf4j-api -1.7.16 +1.7.21 compile jar @@ -281,7 +281,7 @@ ch.qos.logback logback-core -1.1.5 +1.1.7 test jar @@ -289,7 +289,7 @@ ch.qos.logback logback-classic -1.1.5 +1.1.7 test jar diff --git a/dependency-check-utils/dependency-updates-report.html b/dependency-check-utils/dependency-updates-report.html index 17cd211f2..539a824cd 100644 --- a/dependency-check-utils/dependency-updates-report.html +++ b/dependency-check-utils/dependency-updates-report.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Dependency Updates Report @@ -52,7 +52,7 @@ @@ -218,7 +218,7 @@ # of dependencies using the latest version available -16 +21 # of dependencies where the next version available is smaller than an incremental version update @@ -226,15 +226,15 @@ # of dependencies where the next version available is an incremental version update -7 +3 # of dependencies where the next version available is a minor version update -8 +6 # of dependencies where the next version available is a major version update -0 +1

    Dependency Management

    @@ -251,27 +251,27 @@ - + - + - + - + - + - + @@ -323,6 +323,18 @@ + + + + + + + + + + + + @@ -334,7 +346,7 @@ - + @@ -346,7 +358,7 @@ - + @@ -358,7 +370,7 @@ - + @@ -370,11 +382,11 @@ - + - + @@ -382,7 +394,7 @@ - + @@ -394,7 +406,7 @@ - + @@ -406,7 +418,7 @@ - + @@ -418,7 +430,7 @@ - + @@ -430,7 +442,7 @@ - + @@ -442,7 +454,7 @@ - + @@ -454,7 +466,7 @@ - + @@ -466,7 +478,7 @@ - + @@ -478,7 +490,7 @@ - + @@ -490,7 +502,7 @@ - + @@ -502,18 +514,6 @@ - - - - - - - - - - - - @@ -563,16 +563,16 @@ - + - + - + @@ -587,27 +587,27 @@ - + - + - + - + - + - + @@ -645,7 +645,7 @@
    Next Minor Next Major
    ch.qos.logback logback-classic1.1.51.1.7 jar 1.1.6
    ch.qos.logback logback-core1.1.51.1.7 jar 1.1.6
    commons-collectionscommons-collections3.2.2jar20030418.083655
    commons-io commons-io
    junit junit
    org.apache.ant ant
    org.apache.ant ant-testutil
    org.apache.commons commons-compress1.101.11 jar
    org.apache.commons commons-lang3 3.4
    org.apache.lucene lucene-analyzers-common 4.8.0 5.0.0
    org.apache.lucene lucene-core 4.8.0 5.0.0
    org.apache.lucene lucene-queryparser 4.8.0 5.0.0
    org.apache.lucene lucene-test-framework 4.8.0 5.0.0
    org.apache.maven maven-core3.3.9
    org.apache.maven maven-plugin-api3.3.9
    org.apache.maven maven-settings3.3.9
    org.apache.maven.plugin-testing maven-plugin-testing-harness
    org.apache.maven.plugin-tools maven-plugin-annotations
    org.apache.maven.pluginsmaven-site-plugin3.4jar3.5
    org.apache.maven.reporting
    org.jmockit jmockit1.211.22 test jar 1.22
    org.slf4j slf4j-api1.7.161.7.21 jar 1.7.18
    org.slf4j slf4j-simple1.7.161.7.21 jar 1.7.18
    - + @@ -654,7 +654,7 @@ - + @@ -663,16 +663,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-classic
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    ch.qos.logback:logback-core

    - + @@ -681,7 +678,7 @@ - + @@ -690,10 +687,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-core
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    com.google.code.findbugs:annotations

    @@ -794,6 +788,33 @@
    Type jar
    +

    commons-collections:commons-collections

    + + + + + + + + + + + + + + + + + + + + + + + + +
    Status There is at least one newer major version available. Major updates are rarely passive.
    Group Idcommons-collections
    Artifact Idcommons-collections
    Current Version3.2.2
    Scope
    Classifier
    Typejar
    Newer versions20030418.083655 Next Major
    20031027.000000
    20040102.233541
    20040616 Latest Major
    +

    commons-io:commons-io

    @@ -903,7 +924,7 @@ - + @@ -966,7 +987,7 @@ -
    commons-compress
    Current Version1.10
    1.11
    Scope
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-core

    @@ -993,7 +1014,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-queryparser

    @@ -1020,7 +1041,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-test-framework

    @@ -1047,7 +1068,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.maven:maven-core

    @@ -1178,33 +1199,6 @@
    Type jar
    -

    org.apache.maven.plugins:maven-site-plugin

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Idorg.apache.maven.plugins
    Artifact Idmaven-site-plugin
    Current Version3.4
    Scope
    Classifier
    Typejar
    Newer versions3.5 Next Minor
    -

    org.apache.maven.reporting:maven-reporting-api

    @@ -1305,7 +1299,7 @@
    - + @@ -1314,7 +1308,7 @@ - + @@ -1323,10 +1317,7 @@ - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
     No newer versions available.
    Group Id org.jmockit
    jmockit
    Current Version1.21
    1.22
    Scope test
    Typejar
    Newer versions1.22 Next Minor
    +jar

    org.jsoup:jsoup

    @@ -1356,7 +1347,7 @@
    - + @@ -1365,7 +1356,7 @@ - + @@ -1374,16 +1365,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-api
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.slf4j:slf4j-simple

    - + @@ -1392,7 +1380,7 @@ - + @@ -1401,10 +1389,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-simple
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.sonatype.plexus:plexus-sec-dispatcher

    diff --git a/dependency-check-utils/findbugs.html b/dependency-check-utils/findbugs.html index 477720ecb..aa435db5d 100644 --- a/dependency-check-utils/findbugs.html +++ b/dependency-check-utils/findbugs.html @@ -1,13 +1,13 @@ - + dependency-check-ant – FindBugs Bug Detector Report @@ -52,7 +52,7 @@ diff --git a/dependency-check-utils/index.html b/dependency-check-utils/index.html index 02a85e340..597852297 100644 --- a/dependency-check-utils/index.html +++ b/dependency-check-utils/index.html @@ -1,13 +1,13 @@ - + dependency-check-ant – About @@ -52,7 +52,7 @@ diff --git a/dependency-check-utils/integration.html b/dependency-check-utils/integration.html index c2be51563..a054b5cb0 100644 --- a/dependency-check-utils/integration.html +++ b/dependency-check-utils/integration.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Continuous Integration + dependency-check-ant – CI Management @@ -52,7 +52,7 @@ @@ -89,14 +89,14 @@
  • - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -108,30 +108,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-utils/issue-tracking.html b/dependency-check-utils/issue-tracking.html index 8c2e4a386..7007d4e03 100644 --- a/dependency-check-utils/issue-tracking.html +++ b/dependency-check-utils/issue-tracking.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Issue Tracking + dependency-check-ant – Issue Management @@ -52,7 +52,7 @@ @@ -89,16 +89,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -110,28 +110,28 @@
  • - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -187,8 +187,8 @@

    Overview

    This project uses github to manage its issues.

    -

    Issue Tracking

    -

    Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.

    +

    Issue Management

    +

    Issues, bugs, and feature requests should be submitted to the following issue management system for this project.

    https://github.com/jeremylong/DependencyCheck/issues
    diff --git a/dependency-check-utils/license.html b/dependency-check-utils/license.html index 7c1d67dc9..0c747f420 100644 --- a/dependency-check-utils/license.html +++ b/dependency-check-utils/license.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Project License + dependency-check-ant – Project Licenses @@ -52,7 +52,7 @@ @@ -89,16 +89,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -110,28 +110,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - Project License + Licenses
    • @@ -182,15 +182,15 @@
    -
    + +

    Overview

    Typically the licenses listed for the project are that of the project itself, and not of dependencies.

    -

    Project License

    +

    Project Licenses

    The Apache Software License, Version 2.0

    -
    -
    +
                                      Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/dependency-check-utils/mail-lists.html b/dependency-check-utils/mail-lists.html
index 19b06e62a..346474cf8 100644
--- a/dependency-check-utils/mail-lists.html
+++ b/dependency-check-utils/mail-lists.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-ant – Project Mailing Lists
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Project Mailing Lists
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -89,16 +89,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -108,30 +108,30 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
diff --git a/dependency-check-utils/plugin-updates-report.html b/dependency-check-utils/plugin-updates-report.html
index 485981c14..1b6100514 100644
--- a/dependency-check-utils/plugin-updates-report.html
+++ b/dependency-check-utils/plugin-updates-report.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-ant – Plugin Updates Report
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Plugin Updates Report
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
diff --git a/dependency-check-utils/project-info.html b/dependency-check-utils/project-info.html
index 52351a223..cf96b37b9 100644
--- a/dependency-check-utils/project-info.html
+++ b/dependency-check-utils/project-info.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check-ant – Project Information
     
@@ -52,7 +52,7 @@
         
      
               
                               
    • 
-                    
+                    
         
                     /
       
      • 
@@ -64,9 +64,9 @@
         
    • Project Information
      • 
         
               
-                  
    • | Last Published: 2016-03-05
      • 
+                  
    • | Last Published: 2016-04-09
      • 
               
    • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
      • 
             
                             
    
@@ -87,16 +87,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -108,30 +108,30 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
@@ -193,25 +193,25 @@
    - + - + - + - + - + - +
    Document Description
    Continuous IntegrationCI Management This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
    Project SummarySummary This document lists other related information of this project
    Mailing Lists This document provides subscription and archive information for this project's mailing lists.
    Issue TrackingIssue Management This document provides information on the issue management system used in this project.
    Project TeamTeam This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
    Source RepositorySource Code Management This document lists ways to access the online source repository.
    Project LicenseLicenses This document lists the project license(s).
    diff --git a/dependency-check-utils/project-reports.html b/dependency-check-utils/project-reports.html index 62d186437..9330bf07f 100644 --- a/dependency-check-utils/project-reports.html +++ b/dependency-check-utils/project-reports.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Generated Reports @@ -52,7 +52,7 @@ diff --git a/dependency-check-utils/project-summary.html b/dependency-check-utils/project-summary.html index 0b5e237a8..a788242bc 100644 --- a/dependency-check-utils/project-summary.html +++ b/dependency-check-utils/project-summary.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Project Summary @@ -52,7 +52,7 @@ @@ -89,14 +89,14 @@
  • - + - Continuous Integration + CI Management
  • - Project Summary + Summary
  • @@ -108,30 +108,30 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -226,7 +226,7 @@ dependency-check-utils Version -1.3.5 +1.3.6 Type jar diff --git a/dependency-check-utils/source-repository.html b/dependency-check-utils/source-repository.html index 0d6c225dc..35af5d0f7 100644 --- a/dependency-check-utils/source-repository.html +++ b/dependency-check-utils/source-repository.html @@ -1,15 +1,15 @@ - + - dependency-check-ant – Source Repository + dependency-check-ant – Source Code Management @@ -52,7 +52,7 @@ @@ -89,16 +89,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -110,28 +110,28 @@
  • - + - Issue Tracking + Issue Management
  • - + - Project Team + Team
  • - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/dependency-check-utils/surefire-report.html b/dependency-check-utils/surefire-report.html index 0c1ef2c3c..73fd4fbfa 100644 --- a/dependency-check-utils/surefire-report.html +++ b/dependency-check-utils/surefire-report.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Surefire Report @@ -52,7 +52,7 @@ @@ -242,12 +242,12 @@ function toggleDisplay(elementId) { Success Rate Time -25 +26 0 0 0 100% -0.704
    +0.616

    Note: failures are anticipated and checked for with assertions while errors are unanticipated.


    Package List

    @@ -263,12 +263,12 @@ function toggleDisplay(elementId) { Time org.owasp.dependencycheck.utils -25 +26 0 0 0 100% -0.704
    +0.616

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

    org.owasp.dependencycheck.utils

    @@ -290,7 +290,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.607 +0.539 DownloaderTest @@ -308,7 +308,7 @@ function toggleDisplay(elementId) { 0 0 100% -0 +0.005 FileUtilsTest @@ -317,16 +317,16 @@ function toggleDisplay(elementId) { 0 0 100% -0.095 +0.071 SettingsTest -14 +15 0 0 0 100% -0.001

    +0

    Test Cases

    [Summary] [Package List] [Test Cases]

    @@ -336,15 +336,15 @@ function toggleDisplay(elementId) { testGetChecksum_NoSuchAlgorithm -0.506 +0.456 testGetChecksum -0.007 +0.006 testGetMD5Checksum -0.001 +0 testGetChecksum_FileNotFound @@ -356,7 +356,7 @@ function toggleDisplay(elementId) { testGetSHA1Checksum -0.001
    +0.002

    DownloaderTest

    @@ -381,18 +381,18 @@ function toggleDisplay(elementId) { - + -
    testGetFileExtension0.002
    0
    testDelete0.092
    +0.07

    SettingsTest

    - + @@ -415,33 +415,37 @@ function toggleDisplay(elementId) { - + + + + + - + - + - + - + - + - +
    testSetStringIfNotNull0.001
    0
    testSetStringIfNotEmpty0
    testRemovePropertytestGetIntDefault 0
    testRemoveProperty0
    testGetTempDirectory 0
    testSetString 0
    testGetInt 0
    testGetString_String 0
    testGetString 0
    testGetConnectionString 0
    testGetString_String_String 0

    diff --git a/dependency-check-utils/taglist.html b/dependency-check-utils/taglist.html index 01fe535c4..df1a65e0b 100644 --- a/dependency-check-utils/taglist.html +++ b/dependency-check-utils/taglist.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Tag List report @@ -52,7 +52,7 @@ diff --git a/dependency-check-utils/team-list.html b/dependency-check-utils/team-list.html index a6e692f74..7fa192808 100644 --- a/dependency-check-utils/team-list.html +++ b/dependency-check-utils/team-list.html @@ -1,13 +1,13 @@ - + dependency-check-ant – Project Team @@ -52,7 +52,7 @@ @@ -89,16 +89,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -110,28 +110,28 @@
  • - + - Issue Tracking + Issue Management
  • - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -184,9 +184,9 @@
    -

    The Team

    +

    Project Team

    A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.

    -

    The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    +

    The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    Members

    The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.

    diff --git a/dependency-check-utils/xref-test/index.html b/dependency-check-utils/xref-test/index.html index 2b84b7efa..cde2313bf 100644 --- a/dependency-check-utils/xref-test/index.html +++ b/dependency-check-utils/xref-test/index.html @@ -4,7 +4,7 @@ - Dependency-Check Utils 1.3.5 Reference + Dependency-Check Utils 1.3.6 Reference diff --git a/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html b/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html index 585a9af61..f28d3523b 100644 --- a/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html +++ b/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html @@ -148,75 +148,87 @@ 140 } 141 142 /** -143 * Test of getLong method, of class Settings. +143 * Test of getInt method, of class Settings. 144 */ 145 @Test -146 public void testGetLong() throws InvalidSettingException { -147 String key = "SomeNumber"; -148 long expResult = 300L; -149 Settings.setString(key, "300"); -150 long result = Settings.getLong(key); +146 public void testGetIntDefault() throws InvalidSettingException { +147 String key = "SomeKey"; +148 int expResult = 85; +149 Settings.setString(key, "blue"); +150 int result = Settings.getInt(key, expResult); 151 Assert.assertEquals(expResult, result); 152 } 153 154 /** -155 * Test of getBoolean method, of class Settings. +155 * Test of getLong method, of class Settings. 156 */ 157 @Test -158 public void testGetBoolean() throws InvalidSettingException { -159 String key = "SomeBoolean"; -160 Settings.setString(key, "false"); -161 boolean expResult = false; -162 boolean result = Settings.getBoolean(key); +158 public void testGetLong() throws InvalidSettingException { +159 String key = "SomeNumber"; +160 long expResult = 300L; +161 Settings.setString(key, "300"); +162 long result = Settings.getLong(key); 163 Assert.assertEquals(expResult, result); -164 -165 key = "something that does not exist"; -166 expResult = true; -167 result = Settings.getBoolean(key, true); -168 Assert.assertEquals(expResult, result); -169 } -170 -171 /** -172 * Test of removeProperty method, of class Settings. -173 */ -174 @Test -175 public void testRemoveProperty() { -176 String key = "SomeKey"; -177 String value = "value"; -178 String dfault = "default"; -179 Settings.setString(key, value); -180 String ret = Settings.getString(key); -181 Assert.assertEquals(value, ret); -182 Settings.removeProperty(key); -183 ret = Settings.getString(key, dfault); -184 Assert.assertEquals(dfault, ret); -185 } -186 -187 /** -188 * Test of getConnectionString. -189 */ -190 @Test -191 public void testGetConnectionString() throws Exception { -192 String value = Settings.getConnectionString(Settings.KEYS.DB_CONNECTION_STRING, Settings.KEYS.DB_FILE_NAME); -193 Assert.assertNotNull(value); -194 String msg = null; -195 try { -196 value = Settings.getConnectionString("invalidKey", null); -197 } catch (InvalidSettingException e) { -198 msg = e.getMessage(); -199 } -200 Assert.assertNotNull(msg); -201 } -202 -203 /** -204 * Test of getTempDirectory. -205 */ -206 @Test -207 public void testGetTempDirectory() throws Exception { -208 File tmp = Settings.getTempDirectory(); -209 Assert.assertTrue(tmp.exists()); -210 } -211 } +164 } +165 +166 /** +167 * Test of getBoolean method, of class Settings. +168 */ +169 @Test +170 public void testGetBoolean() throws InvalidSettingException { +171 String key = "SomeBoolean"; +172 Settings.setString(key, "false"); +173 boolean expResult = false; +174 boolean result = Settings.getBoolean(key); +175 Assert.assertEquals(expResult, result); +176 +177 key = "something that does not exist"; +178 expResult = true; +179 result = Settings.getBoolean(key, true); +180 Assert.assertEquals(expResult, result); +181 } +182 +183 /** +184 * Test of removeProperty method, of class Settings. +185 */ +186 @Test +187 public void testRemoveProperty() { +188 String key = "SomeKey"; +189 String value = "value"; +190 String dfault = "default"; +191 Settings.setString(key, value); +192 String ret = Settings.getString(key); +193 Assert.assertEquals(value, ret); +194 Settings.removeProperty(key); +195 ret = Settings.getString(key, dfault); +196 Assert.assertEquals(dfault, ret); +197 } +198 +199 /** +200 * Test of getConnectionString. +201 */ +202 @Test +203 public void testGetConnectionString() throws Exception { +204 String value = Settings.getConnectionString(Settings.KEYS.DB_CONNECTION_STRING, Settings.KEYS.DB_FILE_NAME); +205 Assert.assertNotNull(value); +206 String msg = null; +207 try { +208 value = Settings.getConnectionString("invalidKey", null); +209 } catch (InvalidSettingException e) { +210 msg = e.getMessage(); +211 } +212 Assert.assertNotNull(msg); +213 } +214 +215 /** +216 * Test of getTempDirectory. +217 */ +218 @Test +219 public void testGetTempDirectory() throws Exception { +220 File tmp = Settings.getTempDirectory(); +221 Assert.assertTrue(tmp.exists()); +222 } +223 }
    diff --git a/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-frame.html b/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-frame.html index 464190fa5..7437a6817 100644 --- a/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-frame.html +++ b/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Utils 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-summary.html b/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-summary.html index c6f2af552..d6d86b9d1 100644 --- a/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-summary.html +++ b/dependency-check-utils/xref-test/org/owasp/dependencycheck/utils/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Utils 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-utils/xref-test/overview-frame.html b/dependency-check-utils/xref-test/overview-frame.html index 9c3642b09..7f5f75f75 100644 --- a/dependency-check-utils/xref-test/overview-frame.html +++ b/dependency-check-utils/xref-test/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference + Dependency-Check Utils 1.3.6 Reference diff --git a/dependency-check-utils/xref-test/overview-summary.html b/dependency-check-utils/xref-test/overview-summary.html index 9e2c76ce4..9d7f20b53 100644 --- a/dependency-check-utils/xref-test/overview-summary.html +++ b/dependency-check-utils/xref-test/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference + Dependency-Check Utils 1.3.6 Reference @@ -24,7 +24,7 @@
    -

    Dependency-Check Utils 1.3.5 Reference

    +

    Dependency-Check Utils 1.3.6 Reference

    diff --git a/dependency-check-utils/xref/index.html b/dependency-check-utils/xref/index.html index 2b84b7efa..cde2313bf 100644 --- a/dependency-check-utils/xref/index.html +++ b/dependency-check-utils/xref/index.html @@ -4,7 +4,7 @@ - Dependency-Check Utils 1.3.5 Reference + Dependency-Check Utils 1.3.6 Reference diff --git a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html index 1c13c32ad..f51e1a679 100644 --- a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html +++ b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html @@ -71,7 +71,7 @@ 63 @Override 64protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { 65if (!this.expected.contains(desc.getName())) { -66thrownew InvalidClassException("Unexpected deserialization", desc.getName()); +66thrownew InvalidClassException("Unexpected deserialization ", desc.getName()); 67 } 68returnsuper.resolveClass(desc); 69 } diff --git a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/Settings.html b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/Settings.html index 77f40dc32..7d94000a1 100644 --- a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/Settings.html +++ b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/Settings.html @@ -751,112 +751,114 @@ 743try { 744 value = Integer.parseInt(Settings.getString(key)); 745 } catch (NumberFormatException ex) { -746 LOGGER.trace("Could not convert property '{}' to an int.", key, ex); -747 value = defaultValue; -748 } -749return value; -750 } -751 -752/** -753 * Returns a long value from the properties file. If the value was specified as a system property or passed in via the -754 * -Dprop=value argument - this method will return the value from the system properties before the values in the contained -755 * configuration file. -756 * -757 * @param key the key to lookup within the properties file -758 * @return the property from the properties file -759 * @throws InvalidSettingException is thrown if there is an error retrieving the setting -760 */ -761publicstaticlong getLong(String key) throws InvalidSettingException { -762try { -763return Long.parseLong(Settings.getString(key)); -764 } catch (NumberFormatException ex) { -765thrownewInvalidSettingException("Could not convert property '" + key + "' to a long.", ex); -766 } -767 } -768 -769/** -770 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the -771 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the -772 * contained configuration file. -773 * -774 * @param key the key to lookup within the properties file -775 * @return the property from the properties file -776 * @throws InvalidSettingException is thrown if there is an error retrieving the setting -777 */ -778publicstaticboolean getBoolean(String key) throws InvalidSettingException { -779return Boolean.parseBoolean(Settings.getString(key)); -780 } -781 -782/** -783 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the -784 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the -785 * contained configuration file. -786 * -787 * @param key the key to lookup within the properties file -788 * @param defaultValue the default value to return if the setting does not exist -789 * @return the property from the properties file -790 * @throws InvalidSettingException is thrown if there is an error retrieving the setting -791 */ -792publicstaticboolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException { -793return Boolean.parseBoolean(Settings.getString(key, Boolean.toString(defaultValue))); -794 } -795 -796/** -797 * Returns a connection string from the configured properties. If the connection string contains a %s, this method will -798 * determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not -799 * exists it will be created. -800 * -801 * @param connectionStringKey the property file key for the connection string -802 * @param dbFileNameKey the settings key for the db filename -803 * @return the connection string -804 * @throws IOException thrown the data directory cannot be created -805 * @throws InvalidSettingException thrown if there is an invalid setting -806 */ -807publicstatic String getConnectionString(String connectionStringKey, String dbFileNameKey) -808throws IOException, InvalidSettingException { -809final String connStr = Settings.getString(connectionStringKey); -810if (connStr == null) { -811final String msg = String.format("Invalid properties file; %s is missing.", connectionStringKey); -812thrownewInvalidSettingException(msg); -813 } -814if (connStr.contains("%s")) { -815final File directory = getDataDirectory(); -816 String fileName = null; -817if (dbFileNameKey != null) { -818 fileName = Settings.getString(dbFileNameKey); -819 } -820if (fileName == null) { -821final String msg = String.format("Invalid properties file to get a file based connection string; '%s' must be defined.", -822 dbFileNameKey); -823thrownewInvalidSettingException(msg); -824 } -825if (connStr.startsWith("jdbc:h2:file:") && fileName.endsWith(".h2.db")) { -826 fileName = fileName.substring(0, fileName.length() - 6); -827 } -828// yes, for H2 this path won't actually exists - but this is sufficient to get the value needed -829final File dbFile = new File(directory, fileName); -830final String cString = String.format(connStr, dbFile.getCanonicalPath()); -831 LOGGER.debug("Connection String: '{}'", cString); -832return cString; -833 } -834return connStr; -835 } -836 -837/** -838 * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the -839 * embedded H2 database. This is public solely for some unit tests; otherwise this should be private. -840 * -841 * @return the data directory to store data files -842 * @throws IOException is thrown if an IOException occurs of course... -843 */ -844publicstatic File getDataDirectory() throws IOException { -845final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY); -846if (path.exists() || path.mkdirs()) { -847return path; -848 } -849thrownew IOException(String.format("Unable to create the data directory '%s'", path.getAbsolutePath())); -850 } -851 } +746if (!Settings.getString(key, "").isEmpty()) { +747 LOGGER.debug("Could not convert property '{}={}' to an int; using {} instead.", key, Settings.getString(key), defaultValue); +748 } +749 value = defaultValue; +750 } +751return value; +752 } +753 +754/** +755 * Returns a long value from the properties file. If the value was specified as a system property or passed in via the +756 * -Dprop=value argument - this method will return the value from the system properties before the values in the contained +757 * configuration file. +758 * +759 * @param key the key to lookup within the properties file +760 * @return the property from the properties file +761 * @throws InvalidSettingException is thrown if there is an error retrieving the setting +762 */ +763publicstaticlong getLong(String key) throws InvalidSettingException { +764try { +765return Long.parseLong(Settings.getString(key)); +766 } catch (NumberFormatException ex) { +767thrownewInvalidSettingException("Could not convert property '" + key + "' to a long.", ex); +768 } +769 } +770 +771/** +772 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the +773 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the +774 * contained configuration file. +775 * +776 * @param key the key to lookup within the properties file +777 * @return the property from the properties file +778 * @throws InvalidSettingException is thrown if there is an error retrieving the setting +779 */ +780publicstaticboolean getBoolean(String key) throws InvalidSettingException { +781return Boolean.parseBoolean(Settings.getString(key)); +782 } +783 +784/** +785 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the +786 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the +787 * contained configuration file. +788 * +789 * @param key the key to lookup within the properties file +790 * @param defaultValue the default value to return if the setting does not exist +791 * @return the property from the properties file +792 * @throws InvalidSettingException is thrown if there is an error retrieving the setting +793 */ +794publicstaticboolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException { +795return Boolean.parseBoolean(Settings.getString(key, Boolean.toString(defaultValue))); +796 } +797 +798/** +799 * Returns a connection string from the configured properties. If the connection string contains a %s, this method will +800 * determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not +801 * exists it will be created. +802 * +803 * @param connectionStringKey the property file key for the connection string +804 * @param dbFileNameKey the settings key for the db filename +805 * @return the connection string +806 * @throws IOException thrown the data directory cannot be created +807 * @throws InvalidSettingException thrown if there is an invalid setting +808 */ +809publicstatic String getConnectionString(String connectionStringKey, String dbFileNameKey) +810throws IOException, InvalidSettingException { +811final String connStr = Settings.getString(connectionStringKey); +812if (connStr == null) { +813final String msg = String.format("Invalid properties file; %s is missing.", connectionStringKey); +814thrownewInvalidSettingException(msg); +815 } +816if (connStr.contains("%s")) { +817final File directory = getDataDirectory(); +818 String fileName = null; +819if (dbFileNameKey != null) { +820 fileName = Settings.getString(dbFileNameKey); +821 } +822if (fileName == null) { +823final String msg = String.format("Invalid properties file to get a file based connection string; '%s' must be defined.", +824 dbFileNameKey); +825thrownewInvalidSettingException(msg); +826 } +827if (connStr.startsWith("jdbc:h2:file:") && fileName.endsWith(".h2.db")) { +828 fileName = fileName.substring(0, fileName.length() - 6); +829 } +830// yes, for H2 this path won't actually exists - but this is sufficient to get the value needed +831final File dbFile = new File(directory, fileName); +832final String cString = String.format(connStr, dbFile.getCanonicalPath()); +833 LOGGER.debug("Connection String: '{}'", cString); +834return cString; +835 } +836return connStr; +837 } +838 +839/** +840 * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the +841 * embedded H2 database. This is public solely for some unit tests; otherwise this should be private. +842 * +843 * @return the data directory to store data files +844 * @throws IOException is thrown if an IOException occurs of course... +845 */ +846publicstatic File getDataDirectory() throws IOException { +847final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY); +848if (path.exists() || path.mkdirs()) { +849return path; +850 } +851thrownew IOException(String.format("Unable to create the data directory '%s'", path.getAbsolutePath())); +852 } +853 }
    diff --git a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-frame.html b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-frame.html index d3f5d0814..ef86dd68f 100644 --- a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-frame.html +++ b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Utils 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-summary.html b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-summary.html index 484d27f7a..456cf6554 100644 --- a/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-summary.html +++ b/dependency-check-utils/xref/org/owasp/dependencycheck/utils/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check Utils 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/dependency-check-utils/xref/overview-frame.html b/dependency-check-utils/xref/overview-frame.html index 9c3642b09..7f5f75f75 100644 --- a/dependency-check-utils/xref/overview-frame.html +++ b/dependency-check-utils/xref/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference + Dependency-Check Utils 1.3.6 Reference diff --git a/dependency-check-utils/xref/overview-summary.html b/dependency-check-utils/xref/overview-summary.html index 9e2c76ce4..9d7f20b53 100644 --- a/dependency-check-utils/xref/overview-summary.html +++ b/dependency-check-utils/xref/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check Utils 1.3.5 Reference + Dependency-Check Utils 1.3.6 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check Utils 1.3.5 Reference

    +

    Dependency-Check Utils 1.3.6 Reference

    diff --git a/dependency-updates-report.html b/dependency-updates-report.html index 4c461f327..5765ad958 100644 --- a/dependency-updates-report.html +++ b/dependency-updates-report.html @@ -1,13 +1,13 @@ - + dependency-check – Dependency Updates Report @@ -59,9 +59,9 @@
  • Dependency Updates Report
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -200,7 +200,7 @@ - + @@ -208,15 +208,15 @@ - + - + -
    # of dependencies using the latest version available16
    21
    # of dependencies where the next version available is smaller than an incremental version update
    # of dependencies where the next version available is an incremental version update7
    3
    # of dependencies where the next version available is a minor version update8
    6
    # of dependencies where the next version available is a major version update0
    +1

    Dependency Management

    @@ -233,27 +233,27 @@ - + - + - + - + - + - + @@ -305,6 +305,18 @@ + + + + + + + + + + + + @@ -316,7 +328,7 @@ - + @@ -328,7 +340,7 @@ - + @@ -340,7 +352,7 @@ - + @@ -352,11 +364,11 @@ - + - + @@ -364,7 +376,7 @@ - + @@ -376,7 +388,7 @@ - + @@ -388,7 +400,7 @@ - + @@ -400,7 +412,7 @@ - + @@ -412,7 +424,7 @@ - + @@ -424,7 +436,7 @@ - + @@ -436,7 +448,7 @@ - + @@ -448,7 +460,7 @@ - + @@ -460,7 +472,7 @@ - + @@ -472,7 +484,7 @@ - + @@ -484,18 +496,6 @@ - - - - - - - - - - - - @@ -545,16 +545,16 @@ - + - + - + @@ -569,27 +569,27 @@ - + - + - + - + - + - + @@ -627,7 +627,7 @@
    Next Minor Next Major
    ch.qos.logback logback-classic1.1.51.1.7 jar 1.1.6
    ch.qos.logback logback-core1.1.51.1.7 jar 1.1.6
    commons-collectionscommons-collections3.2.2jar20030418.083655
    commons-io commons-io
    junit junit
    org.apache.ant ant
    org.apache.ant ant-testutil
    org.apache.commons commons-compress1.101.11 jar
    org.apache.commons commons-lang3 3.4
    org.apache.lucene lucene-analyzers-common 4.8.0 5.0.0
    org.apache.lucene lucene-core 4.8.0 5.0.0
    org.apache.lucene lucene-queryparser 4.8.0 5.0.0
    org.apache.lucene lucene-test-framework 4.8.0 5.0.0
    org.apache.maven maven-core3.3.9
    org.apache.maven maven-plugin-api3.3.9
    org.apache.maven maven-settings3.3.9
    org.apache.maven.plugin-testing maven-plugin-testing-harness
    org.apache.maven.plugin-tools maven-plugin-annotations
    org.apache.maven.pluginsmaven-site-plugin3.4jar3.5
    org.apache.maven.reporting
    org.jmockit jmockit1.211.22 test jar 1.22
    org.slf4j slf4j-api1.7.161.7.21 jar 1.7.18
    org.slf4j slf4j-simple1.7.161.7.21 jar 1.7.18
    - + @@ -636,7 +636,7 @@ - + @@ -645,16 +645,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-classic
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    ch.qos.logback:logback-core

    - + @@ -663,7 +660,7 @@ - + @@ -672,10 +669,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id ch.qos.logback
    logback-core
    Current Version1.1.5
    1.1.7
    Scope
    Typejar
    Newer versions1.1.6 Next Incremental
    +jar

    com.google.code.findbugs:annotations

    @@ -776,6 +770,33 @@
    Type jar
    +

    commons-collections:commons-collections

    + + + + + + + + + + + + + + + + + + + + + + + + +
    Status There is at least one newer major version available. Major updates are rarely passive.
    Group Idcommons-collections
    Artifact Idcommons-collections
    Current Version3.2.2
    Scope
    Classifier
    Typejar
    Newer versions20030418.083655 Next Major
    20031027.000000
    20040102.233541
    20040616 Latest Major
    +

    commons-io:commons-io

    @@ -885,7 +906,7 @@ - + @@ -948,7 +969,7 @@ -
    commons-compress
    Current Version1.10
    1.11
    Scope
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-core

    @@ -975,7 +996,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-queryparser

    @@ -1002,7 +1023,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.lucene:lucene-test-framework

    @@ -1029,7 +1050,7 @@ -
    jar
    Newer versions4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0 Latest Major
    +4.8.0 Next Minor
    4.8.1
    4.9.0
    4.9.1
    4.10.0
    4.10.1
    4.10.2
    4.10.3
    4.10.4 Latest Minor
    5.0.0 Next Major
    5.1.0
    5.2.0
    5.2.1
    5.3.0
    5.3.1
    5.3.2
    5.4.0
    5.4.1
    5.5.0
    6.0.0 Latest Major

    org.apache.maven:maven-core

    @@ -1160,33 +1181,6 @@
    Type jar
    -

    org.apache.maven.plugins:maven-site-plugin

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
    Group Idorg.apache.maven.plugins
    Artifact Idmaven-site-plugin
    Current Version3.4
    Scope
    Classifier
    Typejar
    Newer versions3.5 Next Minor
    -

    org.apache.maven.reporting:maven-reporting-api

    @@ -1287,7 +1281,7 @@
    - + @@ -1296,7 +1290,7 @@ - + @@ -1305,10 +1299,7 @@ - - - -
    Status There is at least one newer minor version available. Minor updates are sometimes passive.
     No newer versions available.
    Group Id org.jmockit
    jmockit
    Current Version1.21
    1.22
    Scope test
    Typejar
    Newer versions1.22 Next Minor
    +jar

    org.jsoup:jsoup

    @@ -1338,7 +1329,7 @@
    - + @@ -1347,7 +1338,7 @@ - + @@ -1356,16 +1347,13 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-api
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.slf4j:slf4j-simple

    - + @@ -1374,7 +1362,7 @@ - + @@ -1383,10 +1371,7 @@ - - - -
    Status There is at least one newer incremental version available. Incremental updates are typically passive.
     No newer versions available.
    Group Id org.slf4j
    slf4j-simple
    Current Version1.7.16
    1.7.21
    Scope
    Typejar
    Newer versions1.7.18 Next Incremental
    +jar

    org.sonatype.plexus:plexus-sec-dispatcher

    diff --git a/general/internals.html b/general/internals.html index 78bd0e7a7..ee3e2d736 100644 --- a/general/internals.html +++ b/general/internals.html @@ -1,13 +1,13 @@ - + dependency-check – How does dependency-check work? @@ -59,9 +59,9 @@
  • How does dependency-check work?
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/general/scan_iso.html b/general/scan_iso.html index 0edba96c9..4f6dcf8ed 100644 --- a/general/scan_iso.html +++ b/general/scan_iso.html @@ -1,13 +1,13 @@ - + dependency-check – How to Mount ISO Files for Scanning @@ -59,9 +59,9 @@
  • How to Mount ISO Files for Scanning
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/general/suppression.html b/general/suppression.html index 138f3d9dd..42559d619 100644 --- a/general/suppression.html +++ b/general/suppression.html @@ -1,13 +1,13 @@ - + dependency-check – Suppressing False Positives @@ -59,9 +59,9 @@
  • Suppressing False Positives
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/general/thereport.html b/general/thereport.html index 00c87217d..8fba49f83 100644 --- a/general/thereport.html +++ b/general/thereport.html @@ -1,13 +1,13 @@ - + dependency-check – How To Read The Reports @@ -59,9 +59,9 @@
  • How To Read The Reports
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/index.html b/index.html index f6ad814b1..066a94f94 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,13 @@ - + dependency-check – About @@ -59,9 +59,9 @@
  • About
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/integration.html b/integration.html index 2436d08f9..04fb6e7a3 100644 --- a/integration.html +++ b/integration.html @@ -1,15 +1,15 @@ - + - dependency-check – Continuous Integration + dependency-check – CI Management @@ -56,12 +56,12 @@ / -
  • Continuous Integration
    • +
  • CI Management
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -106,14 +106,14 @@
  • - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -125,9 +125,9 @@
  • - + - Issue Tracking + Issue Management
  • @@ -139,23 +139,23 @@
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/issue-tracking.html b/issue-tracking.html index d1145f616..c1efdcdf9 100644 --- a/issue-tracking.html +++ b/issue-tracking.html @@ -1,15 +1,15 @@ - + - dependency-check – Issue Tracking + dependency-check – Issue Management @@ -56,12 +56,12 @@ / -
  • Issue Tracking
    • +
  • Issue Management
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -106,16 +106,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -127,7 +127,7 @@
  • - Issue Tracking + Issue Management
  • @@ -139,23 +139,23 @@
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -211,8 +211,8 @@

    Overview

    This project uses github to manage its issues.

    -

    Issue Tracking

    -

    Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.

    +

    Issue Management

    +

    Issues, bugs, and feature requests should be submitted to the following issue management system for this project.

    https://github.com/jeremylong/DependencyCheck/issues
    diff --git a/license.html b/license.html index 569883ecd..889b02813 100644 --- a/license.html +++ b/license.html @@ -1,15 +1,15 @@ - + - dependency-check – Project License + dependency-check – Project Licenses @@ -56,12 +56,12 @@ / -
  • Project License
    • +
  • Project Licenses
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -106,16 +106,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -127,9 +127,9 @@
  • - + - Issue Tracking + Issue Management
  • @@ -141,21 +141,21 @@
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - Project License + Licenses
    • @@ -206,15 +206,15 @@
    -
    + +

    Overview

    Typically the licenses listed for the project are that of the project itself, and not of dependencies.

    -

    Project License

    +

    Project Licenses

    The Apache Software License, Version 2.0

    -
    -
    +
                                      Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/mail-lists.html b/mail-lists.html
index 56551a579..f3db6bdfb 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check – Project Mailing Lists
     
@@ -59,9 +59,9 @@
         
  • Project Mailing Lists
    • 
         
               
-                  
  • | Last Published: 2016-03-05
    • 
+                  
  • | Last Published: 2016-04-09
    • 
               
  • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
    • 
             
                             
@@ -106,16 +106,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -125,9 +125,9 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
@@ -139,23 +139,23 @@
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
diff --git a/modules.html b/modules.html
index f7540a2f1..ee221043e 100644
--- a/modules.html
+++ b/modules.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check – Modules
     
@@ -59,9 +59,9 @@
         
  • Modules
    • 
         
               
-                  
  • | Last Published: 2016-03-05
    • 
+                  
  • | Last Published: 2016-04-09
    • 
               
  • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
    • 
             
                             
@@ -155,16 +155,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -176,9 +176,9 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
@@ -188,23 +188,23 @@
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
diff --git a/plugin-updates-report.html b/plugin-updates-report.html
index 5fa40fd65..223680e3d 100644
--- a/plugin-updates-report.html
+++ b/plugin-updates-report.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check – Plugin Updates Report
     
@@ -59,9 +59,9 @@
         
  • Plugin Updates Report
    • 
         
               
-                  
  • | Last Published: 2016-03-05
    • 
+                  
  • | Last Published: 2016-04-09
    • 
               
  • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
    • 
             
                             
diff --git a/project-info.html b/project-info.html
index 54c72f2e0..49ef250ec 100644
--- a/project-info.html
+++ b/project-info.html
@@ -1,13 +1,13 @@
 
 
 
   
     
     
-    
+    
     
     dependency-check – Project Information
     
@@ -59,9 +59,9 @@
         
  • Project Information
    • 
         
               
-                  
  • | Last Published: 2016-03-05
    • 
+                  
  • | Last Published: 2016-04-09
    • 
               
  • 
-                    Version: 1.3.5
+                    Version: 1.3.6
         
    • 
             
                             
@@ -104,16 +104,16 @@
                     
       
  • 
   
-                          
+                          
           
-        Continuous Integration
+        CI Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project Summary
+        Summary
             
    • 
                     
       
  • 
@@ -125,9 +125,9 @@
                     
       
  • 
   
-                          
+                          
           
-        Issue Tracking
+        Issue Management
             
    • 
                     
       
  • 
@@ -139,23 +139,23 @@
                     
       
  • 
   
-                          
+                          
           
-        Project Team
+        Team
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Source Repository
+        Source Code Management
             
    • 
                     
       
  • 
   
-                          
+                          
           
-        Project License
+        Licenses
             
    • 
               
         
@@ -217,28 +217,28 @@
    - + - + - + - + - + - +
    Document Description
    Continuous IntegrationCI Management This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
    Project SummarySummary This document lists other related information of this project
    Mailing Lists This document provides subscription and archive information for this project's mailing lists.
    Issue TrackingIssue Management This document provides information on the issue management system used in this project.
    Project Modules This document lists the modules (sub-projects) of this project.
    Project TeamTeam This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
    Source RepositorySource Code Management This document lists ways to access the online source repository.
    Project LicenseLicenses This document lists the project license(s).
    diff --git a/project-reports.html b/project-reports.html index 31d9a4edf..099241762 100644 --- a/project-reports.html +++ b/project-reports.html @@ -1,13 +1,13 @@ - + dependency-check – Generated Reports @@ -59,9 +59,9 @@
  • Generated Reports
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/project-summary.html b/project-summary.html index a42d6625e..dd043ab86 100644 --- a/project-summary.html +++ b/project-summary.html @@ -1,13 +1,13 @@ - + dependency-check – Project Summary @@ -59,9 +59,9 @@
  • Project Summary
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -106,14 +106,14 @@
  • - + - Continuous Integration + CI Management
  • - Project Summary + Summary
  • @@ -125,9 +125,9 @@
  • - + - Issue Tracking + Issue Management
  • @@ -139,23 +139,23 @@
  • - + - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -250,7 +250,7 @@ dependency-check-parent Version -1.3.5 +1.3.6 Type pom diff --git a/related.html b/related.html index e1262c9a9..d3464377a 100644 --- a/related.html +++ b/related.html @@ -1,13 +1,13 @@ - + dependency-check – Related Work @@ -59,9 +59,9 @@
  • Related Work
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/source-repository.html b/source-repository.html index 1b22a1c8c..b7c1d32d6 100644 --- a/source-repository.html +++ b/source-repository.html @@ -1,15 +1,15 @@ - + - dependency-check – Source Repository + dependency-check – Source Code Management @@ -56,12 +56,12 @@ / -
  • Source Repository
    • +
  • Source Code Management
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -106,16 +106,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -127,9 +127,9 @@
  • - + - Issue Tracking + Issue Management
  • @@ -141,21 +141,21 @@
  • - + - Project Team + Team
  • - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • diff --git a/surefire-report.html b/surefire-report.html index f1c2cbbbd..e39e5a34c 100644 --- a/surefire-report.html +++ b/surefire-report.html @@ -1,13 +1,13 @@ - + dependency-check – Surefire Report @@ -59,9 +59,9 @@
  • Surefire Report
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • diff --git a/team-list.html b/team-list.html index c11f60f37..b6ffdb08d 100644 --- a/team-list.html +++ b/team-list.html @@ -1,13 +1,13 @@ - + dependency-check – Project Team @@ -59,9 +59,9 @@
  • Project Team
    • -
  • | Last Published: 2016-03-05
    • +
  • | Last Published: 2016-04-09
  • - Version: 1.3.5 + Version: 1.3.6
    • @@ -106,16 +106,16 @@
  • - + - Continuous Integration + CI Management
  • - + - Project Summary + Summary
  • @@ -127,9 +127,9 @@
  • - + - Issue Tracking + Issue Management
  • @@ -141,21 +141,21 @@
  • - Project Team + Team
  • - + - Source Repository + Source Code Management
  • - + - Project License + Licenses
    • @@ -208,9 +208,9 @@
    -

    The Team

    +

    Project Team

    A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.

    -

    The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    +

    The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

    Members

    The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.

    diff --git a/xref-test/index.html b/xref-test/index.html index 9048578b1..346723553 100644 --- a/xref-test/index.html +++ b/xref-test/index.html @@ -4,7 +4,7 @@ - Dependency-Check 1.3.5 Reference + Dependency-Check 1.3.6 Reference diff --git a/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html b/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html index 17ad23763..eb035d832 100644 --- a/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html +++ b/xref-test/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerTest.html @@ -25,96 +25,127 @@ 17 */ 18 package org.owasp.dependencycheck.analyzer; 19 -20 import org.junit.After; -21 import org.junit.Assume; -22 import org.junit.Before; -23 import org.junit.Test; -24 import org.owasp.dependencycheck.BaseTest; -25 import org.owasp.dependencycheck.Engine; -26 import org.owasp.dependencycheck.analyzer.exception.AnalysisException; -27 import org.owasp.dependencycheck.data.nvdcve.DatabaseException; -28 import org.owasp.dependencycheck.dependency.Dependency; -29 import org.slf4j.Logger; -30 import org.slf4j.LoggerFactory; -31 -32 import java.io.File; -33 -34 import static org.hamcrest.CoreMatchers.is; -35 import static org.hamcrest.CoreMatchers.not; -36 import static org.junit.Assert.assertThat; -37 -38 /** -39 * Unit tests for {@link RubyBundleAuditAnalyzer}. -40 * -41 * @author Dale Visser -42 */ -43 public class RubyBundleAuditAnalyzerTest extends BaseTest { -44 -45 private static final Logger LOGGER = LoggerFactory.getLogger(RubyBundleAuditAnalyzerTest.class); -46 -47 /** -48 * The analyzer to test. -49 */ -50 RubyBundleAuditAnalyzer analyzer; -51 -52 /** -53 * Correctly setup the analyzer for testing. -54 * -55 * @throws Exception thrown if there is a problem -56 */ -57 @Before -58 public void setUp() throws Exception { -59 try { -60 analyzer = new RubyBundleAuditAnalyzer(); -61 analyzer.setFilesMatched(true); -62 analyzer.initialize(); -63 } catch (Exception e) { -64 //LOGGER.warn("Exception setting up RubyBundleAuditAnalyzer. Tests will be incomplete", e); -65 Assume.assumeNoException("Exception setting up RubyBundleAuditAnalyzer; bundle audit may not be installed. Tests will be incomplete", e); -66 } -67 } -68 -69 /** -70 * Cleanup the analyzer's temp files, etc. -71 * -72 * @throws Exception thrown if there is a problem -73 */ -74 @After -75 public void tearDown() throws Exception { -76 analyzer.close(); -77 analyzer = null; -78 } -79 -80 /** -81 * Test Ruby Gemspec name. -82 */ -83 @Test -84 public void testGetName() { -85 assertThat(analyzer.getName(), is("Ruby Bundle Audit Analyzer")); -86 } -87 -88 /** -89 * Test Ruby Bundler Audit file support. -90 */ -91 @Test -92 public void testSupportsFiles() { -93 assertThat(analyzer.accept(new File("Gemfile.lock")), is(true)); -94 } -95 -96 /** -97 * Test Ruby BundlerAudit analysis. -98 * -99 * @throws AnalysisException is thrown when an exception occurs. -100 */ -101 @Test -102 public void testAnalysis() throws AnalysisException, DatabaseException { -103 final Dependency result = new Dependency(BaseTest.getResourceAsFile(this, -104 "ruby/vulnerable/Gemfile.lock")); -105 final Engine engine = new Engine(); -106 analyzer.analyze(result, engine); -107 assertThat(engine.getDependencies().size(), is(not(0))); -108 } -109 } +20 import static org.hamcrest.CoreMatchers.is; +21 import static org.junit.Assert.assertThat; +22 import static org.junit.Assert.assertTrue; +23 +24 import java.io.File; +25 +26 import org.junit.After; +27 import org.junit.Assume; +28 import org.junit.Before; +29 import org.junit.Test; +30 import org.owasp.dependencycheck.BaseTest; +31 import org.owasp.dependencycheck.Engine; +32 import org.owasp.dependencycheck.analyzer.exception.AnalysisException; +33 import org.owasp.dependencycheck.data.nvdcve.DatabaseException; +34 import org.owasp.dependencycheck.dependency.Dependency; +35 import org.owasp.dependencycheck.utils.Settings; +36 import org.slf4j.Logger; +37 import org.slf4j.LoggerFactory; +38 +39 /** +40 * Unit tests for {@link RubyBundleAuditAnalyzer}. +41 * +42 * @author Dale Visser +43 */ +44 public class RubyBundleAuditAnalyzerTest extends BaseTest { +45 +46 private static final Logger LOGGER = LoggerFactory.getLogger(RubyBundleAuditAnalyzerTest.class); +47 +48 /** +49 * The analyzer to test. +50 */ +51 RubyBundleAuditAnalyzer analyzer; +52 +53 /** +54 * Correctly setup the analyzer for testing. +55 * +56 * @throws Exception thrown if there is a problem +57 */ +58 @Before +59 public void setUp() throws Exception { +60 Settings.initialize(); +61 analyzer = new RubyBundleAuditAnalyzer(); +62 analyzer.setFilesMatched(true); +63 } +64 +65 /** +66 * Cleanup the analyzer's temp files, etc. +67 * +68 * @throws Exception thrown if there is a problem +69 */ +70 @After +71 public void tearDown() throws Exception { +72 Settings.cleanup(); +73 analyzer.close(); +74 analyzer = null; +75 } +76 +77 /** +78 * Test Ruby Gemspec name. +79 */ +80 @Test +81 public void testGetName() { +82 assertThat(analyzer.getName(), is("Ruby Bundle Audit Analyzer")); +83 } +84 +85 /** +86 * Test Ruby Bundler Audit file support. +87 */ +88 @Test +89 public void testSupportsFiles() { +90 assertThat(analyzer.accept(new File("Gemfile.lock")), is(true)); +91 } +92 +93 /** +94 * Test Ruby BundlerAudit analysis. +95 * +96 * @throws AnalysisException is thrown when an exception occurs. +97 */ +98 @Test +99 public void testAnalysis() throws AnalysisException, DatabaseException { +100 try { +101 analyzer.initialize(); +102 +103 final Dependency result = new Dependency(BaseTest.getResourceAsFile(this, +104 "ruby/vulnerable/gems/rails-4.1.15/Gemfile.lock")); +105 final Engine engine = new Engine(); +106 analyzer.analyze(result, engine); +107 int size = engine.getDependencies().size(); +108 assertThat(size, is(1)); +109 +110 Dependency dependency = engine.getDependencies().get(0); +111 assertTrue(dependency.getProductEvidence().toString().toLowerCase().contains("redcarpet")); +112 assertTrue(dependency.getVersionEvidence().toString().toLowerCase().contains("2.2.2")); +113 +114 } catch (Exception e) { +115 LOGGER.warn("Exception setting up RubyBundleAuditAnalyzer. Make sure Ruby gem bundle-audit is installed. You may also need to set property \"analyzer.bundle.audit.path\".", e); +116 Assume.assumeNoException("Exception setting up RubyBundleAuditAnalyzer; bundle audit may not be installed, or property \"analyzer.bundle.audit.path\" may not be set.", e); +117 } +118 } +119 +120 /** +121 * Test when Ruby bundle-audit is not available on the system. +122 * +123 * @throws AnalysisException is thrown when an exception occurs. +124 */ +125 @Test +126 public void testMissingBundleAudit() throws AnalysisException, DatabaseException { +127 //set a non-exist bundle-audit +128 Settings.setString(Settings.KEYS.ANALYZER_BUNDLE_AUDIT_PATH, "phantom-bundle-audit"); +129 try { +130 //initialize should fail. +131 analyzer.initialize(); +132 } catch (Exception e) { +133 //expected, so ignore. +134 } +135 finally { +136 assertThat(analyzer.isEnabled(), is(false)); +137 LOGGER.info("phantom-bundle-audit is not available. Ruby Bundle Audit Analyzer is disabled as expected."); +138 } +139 } +140 }
    diff --git a/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html b/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html index 38b741875..89068d62a 100644 --- a/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/analyzer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html b/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html index 95c7e3ea8..fd4a07b60 100644 --- a/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/analyzer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/xref-test/org/owasp/dependencycheck/data/central/package-frame.html b/xref-test/org/owasp/dependencycheck/data/central/package-frame.html index ddc000de9..3c946efdf 100644 --- a/xref-test/org/owasp/dependencycheck/data/central/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/central/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/xref-test/org/owasp/dependencycheck/data/central/package-summary.html b/xref-test/org/owasp/dependencycheck/data/central/package-summary.html index 72423345b..6b58b845f 100644 --- a/xref-test/org/owasp/dependencycheck/data/central/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/central/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html b/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html index 0382320d4..77aa039f9 100644 --- a/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/composer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html b/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html index 0b0ee5f39..05fcdb5f4 100644 --- a/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/composer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html b/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html index 041da2ec5..dacee8569 100644 --- a/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/cpe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html b/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html index 821e9f347..71eaa116a 100644 --- a/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/cpe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html b/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html index 424cf93d7..5db18032f 100644 --- a/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/cwe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html b/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html index 3d76d88aa..9b171a0b2 100644 --- a/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/cwe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html b/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html index 4638c0dfd..1025f03ff 100644 --- a/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/lucene/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html b/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html index 5e078cae4..721806a02 100644 --- a/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/lucene/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html b/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html index 38d2a0a75..ca9c6b030 100644 --- a/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/nexus/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html b/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html index 4c72da0cf..4593064ce 100644 --- a/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/nexus/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html b/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html index ee7281049..3ef7179b5 100644 --- a/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/nuget/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html b/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html index 8af65b330..18823ecf3 100644 --- a/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/nuget/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html b/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html index 96c913761..b4c0d96e7 100644 --- a/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/nvdcve/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html b/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html index 726a32c94..2f60df2cc 100644 --- a/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/nvdcve/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html b/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html index c96d46c3d..7a7ba872b 100644 --- a/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/update/nvd/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html b/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html index cd20f3b8e..ad304edef 100644 --- a/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/update/nvd/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/xref-test/org/owasp/dependencycheck/data/update/package-frame.html b/xref-test/org/owasp/dependencycheck/data/update/package-frame.html index 2fa53ab83..c5760bcbf 100644 --- a/xref-test/org/owasp/dependencycheck/data/update/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/data/update/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/xref-test/org/owasp/dependencycheck/data/update/package-summary.html b/xref-test/org/owasp/dependencycheck/data/update/package-summary.html index 2c0af3f96..0aedc640c 100644 --- a/xref-test/org/owasp/dependencycheck/data/update/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/data/update/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/xref-test/org/owasp/dependencycheck/dependency/package-frame.html b/xref-test/org/owasp/dependencycheck/dependency/package-frame.html index a9bfd50b7..2b4c6937c 100644 --- a/xref-test/org/owasp/dependencycheck/dependency/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/dependency/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/xref-test/org/owasp/dependencycheck/dependency/package-summary.html b/xref-test/org/owasp/dependencycheck/dependency/package-summary.html index 6f0b51947..637894781 100644 --- a/xref-test/org/owasp/dependencycheck/dependency/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/dependency/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/xref-test/org/owasp/dependencycheck/maven/package-frame.html b/xref-test/org/owasp/dependencycheck/maven/package-frame.html index 3478e9957..5807480d6 100644 --- a/xref-test/org/owasp/dependencycheck/maven/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/maven/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.maven diff --git a/xref-test/org/owasp/dependencycheck/maven/package-summary.html b/xref-test/org/owasp/dependencycheck/maven/package-summary.html index f47a8c442..4854f7c59 100644 --- a/xref-test/org/owasp/dependencycheck/maven/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/maven/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.maven diff --git a/xref-test/org/owasp/dependencycheck/package-frame.html b/xref-test/org/owasp/dependencycheck/package-frame.html index 42a42010b..0cf80d0e8 100644 --- a/xref-test/org/owasp/dependencycheck/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/xref-test/org/owasp/dependencycheck/package-summary.html b/xref-test/org/owasp/dependencycheck/package-summary.html index 3d8a1ccc8..33acb1955 100644 --- a/xref-test/org/owasp/dependencycheck/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/xref-test/org/owasp/dependencycheck/reporting/package-frame.html b/xref-test/org/owasp/dependencycheck/reporting/package-frame.html index 65c38a74b..c39622ba4 100644 --- a/xref-test/org/owasp/dependencycheck/reporting/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/reporting/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/xref-test/org/owasp/dependencycheck/reporting/package-summary.html b/xref-test/org/owasp/dependencycheck/reporting/package-summary.html index 0cfbfbc19..5b64ef356 100644 --- a/xref-test/org/owasp/dependencycheck/reporting/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/reporting/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/xref-test/org/owasp/dependencycheck/suppression/package-frame.html b/xref-test/org/owasp/dependencycheck/suppression/package-frame.html index 022b8418f..7e74098fd 100644 --- a/xref-test/org/owasp/dependencycheck/suppression/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/suppression/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/xref-test/org/owasp/dependencycheck/suppression/package-summary.html b/xref-test/org/owasp/dependencycheck/suppression/package-summary.html index 6f1c7cf08..17ae0c4da 100644 --- a/xref-test/org/owasp/dependencycheck/suppression/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/suppression/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html b/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html index 96e9e23b1..75ec6af15 100644 --- a/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/taskdefs/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html b/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html index 99ae20489..b6d2fdd67 100644 --- a/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/taskdefs/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html b/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html index 585a9af61..f28d3523b 100644 --- a/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html +++ b/xref-test/org/owasp/dependencycheck/utils/SettingsTest.html @@ -148,75 +148,87 @@ 140 } 141 142 /** -143 * Test of getLong method, of class Settings. +143 * Test of getInt method, of class Settings. 144 */ 145 @Test -146 public void testGetLong() throws InvalidSettingException { -147 String key = "SomeNumber"; -148 long expResult = 300L; -149 Settings.setString(key, "300"); -150 long result = Settings.getLong(key); +146 public void testGetIntDefault() throws InvalidSettingException { +147 String key = "SomeKey"; +148 int expResult = 85; +149 Settings.setString(key, "blue"); +150 int result = Settings.getInt(key, expResult); 151 Assert.assertEquals(expResult, result); 152 } 153 154 /** -155 * Test of getBoolean method, of class Settings. +155 * Test of getLong method, of class Settings. 156 */ 157 @Test -158 public void testGetBoolean() throws InvalidSettingException { -159 String key = "SomeBoolean"; -160 Settings.setString(key, "false"); -161 boolean expResult = false; -162 boolean result = Settings.getBoolean(key); +158 public void testGetLong() throws InvalidSettingException { +159 String key = "SomeNumber"; +160 long expResult = 300L; +161 Settings.setString(key, "300"); +162 long result = Settings.getLong(key); 163 Assert.assertEquals(expResult, result); -164 -165 key = "something that does not exist"; -166 expResult = true; -167 result = Settings.getBoolean(key, true); -168 Assert.assertEquals(expResult, result); -169 } -170 -171 /** -172 * Test of removeProperty method, of class Settings. -173 */ -174 @Test -175 public void testRemoveProperty() { -176 String key = "SomeKey"; -177 String value = "value"; -178 String dfault = "default"; -179 Settings.setString(key, value); -180 String ret = Settings.getString(key); -181 Assert.assertEquals(value, ret); -182 Settings.removeProperty(key); -183 ret = Settings.getString(key, dfault); -184 Assert.assertEquals(dfault, ret); -185 } -186 -187 /** -188 * Test of getConnectionString. -189 */ -190 @Test -191 public void testGetConnectionString() throws Exception { -192 String value = Settings.getConnectionString(Settings.KEYS.DB_CONNECTION_STRING, Settings.KEYS.DB_FILE_NAME); -193 Assert.assertNotNull(value); -194 String msg = null; -195 try { -196 value = Settings.getConnectionString("invalidKey", null); -197 } catch (InvalidSettingException e) { -198 msg = e.getMessage(); -199 } -200 Assert.assertNotNull(msg); -201 } -202 -203 /** -204 * Test of getTempDirectory. -205 */ -206 @Test -207 public void testGetTempDirectory() throws Exception { -208 File tmp = Settings.getTempDirectory(); -209 Assert.assertTrue(tmp.exists()); -210 } -211 } +164 } +165 +166 /** +167 * Test of getBoolean method, of class Settings. +168 */ +169 @Test +170 public void testGetBoolean() throws InvalidSettingException { +171 String key = "SomeBoolean"; +172 Settings.setString(key, "false"); +173 boolean expResult = false; +174 boolean result = Settings.getBoolean(key); +175 Assert.assertEquals(expResult, result); +176 +177 key = "something that does not exist"; +178 expResult = true; +179 result = Settings.getBoolean(key, true); +180 Assert.assertEquals(expResult, result); +181 } +182 +183 /** +184 * Test of removeProperty method, of class Settings. +185 */ +186 @Test +187 public void testRemoveProperty() { +188 String key = "SomeKey"; +189 String value = "value"; +190 String dfault = "default"; +191 Settings.setString(key, value); +192 String ret = Settings.getString(key); +193 Assert.assertEquals(value, ret); +194 Settings.removeProperty(key); +195 ret = Settings.getString(key, dfault); +196 Assert.assertEquals(dfault, ret); +197 } +198 +199 /** +200 * Test of getConnectionString. +201 */ +202 @Test +203 public void testGetConnectionString() throws Exception { +204 String value = Settings.getConnectionString(Settings.KEYS.DB_CONNECTION_STRING, Settings.KEYS.DB_FILE_NAME); +205 Assert.assertNotNull(value); +206 String msg = null; +207 try { +208 value = Settings.getConnectionString("invalidKey", null); +209 } catch (InvalidSettingException e) { +210 msg = e.getMessage(); +211 } +212 Assert.assertNotNull(msg); +213 } +214 +215 /** +216 * Test of getTempDirectory. +217 */ +218 @Test +219 public void testGetTempDirectory() throws Exception { +220 File tmp = Settings.getTempDirectory(); +221 Assert.assertTrue(tmp.exists()); +222 } +223 }
    diff --git a/xref-test/org/owasp/dependencycheck/utils/package-frame.html b/xref-test/org/owasp/dependencycheck/utils/package-frame.html index 990653543..d58b96d02 100644 --- a/xref-test/org/owasp/dependencycheck/utils/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/utils/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/xref-test/org/owasp/dependencycheck/utils/package-summary.html b/xref-test/org/owasp/dependencycheck/utils/package-summary.html index 25a484f37..0b0f97667 100644 --- a/xref-test/org/owasp/dependencycheck/utils/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/utils/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html b/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html index 192d0681b..ec1840124 100644 --- a/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html +++ b/xref-test/org/owasp/dependencycheck/xml/pom/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html b/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html index be56a05af..0d89526ee 100644 --- a/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html +++ b/xref-test/org/owasp/dependencycheck/xml/pom/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/xref-test/overview-frame.html b/xref-test/overview-frame.html index 1f2ddb139..389885da2 100644 --- a/xref-test/overview-frame.html +++ b/xref-test/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference + Dependency-Check 1.3.6 Reference diff --git a/xref-test/overview-summary.html b/xref-test/overview-summary.html index 3fa5417c2..9373cdc9a 100644 --- a/xref-test/overview-summary.html +++ b/xref-test/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference + Dependency-Check 1.3.6 Reference @@ -24,7 +24,7 @@
    -

    Dependency-Check 1.3.5 Reference

    +

    Dependency-Check 1.3.6 Reference

    diff --git a/xref/index.html b/xref/index.html index 9048578b1..346723553 100644 --- a/xref/index.html +++ b/xref/index.html @@ -4,7 +4,7 @@ - Dependency-Check 1.3.5 Reference + Dependency-Check 1.3.6 Reference diff --git a/xref/org/owasp/dependencycheck/agent/package-frame.html b/xref/org/owasp/dependencycheck/agent/package-frame.html index 2fb5e616b..c224aa7df 100644 --- a/xref/org/owasp/dependencycheck/agent/package-frame.html +++ b/xref/org/owasp/dependencycheck/agent/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.agent + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.agent diff --git a/xref/org/owasp/dependencycheck/agent/package-summary.html b/xref/org/owasp/dependencycheck/agent/package-summary.html index 07f5a4d9a..89518c007 100644 --- a/xref/org/owasp/dependencycheck/agent/package-summary.html +++ b/xref/org/owasp/dependencycheck/agent/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.agent + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.agent diff --git a/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html b/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html index 8a02ef33d..6d2cc1c4f 100644 --- a/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html +++ b/xref/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.html @@ -26,98 +26,107 @@ 18package org.owasp.dependencycheck.analyzer; 1920import java.io.File; -21import org.apache.commons.io.FilenameUtils; -22import org.owasp.dependencycheck.Engine; -23import org.owasp.dependencycheck.analyzer.exception.AnalysisException; -24import org.owasp.dependencycheck.dependency.Confidence; -25import org.owasp.dependencycheck.dependency.Dependency; -26import org.owasp.dependencycheck.utils.DependencyVersion; -27import org.owasp.dependencycheck.utils.DependencyVersionUtil; -28 -29/** -30 * -31 * Takes a dependency and analyzes the filename and determines the hashes. +21 +22import org.apache.commons.io.FilenameUtils; +23import org.apache.commons.io.filefilter.NameFileFilter; +24import org.owasp.dependencycheck.Engine; +25import org.owasp.dependencycheck.analyzer.exception.AnalysisException; +26import org.owasp.dependencycheck.dependency.Confidence; +27import org.owasp.dependencycheck.dependency.Dependency; +28import org.owasp.dependencycheck.utils.DependencyVersion; +29import org.owasp.dependencycheck.utils.DependencyVersionUtil; +30 +31/**32 * -33 * @author Jeremy Long -34 */ -35publicclassFileNameAnalyzerextendsAbstractAnalyzerimplementsAnalyzer { -36 -37//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"> -38/** -39 * The name of the analyzer. -40 */ -41privatestaticfinal String ANALYZER_NAME = "File Name Analyzer"; -42/** -43 * The phase that this analyzer is intended to run in. -44 */ -45privatestaticfinalAnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION; -46 -47/** -48 * Returns the name of the analyzer. -49 * -50 * @return the name of the analyzer. -51 */ -52 @Override -53public String getName() { -54return ANALYZER_NAME; -55 } -56 -57/** -58 * Returns the phase that the analyzer is intended to run in. -59 * -60 * @return the phase that the analyzer is intended to run in. -61 */ -62 @Override -63publicAnalysisPhase getAnalysisPhase() { -64return ANALYSIS_PHASE; -65 } -66//</editor-fold> -67 -68/** -69 * Collects information about the file name. -70 * -71 * @param dependency the dependency to analyze. -72 * @param engine the engine that is scanning the dependencies -73 * @throws AnalysisException is thrown if there is an error reading the JAR file. -74 */ -75 @Override -76publicvoid analyze(Dependency dependency, Engine engine) throws AnalysisException { -77 -78//strip any path information that may get added by ArchiveAnalyzer, etc. -79final File f = dependency.getActualFile(); -80final String fileName = FilenameUtils.removeExtension(f.getName()); -81 -82//add version evidence -83finalDependencyVersion version = DependencyVersionUtil.parseVersion(fileName); -84if (version != null) { -85// If the version number is just a number like 2 or 23, reduce the confidence -86// a shade. This should hopefully correct for cases like log4j.jar or -87// struts2-core.jar -88if (version.getVersionParts() == null || version.getVersionParts().size() < 2) { -89 dependency.getVersionEvidence().addEvidence("file", "name", -90 version.toString(), Confidence.MEDIUM); -91 } else { -92 dependency.getVersionEvidence().addEvidence("file", "name", -93 version.toString(), Confidence.HIGHEST); -94 } -95 dependency.getVersionEvidence().addEvidence("file", "name", -96 fileName, Confidence.MEDIUM); -97 } -98 -99//add as vendor and product evidence -100if (fileName.contains("-")) { -101 dependency.getProductEvidence().addEvidence("file", "name", -102 fileName, Confidence.HIGHEST); -103 dependency.getVendorEvidence().addEvidence("file", "name", -104 fileName, Confidence.HIGHEST); -105 } else { -106 dependency.getProductEvidence().addEvidence("file", "name", -107 fileName, Confidence.HIGH); -108 dependency.getVendorEvidence().addEvidence("file", "name", -109 fileName, Confidence.HIGH); -110 } -111 } -112 } +33 * Takes a dependency and analyzes the filename and determines the hashes. +34 * +35 * @author Jeremy Long +36 */ +37publicclassFileNameAnalyzerextendsAbstractAnalyzerimplementsAnalyzer { +38 +39//<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer"> +40/** +41 * The name of the analyzer. +42 */ +43privatestaticfinal String ANALYZER_NAME = "File Name Analyzer"; +44/** +45 * The phase that this analyzer is intended to run in. +46 */ +47privatestaticfinalAnalysisPhase ANALYSIS_PHASE = AnalysisPhase.INFORMATION_COLLECTION; +48 +49/** +50 * Returns the name of the analyzer. +51 * +52 * @return the name of the analyzer. +53 */ +54 @Override +55public String getName() { +56return ANALYZER_NAME; +57 } +58 +59/** +60 * Returns the phase that the analyzer is intended to run in. +61 * +62 * @return the phase that the analyzer is intended to run in. +63 */ +64 @Override +65publicAnalysisPhase getAnalysisPhase() { +66return ANALYSIS_PHASE; +67 } +68//</editor-fold> +69 +70// Python init files +71privatestaticfinal NameFileFilter IGNORED_FILES = new NameFileFilter(new String[] { +72"__init__.py", +73"__init__.pyc", +74"__init__.pyo" +75 }); +76 +77/** +78 * Collects information about the file name. +79 * +80 * @param dependency the dependency to analyze. +81 * @param engine the engine that is scanning the dependencies +82 * @throws AnalysisException is thrown if there is an error reading the JAR file. +83 */ +84 @Override +85publicvoid analyze(Dependency dependency, Engine engine) throws AnalysisException { +86 +87//strip any path information that may get added by ArchiveAnalyzer, etc. +88final File f = dependency.getActualFile(); +89final String fileName = FilenameUtils.removeExtension(f.getName()); +90 +91//add version evidence +92finalDependencyVersion version = DependencyVersionUtil.parseVersion(fileName); +93if (version != null) { +94// If the version number is just a number like 2 or 23, reduce the confidence +95// a shade. This should hopefully correct for cases like log4j.jar or +96// struts2-core.jar +97if (version.getVersionParts() == null || version.getVersionParts().size() < 2) { +98 dependency.getVersionEvidence().addEvidence("file", "name", +99 version.toString(), Confidence.MEDIUM); +100 } else { +101 dependency.getVersionEvidence().addEvidence("file", "name", +102 version.toString(), Confidence.HIGHEST); +103 } +104 dependency.getVersionEvidence().addEvidence("file", "name", +105 fileName, Confidence.MEDIUM); +106 } +107 +108//add as vendor and product evidence +109if (fileName.contains("-")) { +110 dependency.getProductEvidence().addEvidence("file", "name", +111 fileName, Confidence.HIGHEST); +112 dependency.getVendorEvidence().addEvidence("file", "name", +113 fileName, Confidence.HIGHEST); +114 } elseif (!IGNORED_FILES.accept(f)) { +115 dependency.getProductEvidence().addEvidence("file", "name", +116 fileName, Confidence.HIGH); +117 dependency.getVendorEvidence().addEvidence("file", "name", +118 fileName, Confidence.HIGH); +119 } +120 } +121 }
    diff --git a/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html b/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html index e82736060..8bae17722 100644 --- a/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html +++ b/xref/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.html @@ -193,7 +193,7 @@ 185if (found) { 186 dependency.setDisplayFileName(parentName + "/__init__.py"); 187 dependency.getProductEvidence().addEvidence(file.getName(), -188"PackageName", parentName, Confidence.MEDIUM); +188"PackageName", parentName, Confidence.HIGH); 189 } else { 190// copy, alter and set in case some other thread is iterating over191final List<Dependency> dependencies = new ArrayList<Dependency>( diff --git a/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html b/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html index 4fd6162fc..93be2b0d4 100644 --- a/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html +++ b/xref/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.html @@ -91,247 +91,263 @@ 83final ProcessBuilder builder = new ProcessBuilder(args); 84 builder.directory(folder); 85try { -86return builder.start(); -87 } catch (IOException ioe) { -88thrownewAnalysisException("bundle-audit failure", ioe); -89 } -90 } -91 -92/** -93 * Initialize the analyzer. In this case, extract GrokAssembly.exe to a temporary location. -94 * -95 * @throws Exception if anything goes wrong -96 */ -97 @Override -98publicvoid initializeFileTypeAnalyzer() throws Exception { -99// Now, need to see if bundle-audit actually runs from this location. -100 Process process = launchBundleAudit(Settings.getTempDirectory()); -101int exitValue = process.waitFor(); -102if (0 == exitValue) { -103 LOGGER.warn("Unexpected exit code from bundle-audit process. Disabling {}: {}", ANALYZER_NAME, exitValue); -104 setEnabled(false); -105thrownewAnalysisException("Unexpected exit code from bundle-audit process."); -106 } else { -107 BufferedReader reader = null; -108try { -109 reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); -110if (!reader.ready()) { -111 LOGGER.warn("Bundle-audit error stream unexpectedly not ready. Disabling " + ANALYZER_NAME); -112 setEnabled(false); -113thrownewAnalysisException("Bundle-audit error stream unexpectedly not ready."); -114 } else { -115final String line = reader.readLine(); -116if (line == null || !line.contains("Errno::ENOENT")) { -117 LOGGER.warn("Unexpected bundle-audit output. Disabling {}: {}", ANALYZER_NAME, line); -118 setEnabled(false); -119thrownewAnalysisException("Unexpected bundle-audit output."); -120 } -121 } -122 } finally { -123if (null != reader) { -124 reader.close(); -125 } -126 } -127 } -128if (isEnabled()) { -129 LOGGER.info(ANALYZER_NAME + " is enabled. It is necessary to manually run \"bundle-audit update\" " -130 + "occasionally to keep its database up to date."); -131 } -132 } -133 -134/** -135 * Returns the name of the analyzer. -136 * -137 * @return the name of the analyzer. -138 */ -139 @Override -140public String getName() { -141return ANALYZER_NAME; -142 } -143 -144/** -145 * Returns the phase that the analyzer is intended to run in. -146 * -147 * @return the phase that the analyzer is intended to run in. -148 */ -149 @Override -150publicAnalysisPhase getAnalysisPhase() { -151return ANALYSIS_PHASE; -152 } -153 -154/** -155 * Returns the key used in the properties file to reference the analyzer's enabled property. -156 * -157 * @return the analyzer's enabled property setting key -158 */ -159 @Override -160protected String getAnalyzerEnabledSettingKey() { -161return Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED; -162 } -163 -164/** -165 * If {@link #analyzeFileType(Dependency, Engine)} is called, then we have successfully initialized, and it will be necessary -166 * to disable {@link RubyGemspecAnalyzer}. -167 */ -168privateboolean needToDisableGemspecAnalyzer = true; -169 +86 LOGGER.info("Launching: " + args + " from " + folder); +87return builder.start(); +88 } catch (IOException ioe) { +89thrownewAnalysisException("bundle-audit failure", ioe); +90 } +91 } +92 +93/** +94 * Initialize the analyzer. In this case, extract GrokAssembly.exe to a temporary location. +95 * +96 * @throws Exception if anything goes wrong +97 */ +98 @Override +99publicvoid initializeFileTypeAnalyzer() throws Exception { +100// Now, need to see if bundle-audit actually runs from this location. +101 Process process = null; +102try { +103 process = launchBundleAudit(Settings.getTempDirectory()); +104 } +105catch(AnalysisException ae) { +106 LOGGER.warn("Exception from bundle-audit process: {}. Disabling {}", ae.getCause(), ANALYZER_NAME); +107 setEnabled(false); +108throw ae; +109 } +110 +111int exitValue = process.waitFor(); +112if (0 == exitValue) { +113 LOGGER.warn("Unexpected exit code from bundle-audit process. Disabling {}: {}", ANALYZER_NAME, exitValue); +114 setEnabled(false); +115thrownewAnalysisException("Unexpected exit code from bundle-audit process."); +116 } else { +117 BufferedReader reader = null; +118try { +119 reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); +120if (!reader.ready()) { +121 LOGGER.warn("Bundle-audit error stream unexpectedly not ready. Disabling " + ANALYZER_NAME); +122 setEnabled(false); +123thrownewAnalysisException("Bundle-audit error stream unexpectedly not ready."); +124 } else { +125final String line = reader.readLine(); +126if (line == null || !line.contains("Errno::ENOENT")) { +127 LOGGER.warn("Unexpected bundle-audit output. Disabling {}: {}", ANALYZER_NAME, line); +128 setEnabled(false); +129thrownewAnalysisException("Unexpected bundle-audit output."); +130 } +131 } +132 } finally { +133if (null != reader) { +134 reader.close(); +135 } +136 } +137 } +138 +139if (isEnabled()) { +140 LOGGER.info(ANALYZER_NAME + " is enabled. It is necessary to manually run \"bundle-audit update\" " +141 + "occasionally to keep its database up to date."); +142 } +143 } +144 +145/** +146 * Returns the name of the analyzer. +147 * +148 * @return the name of the analyzer. +149 */ +150 @Override +151public String getName() { +152return ANALYZER_NAME; +153 } +154 +155/** +156 * Returns the phase that the analyzer is intended to run in. +157 * +158 * @return the phase that the analyzer is intended to run in. +159 */ +160 @Override +161publicAnalysisPhase getAnalysisPhase() { +162return ANALYSIS_PHASE; +163 } +164 +165/** +166 * Returns the key used in the properties file to reference the analyzer's enabled property. +167 * +168 * @return the analyzer's enabled property setting key +169 */170 @Override -171protectedvoid analyzeFileType(Dependency dependency, Engine engine) -172throwsAnalysisException { -173if (needToDisableGemspecAnalyzer) { -174boolean failed = true; -175final String className = RubyGemspecAnalyzer.class.getName(); -176for (FileTypeAnalyzer analyzer : engine.getFileTypeAnalyzers()) { -177if (analyzer instanceof RubyGemspecAnalyzer) { -178 ((RubyGemspecAnalyzer) analyzer).setEnabled(false); -179 LOGGER.info("Disabled " + className + " to avoid noisy duplicate results."); -180 failed = false; -181 } -182 } -183if (failed) { -184 LOGGER.warn("Did not find" + className + '.'); -185 } -186 needToDisableGemspecAnalyzer = false; -187 } -188final File parentFile = dependency.getActualFile().getParentFile(); -189final Process process = launchBundleAudit(parentFile); -190try { -191 process.waitFor(); -192 } catch (InterruptedException ie) { -193thrownewAnalysisException("bundle-audit process interrupted", ie); -194 } -195 BufferedReader rdr = null; -196try { -197 rdr = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8")); -198 processBundlerAuditOutput(dependency, engine, rdr); -199 } catch (IOException ioe) { -200 LOGGER.warn("bundle-audit failure", ioe); -201 } finally { -202if (null != rdr) { -203try { -204 rdr.close(); -205 } catch (IOException ioe) { -206 LOGGER.warn("bundle-audit close failure", ioe); -207 } -208 } -209 } -210 -211 } -212 -213privatevoid processBundlerAuditOutput(Dependency original, Engine engine, BufferedReader rdr) throws IOException { -214final String parentName = original.getActualFile().getParentFile().getName(); -215final String fileName = original.getFileName(); -216Dependency dependency = null; -217Vulnerability vulnerability = null; -218 String gem = null; -219final Map<String, Dependency> map = new HashMap<String, Dependency>(); -220boolean appendToDescription = false; -221while (rdr.ready()) { -222final String nextLine = rdr.readLine(); -223if (null == nextLine) { -224break; -225 } elseif (nextLine.startsWith(NAME)) { -226 appendToDescription = false; -227 gem = nextLine.substring(NAME.length()); -228if (!map.containsKey(gem)) { -229 map.put(gem, createDependencyForGem(engine, parentName, fileName, gem)); -230 } -231 dependency = map.get(gem); -232 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -233 } elseif (nextLine.startsWith(VERSION)) { -234 vulnerability = createVulnerability(parentName, dependency, vulnerability, gem, nextLine); -235 } elseif (nextLine.startsWith(ADVISORY)) { -236 setVulnerabilityName(parentName, dependency, vulnerability, nextLine); -237 } elseif (nextLine.startsWith(CRITICALITY)) { -238 addCriticalityToVulnerability(parentName, vulnerability, nextLine); -239 } elseif (nextLine.startsWith("URL: ")) { -240 addReferenceToVulnerability(parentName, vulnerability, nextLine); -241 } elseif (nextLine.startsWith("Description:")) { -242 appendToDescription = true; -243if (null != vulnerability) { -244 vulnerability.setDescription("*** Vulnerability obtained from bundle-audit verbose report. Title link may not work. CPE below is guessed. CVSS score is estimated (-1.0 indicates unknown). See link below for full details. *** "); -245 } -246 } elseif (appendToDescription) { -247if (null != vulnerability) { -248 vulnerability.setDescription(vulnerability.getDescription() + nextLine + "\n"); -249 } -250 } -251 } -252 } -253 -254privatevoid setVulnerabilityName(String parentName, Dependency dependency, Vulnerability vulnerability, String nextLine) { -255final String advisory = nextLine.substring((ADVISORY.length())); -256if (null != vulnerability) { -257 vulnerability.setName(advisory); -258 } -259if (null != dependency) { -260 dependency.getVulnerabilities().add(vulnerability); // needed to wait for vulnerability name to avoid NPE -261 } -262 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -263 } -264 -265privatevoid addReferenceToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { -266final String url = nextLine.substring(("URL: ").length()); -267if (null != vulnerability) { -268Reference ref = newReference(); -269 ref.setName(vulnerability.getName()); -270 ref.setSource("bundle-audit"); -271 ref.setUrl(url); -272 vulnerability.getReferences().add(ref); -273 } -274 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -275 } -276 -277privatevoid addCriticalityToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { -278if (null != vulnerability) { -279final String criticality = nextLine.substring(CRITICALITY.length()).trim(); -280if ("High".equals(criticality)) { -281 vulnerability.setCvssScore(8.5f); -282 } elseif ("Medium".equals(criticality)) { -283 vulnerability.setCvssScore(5.5f); -284 } elseif ("Low".equals(criticality)) { -285 vulnerability.setCvssScore(2.0f); -286 } else { -287 vulnerability.setCvssScore(-1.0f); -288 } +171protected String getAnalyzerEnabledSettingKey() { +172return Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED; +173 } +174 +175/** +176 * If {@link #analyzeFileType(Dependency, Engine)} is called, then we have successfully initialized, and it will be necessary +177 * to disable {@link RubyGemspecAnalyzer}. +178 */ +179privateboolean needToDisableGemspecAnalyzer = true; +180 +181 @Override +182protectedvoid analyzeFileType(Dependency dependency, Engine engine) +183throwsAnalysisException { +184if (needToDisableGemspecAnalyzer) { +185boolean failed = true; +186final String className = RubyGemspecAnalyzer.class.getName(); +187for (FileTypeAnalyzer analyzer : engine.getFileTypeAnalyzers()) { +188if (analyzer instanceof RubyGemspecAnalyzer) { +189 ((RubyGemspecAnalyzer) analyzer).setEnabled(false); +190 LOGGER.info("Disabled " + className + " to avoid noisy duplicate results."); +191 failed = false; +192 } +193 } +194if (failed) { +195 LOGGER.warn("Did not find" + className + '.'); +196 } +197 needToDisableGemspecAnalyzer = false; +198 } +199final File parentFile = dependency.getActualFile().getParentFile(); +200final Process process = launchBundleAudit(parentFile); +201try { +202 process.waitFor(); +203 } catch (InterruptedException ie) { +204thrownewAnalysisException("bundle-audit process interrupted", ie); +205 } +206 BufferedReader rdr = null; +207try { +208 BufferedReader errReader = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); +209while(errReader.ready()) { +210 String error = errReader.readLine(); +211 LOGGER.warn(error); +212 } +213 rdr = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8")); +214 processBundlerAuditOutput(dependency, engine, rdr); +215 } catch (IOException ioe) { +216 LOGGER.warn("bundle-audit failure", ioe); +217 } finally { +218if (null != rdr) { +219try { +220 rdr.close(); +221 } catch (IOException ioe) { +222 LOGGER.warn("bundle-audit close failure", ioe); +223 } +224 } +225 } +226 +227 } +228 +229privatevoid processBundlerAuditOutput(Dependency original, Engine engine, BufferedReader rdr) throws IOException { +230final String parentName = original.getActualFile().getParentFile().getName(); +231final String fileName = original.getFileName(); +232Dependency dependency = null; +233Vulnerability vulnerability = null; +234 String gem = null; +235final Map<String, Dependency> map = new HashMap<String, Dependency>(); +236boolean appendToDescription = false; +237while (rdr.ready()) { +238final String nextLine = rdr.readLine(); +239if (null == nextLine) { +240break; +241 } elseif (nextLine.startsWith(NAME)) { +242 appendToDescription = false; +243 gem = nextLine.substring(NAME.length()); +244if (!map.containsKey(gem)) { +245 map.put(gem, createDependencyForGem(engine, parentName, fileName, gem)); +246 } +247 dependency = map.get(gem); +248 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +249 } elseif (nextLine.startsWith(VERSION)) { +250 vulnerability = createVulnerability(parentName, dependency, vulnerability, gem, nextLine); +251 } elseif (nextLine.startsWith(ADVISORY)) { +252 setVulnerabilityName(parentName, dependency, vulnerability, nextLine); +253 } elseif (nextLine.startsWith(CRITICALITY)) { +254 addCriticalityToVulnerability(parentName, vulnerability, nextLine); +255 } elseif (nextLine.startsWith("URL: ")) { +256 addReferenceToVulnerability(parentName, vulnerability, nextLine); +257 } elseif (nextLine.startsWith("Description:")) { +258 appendToDescription = true; +259if (null != vulnerability) { +260 vulnerability.setDescription("*** Vulnerability obtained from bundle-audit verbose report. Title link may not work. CPE below is guessed. CVSS score is estimated (-1.0 indicates unknown). See link below for full details. *** "); +261 } +262 } elseif (appendToDescription) { +263if (null != vulnerability) { +264 vulnerability.setDescription(vulnerability.getDescription() + nextLine + "\n"); +265 } +266 } +267 } +268 } +269 +270privatevoid setVulnerabilityName(String parentName, Dependency dependency, Vulnerability vulnerability, String nextLine) { +271final String advisory = nextLine.substring((ADVISORY.length())); +272if (null != vulnerability) { +273 vulnerability.setName(advisory); +274 } +275if (null != dependency) { +276 dependency.getVulnerabilities().add(vulnerability); // needed to wait for vulnerability name to avoid NPE +277 } +278 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +279 } +280 +281privatevoid addReferenceToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { +282final String url = nextLine.substring(("URL: ").length()); +283if (null != vulnerability) { +284Reference ref = newReference(); +285 ref.setName(vulnerability.getName()); +286 ref.setSource("bundle-audit"); +287 ref.setUrl(url); +288 vulnerability.getReferences().add(ref); 289 } 290 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); 291 } 292 -293privateVulnerability createVulnerability(String parentName, Dependency dependency, Vulnerability vulnerability, String gem, String nextLine) { -294if (null != dependency) { -295final String version = nextLine.substring(VERSION.length()); -296 dependency.getVersionEvidence().addEvidence( -297"bundler-audit", -298"Version", -299 version, -300 Confidence.HIGHEST); -301 vulnerability = newVulnerability(); // don't add to dependency until we have name set later -302 vulnerability.setMatchedCPE( -303 String.format("cpe:/a:%1$s_project:%1$s:%2$s::~~~ruby~~", gem, version), -304null); -305 vulnerability.setCvssAccessVector("-"); -306 vulnerability.setCvssAccessComplexity("-"); -307 vulnerability.setCvssAuthentication("-"); -308 vulnerability.setCvssAvailabilityImpact("-"); -309 vulnerability.setCvssConfidentialityImpact("-"); -310 vulnerability.setCvssIntegrityImpact("-"); -311 } -312 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); -313return vulnerability; -314 } -315 -316privateDependency createDependencyForGem(Engine engine, String parentName, String fileName, String gem) throws IOException { -317final File tempFile = File.createTempFile("Gemfile-" + gem, ".lock", Settings.getTempDirectory()); -318final String displayFileName = String.format("%s%c%s:%s", parentName, File.separatorChar, fileName, gem); -319 FileUtils.write(tempFile, displayFileName); // unique contents to avoid dependency bundling -320finalDependency dependency = newDependency(tempFile); -321 dependency.getProductEvidence().addEvidence("bundler-audit", "Name", gem, Confidence.HIGHEST); -322 dependency.setDisplayFileName(displayFileName); -323 engine.getDependencies().add(dependency); -324return dependency; -325 } -326 } +293privatevoid addCriticalityToVulnerability(String parentName, Vulnerability vulnerability, String nextLine) { +294if (null != vulnerability) { +295final String criticality = nextLine.substring(CRITICALITY.length()).trim(); +296if ("High".equals(criticality)) { +297 vulnerability.setCvssScore(8.5f); +298 } elseif ("Medium".equals(criticality)) { +299 vulnerability.setCvssScore(5.5f); +300 } elseif ("Low".equals(criticality)) { +301 vulnerability.setCvssScore(2.0f); +302 } else { +303 vulnerability.setCvssScore(-1.0f); +304 } +305 } +306 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +307 } +308 +309privateVulnerability createVulnerability(String parentName, Dependency dependency, Vulnerability vulnerability, String gem, String nextLine) { +310if (null != dependency) { +311final String version = nextLine.substring(VERSION.length()); +312 dependency.getVersionEvidence().addEvidence( +313"bundler-audit", +314"Version", +315 version, +316 Confidence.HIGHEST); +317 vulnerability = newVulnerability(); // don't add to dependency until we have name set later +318 vulnerability.setMatchedCPE( +319 String.format("cpe:/a:%1$s_project:%1$s:%2$s::~~~ruby~~", gem, version), +320null); +321 vulnerability.setCvssAccessVector("-"); +322 vulnerability.setCvssAccessComplexity("-"); +323 vulnerability.setCvssAuthentication("-"); +324 vulnerability.setCvssAvailabilityImpact("-"); +325 vulnerability.setCvssConfidentialityImpact("-"); +326 vulnerability.setCvssIntegrityImpact("-"); +327 } +328 LOGGER.debug(String.format("bundle-audit (%s): %s", parentName, nextLine)); +329return vulnerability; +330 } +331 +332privateDependency createDependencyForGem(Engine engine, String parentName, String fileName, String gem) throws IOException { +333final File tempFile = File.createTempFile("Gemfile-" + gem, ".lock", Settings.getTempDirectory()); +334final String displayFileName = String.format("%s%c%s:%s", parentName, File.separatorChar, fileName, gem); +335 FileUtils.write(tempFile, displayFileName); // unique contents to avoid dependency bundling +336finalDependency dependency = newDependency(tempFile); +337 dependency.getProductEvidence().addEvidence("bundler-audit", "Name", gem, Confidence.HIGHEST); +338 dependency.setDisplayFileName(displayFileName); +339 engine.getDependencies().add(dependency); +340return dependency; +341 } +342 }
    diff --git a/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html b/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html index c07a1caf7..9ff0fa0d1 100644 --- a/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html +++ b/xref/org/owasp/dependencycheck/analyzer/exception/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.analyzer.exception + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.analyzer.exception diff --git a/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html b/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html index e63df66e9..0416afff2 100644 --- a/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html +++ b/xref/org/owasp/dependencycheck/analyzer/exception/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.analyzer.exception + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.analyzer.exception diff --git a/xref/org/owasp/dependencycheck/analyzer/package-frame.html b/xref/org/owasp/dependencycheck/analyzer/package-frame.html index 1846e86ca..b61b55652 100644 --- a/xref/org/owasp/dependencycheck/analyzer/package-frame.html +++ b/xref/org/owasp/dependencycheck/analyzer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/xref/org/owasp/dependencycheck/analyzer/package-summary.html b/xref/org/owasp/dependencycheck/analyzer/package-summary.html index d53b79bf5..a71547779 100644 --- a/xref/org/owasp/dependencycheck/analyzer/package-summary.html +++ b/xref/org/owasp/dependencycheck/analyzer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.analyzer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.analyzer diff --git a/xref/org/owasp/dependencycheck/ant/logging/package-frame.html b/xref/org/owasp/dependencycheck/ant/logging/package-frame.html index 7a15a2203..2f438e787 100644 --- a/xref/org/owasp/dependencycheck/ant/logging/package-frame.html +++ b/xref/org/owasp/dependencycheck/ant/logging/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.ant.logging + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.ant.logging diff --git a/xref/org/owasp/dependencycheck/ant/logging/package-summary.html b/xref/org/owasp/dependencycheck/ant/logging/package-summary.html index 266ef46d8..0939b8f5d 100644 --- a/xref/org/owasp/dependencycheck/ant/logging/package-summary.html +++ b/xref/org/owasp/dependencycheck/ant/logging/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.ant.logging + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.ant.logging diff --git a/xref/org/owasp/dependencycheck/data/central/package-frame.html b/xref/org/owasp/dependencycheck/data/central/package-frame.html index 27747af6a..f3342a343 100644 --- a/xref/org/owasp/dependencycheck/data/central/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/central/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/xref/org/owasp/dependencycheck/data/central/package-summary.html b/xref/org/owasp/dependencycheck/data/central/package-summary.html index 08a22c44b..b4248e92c 100644 --- a/xref/org/owasp/dependencycheck/data/central/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/central/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.central + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.central diff --git a/xref/org/owasp/dependencycheck/data/composer/package-frame.html b/xref/org/owasp/dependencycheck/data/composer/package-frame.html index 058d42686..d4a1d784a 100644 --- a/xref/org/owasp/dependencycheck/data/composer/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/composer/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/xref/org/owasp/dependencycheck/data/composer/package-summary.html b/xref/org/owasp/dependencycheck/data/composer/package-summary.html index 7678a5760..28057f2c1 100644 --- a/xref/org/owasp/dependencycheck/data/composer/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/composer/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.composer + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.composer diff --git a/xref/org/owasp/dependencycheck/data/cpe/package-frame.html b/xref/org/owasp/dependencycheck/data/cpe/package-frame.html index 8dcc7e346..32901ea46 100644 --- a/xref/org/owasp/dependencycheck/data/cpe/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/cpe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/xref/org/owasp/dependencycheck/data/cpe/package-summary.html b/xref/org/owasp/dependencycheck/data/cpe/package-summary.html index 397615fa6..33861c9b1 100644 --- a/xref/org/owasp/dependencycheck/data/cpe/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/cpe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cpe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cpe diff --git a/xref/org/owasp/dependencycheck/data/cwe/package-frame.html b/xref/org/owasp/dependencycheck/data/cwe/package-frame.html index c00e21564..8e0b5afe5 100644 --- a/xref/org/owasp/dependencycheck/data/cwe/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/cwe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/xref/org/owasp/dependencycheck/data/cwe/package-summary.html b/xref/org/owasp/dependencycheck/data/cwe/package-summary.html index b12c4876f..679ca2f14 100644 --- a/xref/org/owasp/dependencycheck/data/cwe/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/cwe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.cwe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.cwe diff --git a/xref/org/owasp/dependencycheck/data/lucene/package-frame.html b/xref/org/owasp/dependencycheck/data/lucene/package-frame.html index a4d2026ec..97579b1d0 100644 --- a/xref/org/owasp/dependencycheck/data/lucene/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/lucene/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/xref/org/owasp/dependencycheck/data/lucene/package-summary.html b/xref/org/owasp/dependencycheck/data/lucene/package-summary.html index bd59d60ec..c4c847c77 100644 --- a/xref/org/owasp/dependencycheck/data/lucene/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/lucene/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.lucene + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.lucene diff --git a/xref/org/owasp/dependencycheck/data/nexus/package-frame.html b/xref/org/owasp/dependencycheck/data/nexus/package-frame.html index 6f719d083..477b2dcdb 100644 --- a/xref/org/owasp/dependencycheck/data/nexus/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/nexus/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/xref/org/owasp/dependencycheck/data/nexus/package-summary.html b/xref/org/owasp/dependencycheck/data/nexus/package-summary.html index 21f5ab696..b4c4f90dc 100644 --- a/xref/org/owasp/dependencycheck/data/nexus/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/nexus/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nexus + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nexus diff --git a/xref/org/owasp/dependencycheck/data/nuget/package-frame.html b/xref/org/owasp/dependencycheck/data/nuget/package-frame.html index e1c42611d..e31f1d89e 100644 --- a/xref/org/owasp/dependencycheck/data/nuget/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/nuget/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/xref/org/owasp/dependencycheck/data/nuget/package-summary.html b/xref/org/owasp/dependencycheck/data/nuget/package-summary.html index 02fdf04f1..75e39d3a5 100644 --- a/xref/org/owasp/dependencycheck/data/nuget/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/nuget/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nuget + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nuget diff --git a/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html b/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html index cb0146ebe..724ed3187 100644 --- a/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/nvdcve/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html b/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html index 6fcb0d37e..691167729 100644 --- a/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/nvdcve/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.nvdcve + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.nvdcve diff --git a/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html b/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html index 313f0dc23..f1598414b 100644 --- a/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/update/cpe/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.cpe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.cpe diff --git a/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html b/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html index 9732e678f..c789246fd 100644 --- a/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/update/cpe/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.cpe + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.cpe diff --git a/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html b/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html index 6ec14b2f5..637de6283 100644 --- a/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/update/exception/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.exception + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.exception diff --git a/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html b/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html index 3b98f7f2b..dcf7ccad3 100644 --- a/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/update/exception/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.exception + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.exception diff --git a/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html b/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html index 76f7af378..b03ff3669 100644 --- a/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/update/nvd/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html b/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html index efb51cba4..f7a120f0f 100644 --- a/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/update/nvd/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update.nvd + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update.nvd diff --git a/xref/org/owasp/dependencycheck/data/update/package-frame.html b/xref/org/owasp/dependencycheck/data/update/package-frame.html index 2c337fb53..b10f2eb67 100644 --- a/xref/org/owasp/dependencycheck/data/update/package-frame.html +++ b/xref/org/owasp/dependencycheck/data/update/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/xref/org/owasp/dependencycheck/data/update/package-summary.html b/xref/org/owasp/dependencycheck/data/update/package-summary.html index 2355e83b6..90c225760 100644 --- a/xref/org/owasp/dependencycheck/data/update/package-summary.html +++ b/xref/org/owasp/dependencycheck/data/update/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.data.update + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.data.update diff --git a/xref/org/owasp/dependencycheck/dependency/package-frame.html b/xref/org/owasp/dependencycheck/dependency/package-frame.html index 8cb23adaf..7dd40873a 100644 --- a/xref/org/owasp/dependencycheck/dependency/package-frame.html +++ b/xref/org/owasp/dependencycheck/dependency/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/xref/org/owasp/dependencycheck/dependency/package-summary.html b/xref/org/owasp/dependencycheck/dependency/package-summary.html index f23c40a73..5cebcd1c2 100644 --- a/xref/org/owasp/dependencycheck/dependency/package-summary.html +++ b/xref/org/owasp/dependencycheck/dependency/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.dependency + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.dependency diff --git a/xref/org/owasp/dependencycheck/exception/package-frame.html b/xref/org/owasp/dependencycheck/exception/package-frame.html index fb9bbd3ec..24b0e17a2 100644 --- a/xref/org/owasp/dependencycheck/exception/package-frame.html +++ b/xref/org/owasp/dependencycheck/exception/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.exception + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.exception diff --git a/xref/org/owasp/dependencycheck/exception/package-summary.html b/xref/org/owasp/dependencycheck/exception/package-summary.html index 758459949..83ff5ea0a 100644 --- a/xref/org/owasp/dependencycheck/exception/package-summary.html +++ b/xref/org/owasp/dependencycheck/exception/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.exception + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.exception diff --git a/xref/org/owasp/dependencycheck/maven/AggregateMojo.html b/xref/org/owasp/dependencycheck/maven/AggregateMojo.html index aae3e9116..bfc775f08 100644 --- a/xref/org/owasp/dependencycheck/maven/AggregateMojo.html +++ b/xref/org/owasp/dependencycheck/maven/AggregateMojo.html @@ -136,7 +136,7 @@ 128/**129 * Gets the last project in the reactor - taking into account skipped projects.130 * -131 * @return the last projecct in the reactor +131 * @return the last project in the reactor132 */133private MavenProject getLastProject() { 134for (int x = getReactorProjects().size() - 1; x >= 0; x--) { @@ -157,7 +157,7 @@ 149 */150privateboolean skipProject(MavenProject project) { 151final String skip = (String) project.getProperties().get("maven.site.skip"); -152return"true".equalsIgnoreCase(skip); +152return"true".equalsIgnoreCase(skip) && isGeneratingSite(); 153 } 154155/** diff --git a/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html b/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html index c085090a6..2d3f0e1f0 100644 --- a/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html +++ b/xref/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.html @@ -395,695 +395,712 @@ 387 */388 @Override 389publicvoid execute() throws MojoExecutionException, MojoFailureException { -390if (skip) { -391 getLog().info("Skipping " + getName(Locale.US)); -392 } else { -393 validateAggregate(); -394 project.setContextValue(getOutputDirectoryContextKey(), this.outputDirectory); -395 runCheck(); -396 } -397 } -398 -399/** -400 * Checks if the aggregate configuration parameter has been set to true. If it has a MojoExecutionException is thrown because -401 * the aggregate configuration parameter is no longer supported. -402 * -403 * @throws MojoExecutionException thrown if aggregate is set to true -404 */ -405privatevoid validateAggregate() throws MojoExecutionException { -406if (aggregate != null && aggregate) { -407final String msg = "Aggregate configuration detected - as of dependency-check 1.2.8 this no longer supported. " -408 + "Please use the aggregate goal instead."; -409thrownew MojoExecutionException(msg); -410 } -411 } -412 -413/** -414 * Generates the Dependency-Check Site Report. -415 * -416 * @param sink the sink to write the report to -417 * @param locale the locale to use when generating the report -418 * @throws MavenReportException if a maven report exception occurs -419 * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead. -420 */ -421 @Override -422 @Deprecated -423publicfinalvoid generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException { -424 generate((Sink) sink, locale); -425 } -426 -427/** -428 * Generates the Dependency-Check Site Report. -429 * -430 * @param sink the sink to write the report to -431 * @param locale the locale to use when generating the report -432 * @throws MavenReportException if a maven report exception occurs -433 */ -434publicvoid generate(Sink sink, Locale locale) throws MavenReportException { -435try { -436 validateAggregate(); -437 } catch (MojoExecutionException ex) { -438thrownew MavenReportException(ex.getMessage()); -439 } -440 project.setContextValue(getOutputDirectoryContextKey(), getReportOutputDirectory()); -441try { -442 runCheck(); -443 } catch (MojoExecutionException ex) { -444thrownew MavenReportException(ex.getMessage(), ex); -445 } catch (MojoFailureException ex) { -446 getLog().warn("Vulnerabilities were identifies that exceed the CVSS threshold for failing the build"); -447 } -448 } -449 -450/** -451 * Returns the correct output directory depending on if a site is being executed or not. -452 * -453 * @return the directory to write the report(s) -454 * @throws MojoExecutionException thrown if there is an error loading the file path -455 */ -456protected File getCorrectOutputDirectory() throws MojoExecutionException { -457return getCorrectOutputDirectory(this.project); -458 } -459 -460/** -461 * Returns the correct output directory depending on if a site is being executed or not. -462 * -463 * @param current the Maven project to get the output directory from -464 * @return the directory to write the report(s) -465 */ -466protected File getCorrectOutputDirectory(MavenProject current) { -467final Object obj = current.getContextValue(getOutputDirectoryContextKey()); -468if (obj != null && obj instanceof File) { -469return (File) obj; -470 } -471 File target = new File(current.getBuild().getDirectory()); -472if (target.getParentFile() != null && "target".equals(target.getParentFile().getName())) { -473 target = target.getParentFile(); -474 } -475return target; -476 } -477 -478/** -479 * Returns the correct output directory depending on if a site is being executed or not. -480 * -481 * @param current the Maven project to get the output directory from -482 * @return the directory to write the report(s) -483 */ -484protected File getDataFile(MavenProject current) { -485if (getLog().isDebugEnabled()) { -486 getLog().debug(String.format("Getting data filefor %s using key '%s'", current.getName(), getDataFileContextKey())); -487 } -488final Object obj = current.getContextValue(getDataFileContextKey()); -489if (obj != null) { -490if (obj instanceof String) { -491final File f = new File((String) obj); -492return f; -493 } -494 } else { -495if (getLog().isDebugEnabled()) { -496 getLog().debug("Context value not found"); -497 } -498 } -499returnnull; -500 } -501 -502/** -503 * Scans the project's artifacts and adds them to the engine's dependency list. -504 * -505 * @param project the project to scan the dependencies of -506 * @param engine the engine to use to scan the dependencies -507 */ -508protectedvoid scanArtifacts(MavenProject project, Engine engine) { -509for (Artifact a : project.getArtifacts()) { -510if (excludeFromScan(a)) { -511continue; -512 } -513final List<Dependency> deps = engine.scan(a.getFile().getAbsoluteFile()); -514if (deps != null) { -515if (deps.size() == 1) { -516finalDependency d = deps.get(0); -517if (d != null) { -518finalMavenArtifact ma = newMavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion()); -519 d.addAsEvidence("pom", ma, Confidence.HIGHEST); -520 d.addProjectReference(project.getName()); -521if (getLog().isDebugEnabled()) { -522 getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(), -523 d.getDisplayFileName())); -524 } -525 } -526 } else { -527if (getLog().isDebugEnabled()) { -528final String msg = String.format("More then 1 dependency was identified in first pass scan of '%s:%s:%s'", -529 a.getGroupId(), a.getArtifactId(), a.getVersion()); -530 getLog().debug(msg); -531 } -532 } -533 } -534 } -535 } -536 -537/** -538 * Executes the dependency-check scan and generates the necassary report. -539 * -540 * @throws MojoExecutionException thrown if there is an exception running the scan -541 * @throws MojoFailureException thrown if dependency-check is configured to fail the build -542 */ -543publicabstractvoid runCheck() throws MojoExecutionException, MojoFailureException; -544 -545/** -546 * Sets the Reporting output directory. -547 * -548 * @param directory the output directory -549 */ -550 @Override -551publicvoid setReportOutputDirectory(File directory) { -552 reportOutputDirectory = directory; -553 } -554 -555/** -556 * Returns the report output directory. -557 * -558 * @return the report output directory -559 */ -560 @Override -561public File getReportOutputDirectory() { -562return reportOutputDirectory; -563 } -564 -565/** -566 * Returns the output directory. -567 * -568 * @return the output directory -569 */ -570public File getOutputDirectory() { -571return outputDirectory; -572 } -573 -574/** -575 * Returns whether this is an external report. This method always returns true. -576 * -577 * @return <code>true</code> -578 */ -579 @Override -580publicfinalboolean isExternalReport() { -581returntrue; -582 } -583 -584/** -585 * Returns the output name. -586 * -587 * @return the output name -588 */ -589 @Override -590public String getOutputName() { -591if ("HTML".equalsIgnoreCase(this.format) || "ALL".equalsIgnoreCase(this.format)) { -592return"dependency-check-report"; -593 } elseif ("XML".equalsIgnoreCase(this.format)) { -594return"dependency-check-report.xml#"; -595 } elseif ("VULN".equalsIgnoreCase(this.format)) { -596return"dependency-check-vulnerability"; -597 } else { -598 getLog().warn("Unknown report format used during site generation."); -599return"dependency-check-report"; -600 } -601 } -602 -603/** -604 * Returns the category name. -605 * -606 * @return the category name -607 */ -608 @Override -609public String getCategoryName() { -610return MavenReport.CATEGORY_PROJECT_REPORTS; -611 } -612//</editor-fold> -613 -614/** -615 * Initializes a new <code>Engine</code> that can be used for scanning. -616 * -617 * @return a newly instantiated <code>Engine</code> -618 * @throws DatabaseException thrown if there is a database exception -619 */ -620protectedEngine initializeEngine() throws DatabaseException { -621 populateSettings(); -622returnnewEngine(this.project, -623this.reactorProjects); -624 } -625 -626/** -627 * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties -628 * required to change the proxy url, port, and connection timeout. -629 */ -630protectedvoid populateSettings() { -631 Settings.initialize(); -632 InputStream mojoProperties = null; -633try { -634 mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE); -635 Settings.mergeProperties(mojoProperties); -636 } catch (IOException ex) { -637 getLog().warn("Unable to load the dependency-check ant task.properties file."); -638if (getLog().isDebugEnabled()) { -639 getLog().debug("", ex); -640 } -641 } finally { -642if (mojoProperties != null) { -643try { -644 mojoProperties.close(); -645 } catch (IOException ex) { -646if (getLog().isDebugEnabled()) { -647 getLog().debug("", ex); -648 } -649 } -650 } -651 } -652 Settings.setBooleanIfNotNull(Settings.KEYS.AUTO_UPDATE, autoUpdate); -653 -654if (externalReport != null) { -655 getLog().warn("The 'externalReport' option was set; this configuration option has been removed. " -656 + "Please update the dependency-check-maven plugin's configuration"); -657 } -658 -659if (proxyUrl != null && !proxyUrl.isEmpty()) { -660 getLog().warn("Deprecated configuration detected, proxyUrl will be ignored; use the maven settings " + "to configure the proxy instead"); -661 } -662final Proxy proxy = getMavenProxy(); -663if (proxy != null) { -664 Settings.setString(Settings.KEYS.PROXY_SERVER, proxy.getHost()); -665 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort())); -666final String userName = proxy.getUsername(); -667final String password = proxy.getPassword(); -668 Settings.setStringIfNotNull(Settings.KEYS.PROXY_USERNAME, userName); -669 Settings.setStringIfNotNull(Settings.KEYS.PROXY_PASSWORD, password); -670 Settings.setStringIfNotNull(Settings.KEYS.PROXY_NON_PROXY_HOSTS, proxy.getNonProxyHosts()); -671 } -672 -673 Settings.setStringIfNotEmpty(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout); -674 Settings.setStringIfNotEmpty(Settings.KEYS.SUPPRESSION_FILE, suppressionFile); -675 -676//File Type Analyzer Settings -677 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled); -678 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled); -679 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled); -680 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled); -681 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl); -682 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_USES_PROXY, nexusUsesProxy); -683 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled); -684 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled); -685 Settings.setStringIfNotEmpty(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions); -686 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono); -687 -688 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_DISTRIBUTION_ENABLED, pyDistributionAnalyzerEnabled); -689 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_PACKAGE_ENABLED, pyPackageAnalyzerEnabled); -690 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, rubygemsAnalyzerEnabled); -691 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, opensslAnalyzerEnabled); -692 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CMAKE_ENABLED, cmakeAnalyzerEnabled); -693 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_AUTOCONF_ENABLED, autoconfAnalyzerEnabled); -694 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_COMPOSER_LOCK_ENABLED, composerAnalyzerEnabled); -695 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, nodeAnalyzerEnabled); -696 -697//Database configuration -698 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName); -699 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath); -700 Settings.setStringIfNotEmpty(Settings.KEYS.DB_CONNECTION_STRING, connectionString); -701 -702if (databaseUser == null && databasePassword == null && serverId != null) { -703final Server server = settingsXml.getServer(serverId); -704if (server != null) { -705 databaseUser = server.getUsername(); -706try { -707//The following fix was copied from: -708// https://github.com/bsorrentino/maven-confluence-plugin/blob/master/maven-confluence-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/AbstractBaseConfluenceMojo.java -709// -710// FIX to resolve -711// org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException: -712// java.io.FileNotFoundException: ~/.settings-security.xml (No such file or directory) -713// -714if (securityDispatcher instanceof DefaultSecDispatcher) { -715 ((DefaultSecDispatcher) securityDispatcher).setConfigurationFile("~/.m2/settings-security.xml"); -716 } +390 generatingSite = false; +391if (skip) { +392 getLog().info("Skipping " + getName(Locale.US)); +393 } else { +394 validateAggregate(); +395 project.setContextValue(getOutputDirectoryContextKey(), this.outputDirectory); +396 runCheck(); +397 } +398 } +399 +400/** +401 * Checks if the aggregate configuration parameter has been set to true. If it has a MojoExecutionException is thrown because +402 * the aggregate configuration parameter is no longer supported. +403 * +404 * @throws MojoExecutionException thrown if aggregate is set to true +405 */ +406privatevoid validateAggregate() throws MojoExecutionException { +407if (aggregate != null && aggregate) { +408final String msg = "Aggregate configuration detected - as of dependency-check 1.2.8 this no longer supported. " +409 + "Please use the aggregate goal instead."; +410thrownew MojoExecutionException(msg); +411 } +412 } +413 +414/** +415 * Generates the Dependency-Check Site Report. +416 * +417 * @param sink the sink to write the report to +418 * @param locale the locale to use when generating the report +419 * @throws MavenReportException if a maven report exception occurs +420 * @deprecated use {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)} instead. +421 */ +422 @Override +423 @Deprecated +424publicfinalvoid generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException { +425 generate((Sink) sink, locale); +426 } +427 +428/** +429 * A flag indicating whether or not the maven site is being generated. +430 */ +431privateboolean generatingSite = false; +432 +433/** +434 * Returns true if the Maven site is being generated. +435 * +436 * @return true if the Maven site is being generated +437 */ +438protectedboolean isGeneratingSite() { +439return generatingSite; +440 } +441 +442/** +443 * Generates the Dependency-Check Site Report. +444 * +445 * @param sink the sink to write the report to +446 * @param locale the locale to use when generating the report +447 * @throws MavenReportException if a maven report exception occurs +448 */ +449publicvoid generate(Sink sink, Locale locale) throws MavenReportException { +450 generatingSite = true; +451try { +452 validateAggregate(); +453 } catch (MojoExecutionException ex) { +454thrownew MavenReportException(ex.getMessage()); +455 } +456 project.setContextValue(getOutputDirectoryContextKey(), getReportOutputDirectory()); +457try { +458 runCheck(); +459 } catch (MojoExecutionException ex) { +460thrownew MavenReportException(ex.getMessage(), ex); +461 } catch (MojoFailureException ex) { +462 getLog().warn("Vulnerabilities were identifies that exceed the CVSS threshold for failing the build"); +463 } +464 } +465 +466/** +467 * Returns the correct output directory depending on if a site is being executed or not. +468 * +469 * @return the directory to write the report(s) +470 * @throws MojoExecutionException thrown if there is an error loading the file path +471 */ +472protected File getCorrectOutputDirectory() throws MojoExecutionException { +473return getCorrectOutputDirectory(this.project); +474 } +475 +476/** +477 * Returns the correct output directory depending on if a site is being executed or not. +478 * +479 * @param current the Maven project to get the output directory from +480 * @return the directory to write the report(s) +481 */ +482protected File getCorrectOutputDirectory(MavenProject current) { +483final Object obj = current.getContextValue(getOutputDirectoryContextKey()); +484if (obj != null && obj instanceof File) { +485return (File) obj; +486 } +487 File target = new File(current.getBuild().getDirectory()); +488if (target.getParentFile() != null && "target".equals(target.getParentFile().getName())) { +489 target = target.getParentFile(); +490 } +491return target; +492 } +493 +494/** +495 * Returns the correct output directory depending on if a site is being executed or not. +496 * +497 * @param current the Maven project to get the output directory from +498 * @return the directory to write the report(s) +499 */ +500protected File getDataFile(MavenProject current) { +501if (getLog().isDebugEnabled()) { +502 getLog().debug(String.format("Getting data filefor %s using key '%s'", current.getName(), getDataFileContextKey())); +503 } +504final Object obj = current.getContextValue(getDataFileContextKey()); +505if (obj != null) { +506if (obj instanceof String) { +507final File f = new File((String) obj); +508return f; +509 } +510 } else { +511if (getLog().isDebugEnabled()) { +512 getLog().debug("Context value not found"); +513 } +514 } +515returnnull; +516 } +517 +518/** +519 * Scans the project's artifacts and adds them to the engine's dependency list. +520 * +521 * @param project the project to scan the dependencies of +522 * @param engine the engine to use to scan the dependencies +523 */ +524protectedvoid scanArtifacts(MavenProject project, Engine engine) { +525for (Artifact a : project.getArtifacts()) { +526if (excludeFromScan(a)) { +527continue; +528 } +529final List<Dependency> deps = engine.scan(a.getFile().getAbsoluteFile()); +530if (deps != null) { +531if (deps.size() == 1) { +532finalDependency d = deps.get(0); +533if (d != null) { +534finalMavenArtifact ma = newMavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion()); +535 d.addAsEvidence("pom", ma, Confidence.HIGHEST); +536 d.addProjectReference(project.getName()); +537if (getLog().isDebugEnabled()) { +538 getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(), +539 d.getDisplayFileName())); +540 } +541 } +542 } else { +543if (getLog().isDebugEnabled()) { +544final String msg = String.format("More then 1 dependency was identified in first pass scan of '%s:%s:%s'", +545 a.getGroupId(), a.getArtifactId(), a.getVersion()); +546 getLog().debug(msg); +547 } +548 } +549 } +550 } +551 } +552 +553/** +554 * Executes the dependency-check scan and generates the necassary report. +555 * +556 * @throws MojoExecutionException thrown if there is an exception running the scan +557 * @throws MojoFailureException thrown if dependency-check is configured to fail the build +558 */ +559publicabstractvoid runCheck() throws MojoExecutionException, MojoFailureException; +560 +561/** +562 * Sets the Reporting output directory. +563 * +564 * @param directory the output directory +565 */ +566 @Override +567publicvoid setReportOutputDirectory(File directory) { +568 reportOutputDirectory = directory; +569 } +570 +571/** +572 * Returns the report output directory. +573 * +574 * @return the report output directory +575 */ +576 @Override +577public File getReportOutputDirectory() { +578return reportOutputDirectory; +579 } +580 +581/** +582 * Returns the output directory. +583 * +584 * @return the output directory +585 */ +586public File getOutputDirectory() { +587return outputDirectory; +588 } +589 +590/** +591 * Returns whether this is an external report. This method always returns true. +592 * +593 * @return <code>true</code> +594 */ +595 @Override +596publicfinalboolean isExternalReport() { +597returntrue; +598 } +599 +600/** +601 * Returns the output name. +602 * +603 * @return the output name +604 */ +605 @Override +606public String getOutputName() { +607if ("HTML".equalsIgnoreCase(this.format) || "ALL".equalsIgnoreCase(this.format)) { +608return"dependency-check-report"; +609 } elseif ("XML".equalsIgnoreCase(this.format)) { +610return"dependency-check-report.xml#"; +611 } elseif ("VULN".equalsIgnoreCase(this.format)) { +612return"dependency-check-vulnerability"; +613 } else { +614 getLog().warn("Unknown report format used during site generation."); +615return"dependency-check-report"; +616 } +617 } +618 +619/** +620 * Returns the category name. +621 * +622 * @return the category name +623 */ +624 @Override +625public String getCategoryName() { +626return MavenReport.CATEGORY_PROJECT_REPORTS; +627 } +628//</editor-fold> +629 +630/** +631 * Initializes a new <code>Engine</code> that can be used for scanning. +632 * +633 * @return a newly instantiated <code>Engine</code> +634 * @throws DatabaseException thrown if there is a database exception +635 */ +636protectedEngine initializeEngine() throws DatabaseException { +637 populateSettings(); +638returnnewEngine(this.project, +639this.reactorProjects); +640 } +641 +642/** +643 * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties +644 * required to change the proxy url, port, and connection timeout. +645 */ +646protectedvoid populateSettings() { +647 Settings.initialize(); +648 InputStream mojoProperties = null; +649try { +650 mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE); +651 Settings.mergeProperties(mojoProperties); +652 } catch (IOException ex) { +653 getLog().warn("Unable to load the dependency-check ant task.properties file."); +654if (getLog().isDebugEnabled()) { +655 getLog().debug("", ex); +656 } +657 } finally { +658if (mojoProperties != null) { +659try { +660 mojoProperties.close(); +661 } catch (IOException ex) { +662if (getLog().isDebugEnabled()) { +663 getLog().debug("", ex); +664 } +665 } +666 } +667 } +668 Settings.setBooleanIfNotNull(Settings.KEYS.AUTO_UPDATE, autoUpdate); +669 +670if (externalReport != null) { +671 getLog().warn("The 'externalReport' option was set; this configuration option has been removed. " +672 + "Please update the dependency-check-maven plugin's configuration"); +673 } +674 +675if (proxyUrl != null && !proxyUrl.isEmpty()) { +676 getLog().warn("Deprecated configuration detected, proxyUrl will be ignored; use the maven settings " + "to configure the proxy instead"); +677 } +678final Proxy proxy = getMavenProxy(); +679if (proxy != null) { +680 Settings.setString(Settings.KEYS.PROXY_SERVER, proxy.getHost()); +681 Settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(proxy.getPort())); +682final String userName = proxy.getUsername(); +683final String password = proxy.getPassword(); +684 Settings.setStringIfNotNull(Settings.KEYS.PROXY_USERNAME, userName); +685 Settings.setStringIfNotNull(Settings.KEYS.PROXY_PASSWORD, password); +686 Settings.setStringIfNotNull(Settings.KEYS.PROXY_NON_PROXY_HOSTS, proxy.getNonProxyHosts()); +687 } +688 +689 Settings.setStringIfNotEmpty(Settings.KEYS.CONNECTION_TIMEOUT, connectionTimeout); +690 Settings.setStringIfNotEmpty(Settings.KEYS.SUPPRESSION_FILE, suppressionFile); +691 +692//File Type Analyzer Settings +693 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_JAR_ENABLED, jarAnalyzerEnabled); +694 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NUSPEC_ENABLED, nuspecAnalyzerEnabled); +695 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CENTRAL_ENABLED, centralAnalyzerEnabled); +696 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_ENABLED, nexusAnalyzerEnabled); +697 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl); +698 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_USES_PROXY, nexusUsesProxy); +699 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ASSEMBLY_ENABLED, assemblyAnalyzerEnabled); +700 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ARCHIVE_ENABLED, archiveAnalyzerEnabled); +701 Settings.setStringIfNotEmpty(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS, zipExtensions); +702 Settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_ASSEMBLY_MONO_PATH, pathToMono); +703 +704 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_DISTRIBUTION_ENABLED, pyDistributionAnalyzerEnabled); +705 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PYTHON_PACKAGE_ENABLED, pyPackageAnalyzerEnabled); +706 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RUBY_GEMSPEC_ENABLED, rubygemsAnalyzerEnabled); +707 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OPENSSL_ENABLED, opensslAnalyzerEnabled); +708 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_CMAKE_ENABLED, cmakeAnalyzerEnabled); +709 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_AUTOCONF_ENABLED, autoconfAnalyzerEnabled); +710 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_COMPOSER_LOCK_ENABLED, composerAnalyzerEnabled); +711 Settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NODE_PACKAGE_ENABLED, nodeAnalyzerEnabled); +712 +713//Database configuration +714 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName); +715 Settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath); +716 Settings.setStringIfNotEmpty(Settings.KEYS.DB_CONNECTION_STRING, connectionString); 717 -718 databasePassword = securityDispatcher.decrypt(server.getPassword()); -719 } catch (SecDispatcherException ex) { -720if (ex.getCause() instanceof FileNotFoundException -721 || (ex.getCause() != null && ex.getCause().getCause() instanceof FileNotFoundException)) { -722//maybe its not encrypted? -723final String tmp = server.getPassword(); -724if (tmp.startsWith("{") && tmp.endsWith("}")) { -725 getLog().error(String.format( -726"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", -727 serverId, ex.getMessage())); -728 } else { -729 databasePassword = tmp; -730 } -731 } else { -732 getLog().error(String.format( -733"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", -734 serverId, ex.getMessage())); -735 } -736 } -737 } else { -738 getLog().error(String.format("Server '%s' not found in the settings.xml file", serverId)); -739 } -740 } -741 -742 Settings.setStringIfNotEmpty(Settings.KEYS.DB_USER, databaseUser); -743 Settings.setStringIfNotEmpty(Settings.KEYS.DB_PASSWORD, databasePassword); -744 Settings.setStringIfNotEmpty(Settings.KEYS.DATA_DIRECTORY, dataDirectory); -745 -746 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified); -747 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified); -748 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base); -749 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base); -750 Settings.setIntIfNotNull(Settings.KEYS.CVE_CHECK_VALID_FOR_HOURS, cveValidForHours); -751 -752 } -753 -754/** -755 * Returns the maven proxy. -756 * -757 * @return the maven proxy -758 */ -759private Proxy getMavenProxy() { -760if (mavenSettings != null) { -761final List<Proxy> proxies = mavenSettings.getProxies(); -762if (proxies != null && !proxies.isEmpty()) { -763if (mavenSettingsProxyId != null) { -764for (Proxy proxy : proxies) { -765if (mavenSettingsProxyId.equalsIgnoreCase(proxy.getId())) { -766return proxy; -767 } -768 } -769 } elseif (proxies.size() == 1) { -770return proxies.get(0); -771 } else { -772 getLog().warn("Multiple proxy definitions exist in the Maven settings. In the dependency-check " -773 + "configuration set the mavenSettingsProxyId so that the correct proxy will be used."); -774thrownew IllegalStateException("Ambiguous proxy definition"); -775 } -776 } -777 } -778returnnull; -779 } -780 -781/** -782 * Tests is the artifact should be included in the scan (i.e. is the dependency in a scope that is being scanned). -783 * -784 * @param a the Artifact to test -785 * @return <code>true</code> if the artifact is in an excluded scope; otherwise <code>false</code> -786 */ -787protectedboolean excludeFromScan(Artifact a) { -788if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) { -789returntrue; -790 } -791if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) { -792returntrue; +718if (databaseUser == null && databasePassword == null && serverId != null) { +719final Server server = settingsXml.getServer(serverId); +720if (server != null) { +721 databaseUser = server.getUsername(); +722try { +723//The following fix was copied from: +724// https://github.com/bsorrentino/maven-confluence-plugin/blob/master/maven-confluence-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/AbstractBaseConfluenceMojo.java +725// +726// FIX to resolve +727// org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException: +728// java.io.FileNotFoundException: ~/.settings-security.xml (No such file or directory) +729// +730if (securityDispatcher instanceof DefaultSecDispatcher) { +731 ((DefaultSecDispatcher) securityDispatcher).setConfigurationFile("~/.m2/settings-security.xml"); +732 } +733 +734 databasePassword = securityDispatcher.decrypt(server.getPassword()); +735 } catch (SecDispatcherException ex) { +736if (ex.getCause() instanceof FileNotFoundException +737 || (ex.getCause() != null && ex.getCause().getCause() instanceof FileNotFoundException)) { +738//maybe its not encrypted? +739final String tmp = server.getPassword(); +740if (tmp.startsWith("{") && tmp.endsWith("}")) { +741 getLog().error(String.format( +742"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", +743 serverId, ex.getMessage())); +744 } else { +745 databasePassword = tmp; +746 } +747 } else { +748 getLog().error(String.format( +749"Unable to decrypt the server password for server id '%s' in settings.xml%n\tCause: %s", +750 serverId, ex.getMessage())); +751 } +752 } +753 } else { +754 getLog().error(String.format("Server '%s' not found in the settings.xml file", serverId)); +755 } +756 } +757 +758 Settings.setStringIfNotEmpty(Settings.KEYS.DB_USER, databaseUser); +759 Settings.setStringIfNotEmpty(Settings.KEYS.DB_PASSWORD, databasePassword); +760 Settings.setStringIfNotEmpty(Settings.KEYS.DATA_DIRECTORY, dataDirectory); +761 +762 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_12_URL, cveUrl12Modified); +763 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_MODIFIED_20_URL, cveUrl20Modified); +764 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_1_2, cveUrl12Base); +765 Settings.setStringIfNotEmpty(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base); +766 Settings.setIntIfNotNull(Settings.KEYS.CVE_CHECK_VALID_FOR_HOURS, cveValidForHours); +767 +768 } +769 +770/** +771 * Returns the maven proxy. +772 * +773 * @return the maven proxy +774 */ +775private Proxy getMavenProxy() { +776if (mavenSettings != null) { +777final List<Proxy> proxies = mavenSettings.getProxies(); +778if (proxies != null && !proxies.isEmpty()) { +779if (mavenSettingsProxyId != null) { +780for (Proxy proxy : proxies) { +781if (mavenSettingsProxyId.equalsIgnoreCase(proxy.getId())) { +782return proxy; +783 } +784 } +785 } elseif (proxies.size() == 1) { +786return proxies.get(0); +787 } else { +788 getLog().warn("Multiple proxy definitions exist in the Maven settings. In the dependency-check " +789 + "configuration set the mavenSettingsProxyId so that the correct proxy will be used."); +790thrownew IllegalStateException("Ambiguous proxy definition"); +791 } +792 } 793 } -794if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) { -795returntrue; -796 } -797return false; -798 } -799 -800/** -801 * Returns a reference to the current project. This method is used instead of auto-binding the project via component -802 * annotation in concrete implementations of this. If the child has a <code>@Component MavenProject project;</code> defined -803 * then the abstract class (i.e. this class) will not have access to the current project (just the way Maven works with the -804 * binding). -805 * -806 * @return returns a reference to the current project -807 */ -808protected MavenProject getProject() { -809return project; -810 } -811 -812/** -813 * Returns the list of Maven Projects in this build. -814 * -815 * @return the list of Maven Projects in this build -816 */ -817protected List<MavenProject> getReactorProjects() { -818return reactorProjects; -819 } -820 -821/** -822 * Returns the report format. -823 * -824 * @return the report format -825 */ -826protected String getFormat() { -827return format; -828 } -829 -830/** -831 * Generates the reports for a given dependency-check engine. -832 * -833 * @param engine a dependency-check engine -834 * @param p the maven project -835 * @param outputDir the directory path to write the report(s). -836 */ -837protectedvoid writeReports(Engine engine, MavenProject p, File outputDir) { -838DatabaseProperties prop = null; -839CveDB cve = null; -840try { -841 cve = newCveDB(); -842 cve.open(); -843 prop = cve.getDatabaseProperties(); -844 } catch (DatabaseException ex) { -845if (getLog().isDebugEnabled()) { -846 getLog().debug("Unable to retrieve DB Properties", ex); -847 } -848 } finally { -849if (cve != null) { -850 cve.close(); -851 } -852 } -853finalReportGenerator r = newReportGenerator(p.getName(), engine.getDependencies(), engine.getAnalyzers(), prop); -854try { -855 r.generateReports(outputDir.getAbsolutePath(), format); -856 } catch (IOException ex) { -857 getLog().error( -858"Unexpected exception occurred during analysis; please see the verbose error log for more details."); -859if (getLog().isDebugEnabled()) { -860 getLog().debug("", ex); -861 } -862 } catch (Throwable ex) { -863 getLog().error( -864"Unexpected exception occurred during analysis; please see the verbose error log for more details."); -865if (getLog().isDebugEnabled()) { -866 getLog().debug("", ex); +794returnnull; +795 } +796 +797/** +798 * Tests is the artifact should be included in the scan (i.e. is the dependency in a scope that is being scanned). +799 * +800 * @param a the Artifact to test +801 * @return <code>true</code> if the artifact is in an excluded scope; otherwise <code>false</code> +802 */ +803protectedboolean excludeFromScan(Artifact a) { +804if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) { +805returntrue; +806 } +807if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) { +808returntrue; +809 } +810if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) { +811returntrue; +812 } +813return false; +814 } +815 +816/** +817 * Returns a reference to the current project. This method is used instead of auto-binding the project via component +818 * annotation in concrete implementations of this. If the child has a <code>@Component MavenProject project;</code> defined +819 * then the abstract class (i.e. this class) will not have access to the current project (just the way Maven works with the +820 * binding). +821 * +822 * @return returns a reference to the current project +823 */ +824protected MavenProject getProject() { +825return project; +826 } +827 +828/** +829 * Returns the list of Maven Projects in this build. +830 * +831 * @return the list of Maven Projects in this build +832 */ +833protected List<MavenProject> getReactorProjects() { +834return reactorProjects; +835 } +836 +837/** +838 * Returns the report format. +839 * +840 * @return the report format +841 */ +842protected String getFormat() { +843return format; +844 } +845 +846/** +847 * Generates the reports for a given dependency-check engine. +848 * +849 * @param engine a dependency-check engine +850 * @param p the maven project +851 * @param outputDir the directory path to write the report(s). +852 */ +853protectedvoid writeReports(Engine engine, MavenProject p, File outputDir) { +854DatabaseProperties prop = null; +855CveDB cve = null; +856try { +857 cve = newCveDB(); +858 cve.open(); +859 prop = cve.getDatabaseProperties(); +860 } catch (DatabaseException ex) { +861if (getLog().isDebugEnabled()) { +862 getLog().debug("Unable to retrieve DB Properties", ex); +863 } +864 } finally { +865if (cve != null) { +866 cve.close(); 867 } 868 } -869 } -870 -871//<editor-fold defaultstate="collapsed" desc="Methods to fail build or show summary"> -872/** -873 * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the -874 * configuration. -875 * -876 * @param dependencies the list of dependency objects -877 * @throws MojoFailureException thrown if a CVSS score is found that is higher then the threshold set -878 */ -879protectedvoid checkForFailure(List<Dependency> dependencies) throws MojoFailureException { -880if (failBuildOnCVSS <= 10) { -881final StringBuilder ids = new StringBuilder(); -882for (Dependency d : dependencies) { -883boolean addName = true; -884for (Vulnerability v : d.getVulnerabilities()) { -885if (v.getCvssScore() >= failBuildOnCVSS) { -886if (addName) { -887 addName = false; -888 ids.append(NEW_LINE).append(d.getFileName()).append(": "); -889 ids.append(v.getName()); -890 } else { -891 ids.append(", ").append(v.getName()); -892 } -893 } -894 } -895 } -896if (ids.length() > 0) { -897final String msg = String.format("%n%nDependency-Check Failure:%n" -898 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n" -899 + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString()); -900thrownew MojoFailureException(msg); -901 } -902 } -903 } -904 -905/** -906 * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries. -907 * -908 * @param mp the Maven project for which the summary is shown -909 * @param dependencies a list of dependency objects -910 */ -911protectedvoid showSummary(MavenProject mp, List<Dependency> dependencies) { -912if (showSummary) { -913final StringBuilder summary = new StringBuilder(); -914for (Dependency d : dependencies) { -915boolean firstEntry = true; -916final StringBuilder ids = new StringBuilder(); -917for (Vulnerability v : d.getVulnerabilities()) { -918if (firstEntry) { -919 firstEntry = false; -920 } else { -921 ids.append(", "); -922 } -923 ids.append(v.getName()); -924 } -925if (ids.length() > 0) { -926 summary.append(d.getFileName()).append(" ("); -927 firstEntry = true; -928for (Identifier id : d.getIdentifiers()) { -929if (firstEntry) { -930 firstEntry = false; -931 } else { -932 summary.append(", "); -933 } -934 summary.append(id.getValue()); -935 } -936 summary.append(") : ").append(ids).append(NEW_LINE); -937 } -938 } -939if (summary.length() > 0) { -940final String msg = String.format("%n%n" + "One or more dependencies were identified with known vulnerabilities in %s:%n%n%s" -941 + "%n%nSee the dependency-check report for more details.%n%n", mp.getName(), summary.toString()); -942 getLog().warn(msg); -943 } -944 } -945 } -946 -947//</editor-fold> -948//<editor-fold defaultstate="collapsed" desc="Methods to read/write the serialized data file"> -949/** -950 * Returns the key used to store the path to the data file that is saved by <code>writeDataFile()</code>. This key is used in -951 * the <code>MavenProject.(set|get)ContextValue</code>. -952 * -953 * @return the key used to store the path to the data file -954 */ -955protected String getDataFileContextKey() { -956return"dependency-check-path-" + dataFileName; -957 } -958 -959/** -960 * Returns the key used to store the path to the output directory. When generating the report in the -961 * <code>executeAggregateReport()</code> the output directory should be obtained by using this key. -962 * -963 * @return the key used to store the path to the output directory -964 */ -965protected String getOutputDirectoryContextKey() { -966return"dependency-output-dir-" + dataFileName; -967 } -968 -969/** -970 * Writes the scan data to disk. This is used to serialize the scan data between the "check" and "aggregate" phase. -971 * -972 * @param mp the mMven project for which the data file was created -973 * @param writeTo the directory to write the data file -974 * @param dependencies the list of dependencies to serialize -975 */ -976protectedvoid writeDataFile(MavenProject mp, File writeTo, List<Dependency> dependencies) { -977 File file; -978//check to see if this was already written out -979if (mp.getContextValue(this.getDataFileContextKey()) == null) { -980if (writeTo == null) { -981 file = new File(mp.getBuild().getDirectory()); -982 file = new File(file, dataFileName); -983 } else { -984 file = new File(writeTo, dataFileName); -985 } -986final File parent = file.getParentFile(); -987if (!parent.isDirectory() && parent.mkdirs()) { -988 getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.", -989 parent.getAbsolutePath())); -990 } -991 -992 ObjectOutputStream out = null; -993try { -994if (dependencies != null) { -995 out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file))); -996 out.writeObject(dependencies); -997 } -998if (getLog().isDebugEnabled()) { -999 getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s", -1000 file.getAbsolutePath(), mp.getName(), this.getDataFileContextKey())); -1001 } -1002 mp.setContextValue(this.getDataFileContextKey(), file.getAbsolutePath()); -1003 } catch (IOException ex) { -1004 getLog().warn("Unable to create data file used for report aggregation; " -1005 + "if report aggregation is being used the results may be incomplete."); -1006if (getLog().isDebugEnabled()) { -1007 getLog().debug(ex.getMessage(), ex); -1008 } -1009 } finally { -1010if (out != null) { -1011try { -1012 out.close(); -1013 } catch (IOException ex) { -1014if (getLog().isDebugEnabled()) { -1015 getLog().debug("ignore", ex); -1016 } -1017 } -1018 } -1019 } -1020 } -1021 } -1022 -1023/** -1024 * Reads the serialized scan data from disk. This is used to serialize the scan data between the "check" and "aggregate" -1025 * phase. -1026 * -1027 * @param project the Maven project to read the data file from -1028 * @return a <code>Engine</code> object populated with dependencies if the serialized data file exists; otherwise -1029 * <code>null</code> is returned -1030 */ -1031protected List<Dependency> readDataFile(MavenProject project) { -1032final Object oPath = project.getContextValue(this.getDataFileContextKey()); -1033if (oPath == null) { -1034returnnull; -1035 } -1036 List<Dependency> ret = null; -1037final String path = (String) oPath; -1038//ObjectInputStream ois = null; -1039ExpectedOjectInputStream ois = null; -1040try { -1041//ois = new ObjectInputStream(new FileInputStream(path)); -1042 ois = newExpectedOjectInputStream(new FileInputStream(path), -1043"java.util.ArrayList", -1044"java.util.HashSet", -1045"java.util.TreeSet", -1046"java.lang.AbstractSet", -1047"java.lang.AbstractCollection", -1048"java.lang.Enum", -1049"org.owasp.dependencycheck.dependency.Confidence", -1050"org.owasp.dependencycheck.dependency.Dependency", -1051"org.owasp.dependencycheck.dependency.Evidence", -1052"org.owasp.dependencycheck.dependency.EvidenceCollection", -1053"org.owasp.dependencycheck.dependency.Identifier", -1054"org.owasp.dependencycheck.dependency.Reference", -1055"org.owasp.dependencycheck.dependency.Vulnerability", -1056"org.owasp.dependencycheck.dependency.VulnerabilityComparator", -1057"org.owasp.dependencycheck.dependency.VulnerableSoftware"); -1058 ret = (List<Dependency>) ois.readObject(); -1059 } catch (FileNotFoundException ex) { -1060//TODO fix logging -1061 getLog().error("", ex); -1062 } catch (IOException ex) { -1063 getLog().error("", ex); -1064 } catch (ClassNotFoundException ex) { -1065 getLog().error("", ex); -1066 } finally { -1067if (ois != null) { -1068try { -1069 ois.close(); -1070 } catch (IOException ex) { -1071 getLog().error("", ex); -1072 } -1073 } -1074 } -1075return ret; -1076 } -1077//</editor-fold> -1078 } +869finalReportGenerator r = newReportGenerator(p.getName(), engine.getDependencies(), engine.getAnalyzers(), prop); +870try { +871 r.generateReports(outputDir.getAbsolutePath(), format); +872 } catch (IOException ex) { +873 getLog().error( +874"Unexpected exception occurred during analysis; please see the verbose error log for more details."); +875if (getLog().isDebugEnabled()) { +876 getLog().debug("", ex); +877 } +878 } catch (Throwable ex) { +879 getLog().error( +880"Unexpected exception occurred during analysis; please see the verbose error log for more details."); +881if (getLog().isDebugEnabled()) { +882 getLog().debug("", ex); +883 } +884 } +885 } +886 +887//<editor-fold defaultstate="collapsed" desc="Methods to fail build or show summary"> +888/** +889 * Checks to see if a vulnerability has been identified with a CVSS score that is above the threshold set in the +890 * configuration. +891 * +892 * @param dependencies the list of dependency objects +893 * @throws MojoFailureException thrown if a CVSS score is found that is higher then the threshold set +894 */ +895protectedvoid checkForFailure(List<Dependency> dependencies) throws MojoFailureException { +896if (failBuildOnCVSS <= 10) { +897final StringBuilder ids = new StringBuilder(); +898for (Dependency d : dependencies) { +899boolean addName = true; +900for (Vulnerability v : d.getVulnerabilities()) { +901if (v.getCvssScore() >= failBuildOnCVSS) { +902if (addName) { +903 addName = false; +904 ids.append(NEW_LINE).append(d.getFileName()).append(": "); +905 ids.append(v.getName()); +906 } else { +907 ids.append(", ").append(v.getName()); +908 } +909 } +910 } +911 } +912if (ids.length() > 0) { +913final String msg = String.format("%n%nDependency-Check Failure:%n" +914 + "One or more dependencies were identified with vulnerabilities that have a CVSS score greater then '%.1f': %s%n" +915 + "See the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString()); +916thrownew MojoFailureException(msg); +917 } +918 } +919 } +920 +921/** +922 * Generates a warning message listing a summary of dependencies and their associated CPE and CVE entries. +923 * +924 * @param mp the Maven project for which the summary is shown +925 * @param dependencies a list of dependency objects +926 */ +927protectedvoid showSummary(MavenProject mp, List<Dependency> dependencies) { +928if (showSummary) { +929final StringBuilder summary = new StringBuilder(); +930for (Dependency d : dependencies) { +931boolean firstEntry = true; +932final StringBuilder ids = new StringBuilder(); +933for (Vulnerability v : d.getVulnerabilities()) { +934if (firstEntry) { +935 firstEntry = false; +936 } else { +937 ids.append(", "); +938 } +939 ids.append(v.getName()); +940 } +941if (ids.length() > 0) { +942 summary.append(d.getFileName()).append(" ("); +943 firstEntry = true; +944for (Identifier id : d.getIdentifiers()) { +945if (firstEntry) { +946 firstEntry = false; +947 } else { +948 summary.append(", "); +949 } +950 summary.append(id.getValue()); +951 } +952 summary.append(") : ").append(ids).append(NEW_LINE); +953 } +954 } +955if (summary.length() > 0) { +956final String msg = String.format("%n%n" + "One or more dependencies were identified with known vulnerabilities in %s:%n%n%s" +957 + "%n%nSee the dependency-check report for more details.%n%n", mp.getName(), summary.toString()); +958 getLog().warn(msg); +959 } +960 } +961 } +962 +963//</editor-fold> +964//<editor-fold defaultstate="collapsed" desc="Methods to read/write the serialized data file"> +965/** +966 * Returns the key used to store the path to the data file that is saved by <code>writeDataFile()</code>. This key is used in +967 * the <code>MavenProject.(set|get)ContextValue</code>. +968 * +969 * @return the key used to store the path to the data file +970 */ +971protected String getDataFileContextKey() { +972return"dependency-check-path-" + dataFileName; +973 } +974 +975/** +976 * Returns the key used to store the path to the output directory. When generating the report in the +977 * <code>executeAggregateReport()</code> the output directory should be obtained by using this key. +978 * +979 * @return the key used to store the path to the output directory +980 */ +981protected String getOutputDirectoryContextKey() { +982return"dependency-output-dir-" + dataFileName; +983 } +984 +985/** +986 * Writes the scan data to disk. This is used to serialize the scan data between the "check" and "aggregate" phase. +987 * +988 * @param mp the mMven project for which the data file was created +989 * @param writeTo the directory to write the data file +990 * @param dependencies the list of dependencies to serialize +991 */ +992protectedvoid writeDataFile(MavenProject mp, File writeTo, List<Dependency> dependencies) { +993 File file; +994//check to see if this was already written out +995if (mp.getContextValue(this.getDataFileContextKey()) == null) { +996if (writeTo == null) { +997 file = new File(mp.getBuild().getDirectory()); +998 file = new File(file, dataFileName); +999 } else { +1000 file = new File(writeTo, dataFileName); +1001 } +1002final File parent = file.getParentFile(); +1003if (!parent.isDirectory() && parent.mkdirs()) { +1004 getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.", +1005 parent.getAbsolutePath())); +1006 } +1007 +1008 ObjectOutputStream out = null; +1009try { +1010if (dependencies != null) { +1011 out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file))); +1012 out.writeObject(dependencies); +1013 } +1014if (getLog().isDebugEnabled()) { +1015 getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s", +1016 file.getAbsolutePath(), mp.getName(), this.getDataFileContextKey())); +1017 } +1018 mp.setContextValue(this.getDataFileContextKey(), file.getAbsolutePath()); +1019 } catch (IOException ex) { +1020 getLog().warn("Unable to create data file used for report aggregation; " +1021 + "if report aggregation is being used the results may be incomplete."); +1022if (getLog().isDebugEnabled()) { +1023 getLog().debug(ex.getMessage(), ex); +1024 } +1025 } finally { +1026if (out != null) { +1027try { +1028 out.close(); +1029 } catch (IOException ex) { +1030if (getLog().isDebugEnabled()) { +1031 getLog().debug("ignore", ex); +1032 } +1033 } +1034 } +1035 } +1036 } +1037 } +1038 +1039/** +1040 * Reads the serialized scan data from disk. This is used to serialize the scan data between the "check" and "aggregate" +1041 * phase. +1042 * +1043 * @param project the Maven project to read the data file from +1044 * @return a <code>Engine</code> object populated with dependencies if the serialized data file exists; otherwise +1045 * <code>null</code> is returned +1046 */ +1047protected List<Dependency> readDataFile(MavenProject project) { +1048final Object oPath = project.getContextValue(this.getDataFileContextKey()); +1049if (oPath == null) { +1050returnnull; +1051 } +1052 List<Dependency> ret = null; +1053final String path = (String) oPath; +1054//ObjectInputStream ois = null; +1055ExpectedOjectInputStream ois = null; +1056try { +1057//ois = new ObjectInputStream(new FileInputStream(path)); +1058 ois = newExpectedOjectInputStream(new FileInputStream(path), +1059"java.util.ArrayList", +1060"java.util.HashSet", +1061"java.util.TreeSet", +1062"java.lang.AbstractSet", +1063"java.lang.AbstractCollection", +1064"java.lang.Enum", +1065"org.owasp.dependencycheck.dependency.Confidence", +1066"org.owasp.dependencycheck.dependency.Dependency", +1067"org.owasp.dependencycheck.dependency.Evidence", +1068"org.owasp.dependencycheck.dependency.EvidenceCollection", +1069"org.owasp.dependencycheck.dependency.Identifier", +1070"org.owasp.dependencycheck.dependency.Reference", +1071"org.owasp.dependencycheck.dependency.Vulnerability", +1072"org.owasp.dependencycheck.dependency.VulnerabilityComparator", +1073"org.owasp.dependencycheck.dependency.VulnerableSoftware", +1074"org.owasp.dependencycheck.data.cpe.IndexEntry"); +1075 ret = (List<Dependency>) ois.readObject(); +1076 } catch (FileNotFoundException ex) { +1077//TODO fix logging +1078 getLog().error("", ex); +1079 } catch (IOException ex) { +1080 getLog().error("", ex); +1081 } catch (ClassNotFoundException ex) { +1082 getLog().error("", ex); +1083 } finally { +1084if (ois != null) { +1085try { +1086 ois.close(); +1087 } catch (IOException ex) { +1088 getLog().error("", ex); +1089 } +1090 } +1091 } +1092return ret; +1093 } +1094//</editor-fold> +1095 }
    diff --git a/xref/org/owasp/dependencycheck/maven/package-frame.html b/xref/org/owasp/dependencycheck/maven/package-frame.html index c23e9e41d..f4ce4dacd 100644 --- a/xref/org/owasp/dependencycheck/maven/package-frame.html +++ b/xref/org/owasp/dependencycheck/maven/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.maven diff --git a/xref/org/owasp/dependencycheck/maven/package-summary.html b/xref/org/owasp/dependencycheck/maven/package-summary.html index 10f3d8e7b..8d3b0c9b1 100644 --- a/xref/org/owasp/dependencycheck/maven/package-summary.html +++ b/xref/org/owasp/dependencycheck/maven/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.maven + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.maven diff --git a/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html b/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html index 6e985d141..13a390452 100644 --- a/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html +++ b/xref/org/owasp/dependencycheck/maven/slf4j/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.maven.slf4j + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.maven.slf4j diff --git a/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html b/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html index 739bd9e17..3942a2a79 100644 --- a/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html +++ b/xref/org/owasp/dependencycheck/maven/slf4j/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.maven.slf4j + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.maven.slf4j diff --git a/xref/org/owasp/dependencycheck/package-frame.html b/xref/org/owasp/dependencycheck/package-frame.html index 5f809b84a..a783f5851 100644 --- a/xref/org/owasp/dependencycheck/package-frame.html +++ b/xref/org/owasp/dependencycheck/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/xref/org/owasp/dependencycheck/package-summary.html b/xref/org/owasp/dependencycheck/package-summary.html index e202c1be6..b39db5579 100644 --- a/xref/org/owasp/dependencycheck/package-summary.html +++ b/xref/org/owasp/dependencycheck/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck diff --git a/xref/org/owasp/dependencycheck/reporting/package-frame.html b/xref/org/owasp/dependencycheck/reporting/package-frame.html index 47314c729..a980a0f5a 100644 --- a/xref/org/owasp/dependencycheck/reporting/package-frame.html +++ b/xref/org/owasp/dependencycheck/reporting/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/xref/org/owasp/dependencycheck/reporting/package-summary.html b/xref/org/owasp/dependencycheck/reporting/package-summary.html index 5445acccc..52d01d8c2 100644 --- a/xref/org/owasp/dependencycheck/reporting/package-summary.html +++ b/xref/org/owasp/dependencycheck/reporting/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.reporting + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.reporting diff --git a/xref/org/owasp/dependencycheck/suppression/package-frame.html b/xref/org/owasp/dependencycheck/suppression/package-frame.html index c5980bac4..cca0fda9b 100644 --- a/xref/org/owasp/dependencycheck/suppression/package-frame.html +++ b/xref/org/owasp/dependencycheck/suppression/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/xref/org/owasp/dependencycheck/suppression/package-summary.html b/xref/org/owasp/dependencycheck/suppression/package-summary.html index b31c68faa..09facf3fd 100644 --- a/xref/org/owasp/dependencycheck/suppression/package-summary.html +++ b/xref/org/owasp/dependencycheck/suppression/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.suppression + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.suppression diff --git a/xref/org/owasp/dependencycheck/taskdefs/package-frame.html b/xref/org/owasp/dependencycheck/taskdefs/package-frame.html index c2b575eef..5cb816c61 100644 --- a/xref/org/owasp/dependencycheck/taskdefs/package-frame.html +++ b/xref/org/owasp/dependencycheck/taskdefs/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/xref/org/owasp/dependencycheck/taskdefs/package-summary.html b/xref/org/owasp/dependencycheck/taskdefs/package-summary.html index a25b3a0d3..a9663c932 100644 --- a/xref/org/owasp/dependencycheck/taskdefs/package-summary.html +++ b/xref/org/owasp/dependencycheck/taskdefs/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.taskdefs + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.taskdefs diff --git a/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html b/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html index 1c13c32ad..f51e1a679 100644 --- a/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html +++ b/xref/org/owasp/dependencycheck/utils/ExpectedOjectInputStream.html @@ -71,7 +71,7 @@ 63 @Override 64protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { 65if (!this.expected.contains(desc.getName())) { -66thrownew InvalidClassException("Unexpected deserialization", desc.getName()); +66thrownew InvalidClassException("Unexpected deserialization ", desc.getName()); 67 } 68returnsuper.resolveClass(desc); 69 } diff --git a/xref/org/owasp/dependencycheck/utils/Settings.html b/xref/org/owasp/dependencycheck/utils/Settings.html index 77f40dc32..7d94000a1 100644 --- a/xref/org/owasp/dependencycheck/utils/Settings.html +++ b/xref/org/owasp/dependencycheck/utils/Settings.html @@ -751,112 +751,114 @@ 743try { 744 value = Integer.parseInt(Settings.getString(key)); 745 } catch (NumberFormatException ex) { -746 LOGGER.trace("Could not convert property '{}' to an int.", key, ex); -747 value = defaultValue; -748 } -749return value; -750 } -751 -752/** -753 * Returns a long value from the properties file. If the value was specified as a system property or passed in via the -754 * -Dprop=value argument - this method will return the value from the system properties before the values in the contained -755 * configuration file. -756 * -757 * @param key the key to lookup within the properties file -758 * @return the property from the properties file -759 * @throws InvalidSettingException is thrown if there is an error retrieving the setting -760 */ -761publicstaticlong getLong(String key) throws InvalidSettingException { -762try { -763return Long.parseLong(Settings.getString(key)); -764 } catch (NumberFormatException ex) { -765thrownewInvalidSettingException("Could not convert property '" + key + "' to a long.", ex); -766 } -767 } -768 -769/** -770 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the -771 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the -772 * contained configuration file. -773 * -774 * @param key the key to lookup within the properties file -775 * @return the property from the properties file -776 * @throws InvalidSettingException is thrown if there is an error retrieving the setting -777 */ -778publicstaticboolean getBoolean(String key) throws InvalidSettingException { -779return Boolean.parseBoolean(Settings.getString(key)); -780 } -781 -782/** -783 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the -784 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the -785 * contained configuration file. -786 * -787 * @param key the key to lookup within the properties file -788 * @param defaultValue the default value to return if the setting does not exist -789 * @return the property from the properties file -790 * @throws InvalidSettingException is thrown if there is an error retrieving the setting -791 */ -792publicstaticboolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException { -793return Boolean.parseBoolean(Settings.getString(key, Boolean.toString(defaultValue))); -794 } -795 -796/** -797 * Returns a connection string from the configured properties. If the connection string contains a %s, this method will -798 * determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not -799 * exists it will be created. -800 * -801 * @param connectionStringKey the property file key for the connection string -802 * @param dbFileNameKey the settings key for the db filename -803 * @return the connection string -804 * @throws IOException thrown the data directory cannot be created -805 * @throws InvalidSettingException thrown if there is an invalid setting -806 */ -807publicstatic String getConnectionString(String connectionStringKey, String dbFileNameKey) -808throws IOException, InvalidSettingException { -809final String connStr = Settings.getString(connectionStringKey); -810if (connStr == null) { -811final String msg = String.format("Invalid properties file; %s is missing.", connectionStringKey); -812thrownewInvalidSettingException(msg); -813 } -814if (connStr.contains("%s")) { -815final File directory = getDataDirectory(); -816 String fileName = null; -817if (dbFileNameKey != null) { -818 fileName = Settings.getString(dbFileNameKey); -819 } -820if (fileName == null) { -821final String msg = String.format("Invalid properties file to get a file based connection string; '%s' must be defined.", -822 dbFileNameKey); -823thrownewInvalidSettingException(msg); -824 } -825if (connStr.startsWith("jdbc:h2:file:") && fileName.endsWith(".h2.db")) { -826 fileName = fileName.substring(0, fileName.length() - 6); -827 } -828// yes, for H2 this path won't actually exists - but this is sufficient to get the value needed -829final File dbFile = new File(directory, fileName); -830final String cString = String.format(connStr, dbFile.getCanonicalPath()); -831 LOGGER.debug("Connection String: '{}'", cString); -832return cString; -833 } -834return connStr; -835 } -836 -837/** -838 * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the -839 * embedded H2 database. This is public solely for some unit tests; otherwise this should be private. -840 * -841 * @return the data directory to store data files -842 * @throws IOException is thrown if an IOException occurs of course... -843 */ -844publicstatic File getDataDirectory() throws IOException { -845final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY); -846if (path.exists() || path.mkdirs()) { -847return path; -848 } -849thrownew IOException(String.format("Unable to create the data directory '%s'", path.getAbsolutePath())); -850 } -851 } +746if (!Settings.getString(key, "").isEmpty()) { +747 LOGGER.debug("Could not convert property '{}={}' to an int; using {} instead.", key, Settings.getString(key), defaultValue); +748 } +749 value = defaultValue; +750 } +751return value; +752 } +753 +754/** +755 * Returns a long value from the properties file. If the value was specified as a system property or passed in via the +756 * -Dprop=value argument - this method will return the value from the system properties before the values in the contained +757 * configuration file. +758 * +759 * @param key the key to lookup within the properties file +760 * @return the property from the properties file +761 * @throws InvalidSettingException is thrown if there is an error retrieving the setting +762 */ +763publicstaticlong getLong(String key) throws InvalidSettingException { +764try { +765return Long.parseLong(Settings.getString(key)); +766 } catch (NumberFormatException ex) { +767thrownewInvalidSettingException("Could not convert property '" + key + "' to a long.", ex); +768 } +769 } +770 +771/** +772 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the +773 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the +774 * contained configuration file. +775 * +776 * @param key the key to lookup within the properties file +777 * @return the property from the properties file +778 * @throws InvalidSettingException is thrown if there is an error retrieving the setting +779 */ +780publicstaticboolean getBoolean(String key) throws InvalidSettingException { +781return Boolean.parseBoolean(Settings.getString(key)); +782 } +783 +784/** +785 * Returns a boolean value from the properties file. If the value was specified as a system property or passed in via the +786 * <code>-Dprop=value</code> argument this method will return the value from the system properties before the values in the +787 * contained configuration file. +788 * +789 * @param key the key to lookup within the properties file +790 * @param defaultValue the default value to return if the setting does not exist +791 * @return the property from the properties file +792 * @throws InvalidSettingException is thrown if there is an error retrieving the setting +793 */ +794publicstaticboolean getBoolean(String key, boolean defaultValue) throws InvalidSettingException { +795return Boolean.parseBoolean(Settings.getString(key, Boolean.toString(defaultValue))); +796 } +797 +798/** +799 * Returns a connection string from the configured properties. If the connection string contains a %s, this method will +800 * determine the 'data' directory and replace the %s with the path to the data directory. If the data directory does not +801 * exists it will be created. +802 * +803 * @param connectionStringKey the property file key for the connection string +804 * @param dbFileNameKey the settings key for the db filename +805 * @return the connection string +806 * @throws IOException thrown the data directory cannot be created +807 * @throws InvalidSettingException thrown if there is an invalid setting +808 */ +809publicstatic String getConnectionString(String connectionStringKey, String dbFileNameKey) +810throws IOException, InvalidSettingException { +811final String connStr = Settings.getString(connectionStringKey); +812if (connStr == null) { +813final String msg = String.format("Invalid properties file; %s is missing.", connectionStringKey); +814thrownewInvalidSettingException(msg); +815 } +816if (connStr.contains("%s")) { +817final File directory = getDataDirectory(); +818 String fileName = null; +819if (dbFileNameKey != null) { +820 fileName = Settings.getString(dbFileNameKey); +821 } +822if (fileName == null) { +823final String msg = String.format("Invalid properties file to get a file based connection string; '%s' must be defined.", +824 dbFileNameKey); +825thrownewInvalidSettingException(msg); +826 } +827if (connStr.startsWith("jdbc:h2:file:") && fileName.endsWith(".h2.db")) { +828 fileName = fileName.substring(0, fileName.length() - 6); +829 } +830// yes, for H2 this path won't actually exists - but this is sufficient to get the value needed +831final File dbFile = new File(directory, fileName); +832final String cString = String.format(connStr, dbFile.getCanonicalPath()); +833 LOGGER.debug("Connection String: '{}'", cString); +834return cString; +835 } +836return connStr; +837 } +838 +839/** +840 * Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory for the +841 * embedded H2 database. This is public solely for some unit tests; otherwise this should be private. +842 * +843 * @return the data directory to store data files +844 * @throws IOException is thrown if an IOException occurs of course... +845 */ +846publicstatic File getDataDirectory() throws IOException { +847final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY); +848if (path.exists() || path.mkdirs()) { +849return path; +850 } +851thrownew IOException(String.format("Unable to create the data directory '%s'", path.getAbsolutePath())); +852 } +853 }
    diff --git a/xref/org/owasp/dependencycheck/utils/package-frame.html b/xref/org/owasp/dependencycheck/utils/package-frame.html index 4482ec09e..c3264f5c8 100644 --- a/xref/org/owasp/dependencycheck/utils/package-frame.html +++ b/xref/org/owasp/dependencycheck/utils/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/xref/org/owasp/dependencycheck/utils/package-summary.html b/xref/org/owasp/dependencycheck/utils/package-summary.html index e4fba4e68..aac4e26f0 100644 --- a/xref/org/owasp/dependencycheck/utils/package-summary.html +++ b/xref/org/owasp/dependencycheck/utils/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.utils + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.utils diff --git a/xref/org/owasp/dependencycheck/xml/pom/package-frame.html b/xref/org/owasp/dependencycheck/xml/pom/package-frame.html index c9c899559..3b567ed70 100644 --- a/xref/org/owasp/dependencycheck/xml/pom/package-frame.html +++ b/xref/org/owasp/dependencycheck/xml/pom/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/xref/org/owasp/dependencycheck/xml/pom/package-summary.html b/xref/org/owasp/dependencycheck/xml/pom/package-summary.html index 384e3599a..254c8f47a 100644 --- a/xref/org/owasp/dependencycheck/xml/pom/package-summary.html +++ b/xref/org/owasp/dependencycheck/xml/pom/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.owasp.dependencycheck.xml.pom + Dependency-Check 1.3.6 Reference Package org.owasp.dependencycheck.xml.pom diff --git a/xref/org/slf4j/impl/package-frame.html b/xref/org/slf4j/impl/package-frame.html index 541feba12..ddd65e884 100644 --- a/xref/org/slf4j/impl/package-frame.html +++ b/xref/org/slf4j/impl/package-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.slf4j.impl + Dependency-Check 1.3.6 Reference Package org.slf4j.impl diff --git a/xref/org/slf4j/impl/package-summary.html b/xref/org/slf4j/impl/package-summary.html index 62164367e..c5011a184 100644 --- a/xref/org/slf4j/impl/package-summary.html +++ b/xref/org/slf4j/impl/package-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference Package org.slf4j.impl + Dependency-Check 1.3.6 Reference Package org.slf4j.impl diff --git a/xref/overview-frame.html b/xref/overview-frame.html index 8f99e6d6c..e2016d3c0 100644 --- a/xref/overview-frame.html +++ b/xref/overview-frame.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference + Dependency-Check 1.3.6 Reference diff --git a/xref/overview-summary.html b/xref/overview-summary.html index 9a0bdb812..b416e308c 100644 --- a/xref/overview-summary.html +++ b/xref/overview-summary.html @@ -3,7 +3,7 @@ - Dependency-Check 1.3.5 Reference + Dependency-Check 1.3.6 Reference @@ -24,7 +24,7 @@ -

    Dependency-Check 1.3.5 Reference

    +

    Dependency-Check 1.3.6 Reference