From f28b566992c64339b916ce54ba10ca77f34dd364 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 19 Jul 2014 07:37:11 -0400 Subject: [PATCH] added data.file_name and data.version Former-commit-id: e692a13a216ec6808e3fd92397fd3c50854cfa56 --- .../src/main/resources/dependencycheck.properties | 5 ++++- .../src/test/resources/dependencycheck.properties | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/resources/dependencycheck.properties b/dependency-check-core/src/main/resources/dependencycheck.properties index 6f67c78ea..0090e0c50 100644 --- a/dependency-check-core/src/main/resources/dependencycheck.properties +++ b/dependency-check-core/src/main/resources/dependencycheck.properties @@ -13,7 +13,10 @@ max.download.threads=3 # will not be used. The data.directory will be resolved and if the connection string # below contains a %s then the data.directory will replace the %s. data.directory=[JAR]/data -data.connection_string=jdbc:h2:file:%s/cve.2.9;FILE_LOCK=SERIALIZED;AUTOCOMMIT=ON; +#if the filename has a %s it will be replaced with the current expected version +data.file_name=cve.%s.h2.db +data.version=2.9 +data.connection_string=jdbc:h2:file:%s;FILE_LOCK=SERIALIZED;AUTOCOMMIT=ON; #data.connection_string=jdbc:mysql://localhost:3306/dependencycheck # user name and password for the database connection. The inherent case is to use H2. diff --git a/dependency-check-core/src/test/resources/dependencycheck.properties b/dependency-check-core/src/test/resources/dependencycheck.properties index f6e3d1f13..f7b0f6f4e 100644 --- a/dependency-check-core/src/test/resources/dependencycheck.properties +++ b/dependency-check-core/src/test/resources/dependencycheck.properties @@ -13,6 +13,11 @@ max.download.threads=3 # will not be used. The data.directory will be resolved and if the connection string # below contains a %s then the data.directory will replace the %s. data.directory=[JAR]/data +# if the filename has a %s it will be replaced with the current expected version. For file +# based databases the below filename will be added to the data directory above and then +# if the connection string has a %s it will be replaced by the directory/filename path. +data.file_name=cve.%s.h2.db +data.version=2.9 data.connection_string=jdbc:h2:file:%s/cve.2.9;FILE_LOCK=SERIALIZED;AUTOCOMMIT=ON; #data.connection_string=jdbc:mysql://localhost:3306/dependencycheck