Update B/CB

2025-01-16 06:30:46 +01:00 · 2017-11-20 14:49:40 +00:00 · 2017-11-20 14:49:40 +00:00 · 902eb624bd
commit 902eb624bd
parent 4966489929
3 changed files with 3 additions and 9 deletions
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@ -5,7 +5,7 @@ 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
@@ -0,0 +0,0 @@
@ -157,12 +157,6 @@ 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>
@@ -0,0 +0,0 @@
     <profiles>
         <profile>
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 6198e695966d0552ccf57d3ab6dcae2e19813de4
+Subproject commit ee68fbfb8eff0160810be0f1c1df534258e470f5
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit dccd2763bdc357d2b5f6e9d59729e6ac7e99135f
+Subproject commit 19ed80cef7d8ff85a368bd8459c1d91ef0149f61