Fix dependency tree
Merge branch 'dependency-fixes' of https://github.com/ams2990/HikariCP into ams2990-dependency-fixes