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:
79f6ba25 Skip tests on default builds
b85cc32f Further discourage World.regenerateChunk

CraftBukkit Changes:
7560d3b5 Skip tests on default builds
d0a9130d SPIGOT-4563: Fix regenerating chunks saved to disk already

Spigot Changes:
8173d06f Remove need for redundant second clone of repositories
8ede0393 Rebuild patches
This commit is contained in:
Shane Freeder 2019-01-04 19:19:36 +00:00
parent ccbeb5c4ed
commit b9badbf2bc
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
36 changed files with 192 additions and 220 deletions

View file

@ -1,14 +1,14 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 30eff11643ca14a7af5de155c42d30dff1f5a1bf 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 7ac07ac07ac0..7ac07ac07ac0 100644
index ebcc781c..229fe559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,37 +3,36 @@
@@ -3,38 +3,37 @@
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>
@ -31,8 +31,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
- <skipTests>true</skipTests>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
+ <!-- Paper - #Logic -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
@ -62,7 +64,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
</repositories>
<pluginRepositories>
@@ -56,6 +55,13 @@
@@ -57,6 +56,13 @@
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
@ -76,7 +78,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -100,15 +106,12 @@
@@ -101,15 +107,12 @@
</dependencies>
<build>
@ -93,7 +95,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -143,40 +146,11 @@
@@ -144,6 +147,7 @@
</execution>
</executions>
<configuration>
@ -101,40 +103,6 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>development</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.17</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
--
2.19.1
2.20.1