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
This commit is contained in:
Shane Freeder 2019-06-25 14:55:44 +01:00
parent 269e1e95d9
commit 304244232f
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
40 changed files with 144 additions and 143 deletions

View file

@ -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>