migrated to latest version of Spring Data, tomcat-jdbc and hsqldb