Updated Upstream (Bukkit/CraftBukkit/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:
aba2aaaf Correct pom.xml version

CraftBukkit Changes:
e8b39d43 SPIGOT-5103: World.save does not save gamerules
3164e531 Correct pom.xml version

Spigot Changes:
595711b0 Correct pom.xml version

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,14 +1,14 @@
-From 614fd245b215d849e362c4d12e258a741ce94292 Mon Sep 17 00:00:00 2001
+From 5517592aa39fa15d51e8e186af82b46219c0223e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 83eb5a39..41708a2b 100644
+index b5532ae6..a85aaa1a 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -2,34 +2,28 @@
+@@ -2,34 +2,29 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,8 @@ index 83eb5a39..41708a2b 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.14.3-SNAPSHOT</version>
+     <version>1.14.3-R0.1-SNAPSHOT</version>
++
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
@@ -53,7 +54,7 @@ index 83eb5a39..41708a2b 100644
      <repositories>
          <!--
              If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-@@ -41,6 +35,10 @@
+@@ -41,6 +36,10 @@
              <id>spigotmc-public</id>
              <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
          </repository>
@@ -64,7 +65,7 @@ index 83eb5a39..41708a2b 100644
      </repositories>
  
      <pluginRepositories>
-@@ -57,6 +55,20 @@
+@@ -57,6 +56,20 @@
              <version>2.6</version>
              <scope>compile</scope>
          </dependency>
@@ -85,7 +86,7 @@ index 83eb5a39..41708a2b 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -113,15 +125,12 @@
+@@ -113,15 +126,12 @@
      </dependencies>
  
      <build>
@@ -102,7 +103,7 @@ index 83eb5a39..41708a2b 100644
                  <dependencies>
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
-@@ -156,6 +165,7 @@
+@@ -156,6 +166,7 @@
                      </execution>
                  </executions>
                  <configuration>

Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch

@@ -1,4 +1,4 @@
-From 4d727d07067bf90febccacc7c46b151e7a4dfc3f Mon Sep 17 00:00:00 2001
+From fa8d0d47698759ed68d4d63544b943369a5fa77c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 1 Apr 2016 00:02:47 -0400
 Subject: [PATCH] Add FastUtil to Bukkit
@@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/pom.xml b/pom.xml
-index 41708a2b..3b650cbc 100644
+index a85aaa1a..e65cbc15 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -49,6 +49,12 @@
+@@ -50,6 +50,12 @@
      </pluginRepositories>
  
      <dependencies>

Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch

@@ -1,4 +1,4 @@
-From 679dc954b994c687b3452e062e561111fefac478 Mon Sep 17 00:00:00 2001
+From 69ce0886b5a5faff5c6f3b0cd144d74e15e26f62 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 3b650cbc..baefc0ff 100644
+index e65cbc15..a1dd0ac2 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -128,6 +128,17 @@
+@@ -129,6 +129,17 @@
              <version>7.1</version>
              <scope>test</scope>
          </dependency>

Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From 69b0848c5c15e72438a938b8eb0c823b21f27129 Mon Sep 17 00:00:00 2001
+From 20af2ff69a3f0159a59f104960b7b769cea9901f Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:12 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index baefc0ff..5dc31841 100644
+index a1dd0ac2..df8fc517 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -109,6 +109,13 @@
+@@ -110,6 +110,13 @@
              <version>17.0.0</version>
              <scope>provided</scope>
          </dependency>