prepare for 2.1 version of groovy