Upgraded HSQLDB version to 2.5.x to fix locking issue while applying …

…flyway migration
Jayeshecs · Jan 28, 2020 · 976a5b2 · 976a5b2
1 parent aded5c9
commit 976a5b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/appdefn/src/main/resources/domainapp/appdefn/persistor_datanucleus.properties b/appdefn/src/main/resources/domainapp/appdefn/persistor_datanucleus.properties
@@ -51,6 +51,9 @@ isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateConstraints=true
 isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
 isis.persistor.datanucleus.impl.datanucleus.schema.validateColumns=true
 
+# Automatic baselining
+isis.persistor.datanucleus.impl.flyway.baselineOnMigrate=true
+isis.persistor.datanucleus.impl.flyway.baselineVersion=0.1.0.0
 
 isis.persistor.datanucleus.impl.flyway.schemas=\
         flyway,\

diff --git a/pom.xml b/pom.xml
@@ -40,12 +40,21 @@
 
         <jaxb-impl.version>2.2.11</jaxb-impl.version>
         <jquery-selectors.version>0.2.4</jquery-selectors.version>
+
+        <hsqldb.version>2.5.0</hsqldb.version>
     </properties>
 
     <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
+
+	        <dependency>
+	            <groupId>org.hsqldb</groupId>
+	            <artifactId>hsqldb</artifactId>
+	            <version>${hsqldb.version}</version>
+	        </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>statements-appdefn</artifactId>