update to latest maven plugin
Merge branch '2.3.x' into 2.4.x