tweak gradle builds
tweak gradle builds to have gradle src
GROOVY-6690: Upgrade testng to 6.8.8
GROOVY-6553: tidy up no longer needed asm/antlr jars from dist/lib
GROOVY-6691: Cannot extend trait with generic parameter
GROOVY-6691: Reworked fix for GROOVY-6691 without dropping generics information