Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733)
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740)
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@36ce000 Fix xp reward for baby zombies (#7353)
PaperMC/Paper@5c74af2 Fix NPE for bucket empty result stack being null (#7354)