groovy: update from 1.7.1 to 2.3.6 and adopt it