From a47ab2dc893701b09fb14f2efc4fecdc3fb9bec1 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sun, 16 May 2021 18:35:49 +0200
Subject: [PATCH] Updated Upstream (CraftBukkit) (#5652)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
5b0e2d2d Move additional dependencies to runtime scope
---
 Spigot-Server-Patches/POM-Changes.patch | 15 +++++++++++----
 work/CraftBukkit                        |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index d484f76ec2..59dfc305ee 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -115,6 +115,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          <!-- deprecated API depend -->
          <dependency>
              <groupId>com.googlecode.json-simple</groupId>
+             <artifactId>json-simple</artifactId>
+             <version>1.1.1</version>
+-            <scope>runtime</scope>
++            <scope>compile</scope>
+         </dependency>
+         <dependency>
+             <groupId>org.xerial</groupId>
 @@ -0,0 +0,0 @@
          <dependency>
              <groupId>mysql</groupId>
@@ -130,7 +137,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              <artifactId>log4j-slf4j-impl</artifactId>
 -            <version>2.8.1</version>
 +            <!--<version>2.8.1</version>--> <!--handled by bom-->
-             <scope>compile</scope>
+             <scope>runtime</scope>
              <exclusions>
                  <!-- included in minecraft-server -->
 @@ -0,0 +0,0 @@
@@ -160,8 +167,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <descriptionProperty>spigot.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
-+                        <phase>compile</phase>
-                         <goals>
+-                        <goals>
 -                            <goal>describe</goal>
 -                        </goals>
 -                    </execution>
@@ -173,7 +179,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
--                        <goals>
++                        <phase>compile</phase>
+                         <goals>
 -                            <goal>describe</goal>
 +                            <goal>gitdescribe</goal>
                          </goals>
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b1064c69c4..5b0e2d2d60 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b1064c69c444b9447a65ad36b6cff39d9e052263
+Subproject commit 5b0e2d2d60fef96b2a0b2c4fb39a58489ecb7596