From ac2231f0f3eb07125f530601fa6a8fa968a9dffb Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Wed, 9 Apr 2014 06:40:25 -0400 Subject: [PATCH] updated connection string to use FILE_LOCK=SERIALIZED instead of AUTO_SERVER=TRUE Former-commit-id: bf8d148e01da607545af39bcfeb19d00d20091c5 --- .../src/main/resources/dependencycheck.properties | 4 +++- .../src/test/resources/dependencycheck.properties | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/main/resources/dependencycheck.properties b/dependency-check-core/src/main/resources/dependencycheck.properties index c80501203..19cfb9d6c 100644 --- a/dependency-check-core/src/main/resources/dependencycheck.properties +++ b/dependency-check-core/src/main/resources/dependencycheck.properties @@ -13,8 +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;AUTO_SERVER=TRUE;AUTOCOMMIT=ON; +data.connection_string=jdbc:h2:file:%s;FILE_LOCK=SERIALIZED;AUTOCOMMIT=ON; +#data.connection_string=jdbc:h2:file:%s;AUTO_SERVER=TRUE;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. # As such, this unsecure username/password exist. data.user=dcuser diff --git a/dependency-check-core/src/test/resources/dependencycheck.properties b/dependency-check-core/src/test/resources/dependencycheck.properties index de8e116ff..70e0d45ab 100644 --- a/dependency-check-core/src/test/resources/dependencycheck.properties +++ b/dependency-check-core/src/test/resources/dependencycheck.properties @@ -13,8 +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;AUTO_SERVER=TRUE;AUTOCOMMIT=ON; +data.connection_string=jdbc:h2:file:%s;FILE_LOCK=SERIALIZED;AUTOCOMMIT=ON; +#data.connection_string=jdbc:h2:file:%s;AUTO_SERVER=TRUE;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. # As such, this unsecure username/password exist. data.user=dcuser