This commit also upgrades Groovy version to v2.5.10 which is required to build correctly against Java 14 Resolves #3685