resolved merge conflicts

Former-commit-id: d0ce45a374336184101179b73b6019fb1240b9b3

dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer

@@ -4,5 +4,5 @@ org.owasp.dependencycheck.analyzer.FileNameAnalyzer
 org.owasp.dependencycheck.analyzer.HintAnalyzer
 org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer
 org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer
-org.owasp.dependencycheck.data.cpe.CPEAnalyzer
-org.owasp.dependencycheck.data.nvdcve.NvdCveAnalyzer
+org.owasp.dependencycheck.analyzer.CPEAnalyzer
+org.owasp.dependencycheck.analyzer.NvdCveAnalyzer

dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource

@@ -1 +1 @@
-org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater
+org.owasp.dependencycheck.data.update.DatabaseUpdater

dependency-check-core/src/main/resources/dependencycheck.properties

@@ -23,6 +23,15 @@ cpe.meta.url=http://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-di
 # holds 8 days of updates, we are using 7 just to be safe.
 cve.url.modified.validfordays=7
 
+# The location of the zipped CVE H2 database and CPE Lucene index. If specified and
+# a full download of data is required this URL will be used and the data extracted
+# into the specified "data" directory. Additionally, after pulling the data the
+# system will attempt to update the modified. Thus, if one were maintaining an
+# internal copy of the data one would not need to update it nightly.
+# If the 'modified' URLs below for the CVE are removed and a batch url is provided
+# then if an update is required, the entre zip file will be downloaded.
+#batch.update.url=file:///C:/path/to/data.zip
+
 # the path to the modified nvd cve xml file.
 cve.url-1.2.modified=http://nvd.nist.gov/download/nvdcve-modified.xml
 cve.url-2.0.modified=http://static.nvd.nist.gov/feeds/xml/cve/nvdcve-2.0-modified.xml