upgrade to JKD21. Also upgrades groovy deps, as those would no longer build.

upgrade to JKD21. Also upgrades groovy deps, as those would no longer build. #3815