From 750d0459f426d68ab7a0cffd0e38cf20faf2524b Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 24 Aug 2013 19:56:13 -0400 Subject: [PATCH] updated database schema version so the fix to the lucene index is enforced on clients Former-commit-id: cc27b0fa533e71b3d6b0a4a3e59b88347fda07d5 --- .../owasp/dependencycheck/data/nvdcve/CveDB.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java index 82ccce2e8..df8299bdf 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java @@ -58,7 +58,7 @@ public class CveDB { /** * The version of the current DB Schema. */ - public static final String DB_SCHEMA_VERSION = "2.5"; + public static final String DB_SCHEMA_VERSION = "2.6"; /** * Database connection */ @@ -162,16 +162,6 @@ public class CveDB { value = "DMI_EMPTY_DB_PASSWORD", justification = "Yes, I know... Blank password.") public void open() throws IOException, SQLException, DatabaseException, ClassNotFoundException { - /* - * TODO - make it so we can exteralize the database (lucene index is a problem), could I store it as a blob - * and just download it when needed? - */ -// String dbDriver = Settings.getString(Settings.KEYS.DB_DRIVER); -// String dbConnStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING); -// if (dbDriver != null && dbConnStr != null) { -// Class.forName(dbDriver); -// conn = DriverManager.getConnection(dbConnStr); -// } else { //use the embeded version final String fileName = CveDB.getDataDirectory().getCanonicalPath(); final File f = new File(fileName, "cve." + DB_SCHEMA_VERSION); final File check = new File(f.getAbsolutePath() + ".h2.db"); @@ -182,7 +172,6 @@ public class CveDB { if (createTables) { createTables(); } -// } } /**