Add type arguments to reduce minimum java version to 6 (from 7)

A particular syntax feature has been used which requires Java 7 (all the other major plugins are fine with 6). This is easily avoided - patch to make Java 6 compatible in there.