Fix issue importing as Gradle Project on STS
Upgrade common dependencies