The script which creates branches for a Final/GA release when codefreezing should also bump plugin/feature/component versions in main branch (master or maintenance).
The script should probably have a parameter which tells what segment of the version we want to increment: X.Y.Z