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:
a3e22325 Improve javadocs by adding links to dependency docs
Spigot Changes:
ccb012a2 Improve javadocs by adding links to dependency docs
35348c006b