Merge "Update Maven plugins"