Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
2971d6fd Switch to annotations-java5 to fix duplicate annotations in docs
Spigot Changes:
8918ad0f Rebuild patches
d6921d6a5f