Minor modifications for maven plugin integration