From 6c5d4f75eea0331eb984c705820fb77a35a598ae Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 20 Nov 2017 14:49:40 +0000
Subject: [PATCH] Update B/CB

---
 Spigot-Server-Patches/0001-POM-Changes.patch | 14 ++++----------
 work/Bukkit                                  |  2 +-
 work/CraftBukkit                             |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 0c9f04a13a..3db7c07cee 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 06a176da194d6079a94bce3a24f95e2228c96be0 Mon Sep 17 00:00:00 2001
+From 5258658fb54ee446f0043988e56a589b2e9ffdae Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 65dd49259..d49a624ec 100644
+index 1278c628e..4abf8dde7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -138,7 +138,7 @@ index 65dd49259..d49a624ec 100644
                                  <relocation>
                                      <pattern>org.bukkit.craftbukkit</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
-@@ -227,23 +219,11 @@
+@@ -227,18 +219,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.7.0</version>
@@ -157,13 +157,7 @@ index 65dd49259..d49a624ec 100644
              </plugin>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-surefire-plugin</artifactId>
--                <version>2.20.1</version>
-+                <version>2.20</version> <!-- Paper - revert due to regression in some environments -->
-                 <configuration>
-                     <workingDirectory>${basedir}/target/test-server</workingDirectory>
-                     <excludes>
-@@ -257,6 +237,11 @@
+@@ -258,6 +238,11 @@
      <profiles>
          <profile>
              <id>development</id>
diff --git a/work/Bukkit b/work/Bukkit
index 6198e69596..ee68fbfb8e 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 6198e695966d0552ccf57d3ab6dcae2e19813de4
+Subproject commit ee68fbfb8eff0160810be0f1c1df534258e470f5
diff --git a/work/CraftBukkit b/work/CraftBukkit
index dccd2763bd..19ed80cef7 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit dccd2763bdc357d2b5f6e9d59729e6ac7e99135f
+Subproject commit 19ed80cef7d8ff85a368bd8459c1d91ef0149f61