From e86324fe119bbcfaea794b79a1c47a1b014eb469 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Jul 2020 00:52:14 -0400
Subject: [PATCH] [Auto] Updated Upstream (Bukkit/Spigot)

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
---
 work/Bukkit | 2 +-
 work/Spigot | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/Bukkit b/work/Bukkit
index a3e2232545..2971d6fd5d 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit a3e223254511014327bf59c76e71b7dfe3b4b850
+Subproject commit 2971d6fd5db7ac9e9f5126295b278c027bac4145
diff --git a/work/Spigot b/work/Spigot
index ccb012a27a..8918ad0f3e 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit ccb012a27ac070ee5e2f924743bbbd8d29931e93
+Subproject commit 8918ad0f3ef4002d099b2465dc0d6bbb20891e5a