From 99c1d9da6dc158d042bfb1d627fead58622d0069 Mon Sep 17 00:00:00 2001
From: Nassim <jahnke.nassim@gmail.com>
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/0001-POM-Changes.patch | 19 +++++++++++++------
 work/CraftBukkit                             |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 0d313682a..fd56507f9 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f447ebabaa 100644
+index 3fc047371e8f8a626e69697fad549d689c5dce89..a5d87d22cb1588d15e08da3b37e51c5e261c7799 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -97,7 +97,7 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
          </dependency>
          <dependency>
              <groupId>org.ow2.asm</groupId>
-@@ -64,6 +78,17 @@
+@@ -64,12 +78,23 @@
              <version>9.1</version>
              <scope>compile</scope>
          </dependency>
@@ -115,6 +115,13 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
          <!-- 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>
 @@ -80,7 +105,7 @@
          <dependency>
              <groupId>mysql</groupId>
@@ -130,7 +137,7 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
              <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 -->
 @@ -132,34 +157,22 @@
@@ -160,8 +167,7 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
 -                            <descriptionProperty>spigot.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
-+                        <phase>compile</phase>
-                         <goals>
+-                        <goals>
 -                            <goal>describe</goal>
 -                        </goals>
 -                    </execution>
@@ -173,7 +179,8 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
 -                            <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 b1064c69c..5b0e2d2d6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b1064c69c444b9447a65ad36b6cff39d9e052263
+Subproject commit 5b0e2d2d60fef96b2a0b2c4fb39a58489ecb7596