Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5643)

Upstream has released updates that appear 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:
146a7e4b SPIGOT-5345: Add automatic library support

CraftBukkit Changes:
b1064c69 Remove sisu annotation processor from jar
32e40866 SPIGOT-6189: Persistent data disappears when calling setFacingDirection on an item frame
d189f78b # 827: Trigger vanilla dimension advancements in non-main worlds
5bbb4a65 Add plumbing for automatic library support

Spigot Changes:
9fb885e8 Rebuild patches
This commit is contained in:
Jake Potrebic
2021-05-15 15:52:07 -07:00
committed by GitHub
parent ecbf5a38e5
commit cb896d4710
56 changed files with 228 additions and 232 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 5f3253b9c4a533e746707d602d4a7988519742ef..61b8ee4e3e122dd2671f50ea3b432e4abd4600a2 100644
index 0223e94c1243a58955f858c8bf6d5df4ca8cf0ec..fd663f5471516c3ebbab07c27197e5df48c481e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,33 +2,34 @@
@@ -77,7 +77,7 @@ index 5f3253b9c4a533e746707d602d4a7988519742ef..61b8ee4e3e122dd2671f50ea3b432e4a
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -93,6 +108,7 @@
@@ -112,6 +127,7 @@
</dependencies>
<build>
@@ -85,7 +85,7 @@ index 5f3253b9c4a533e746707d602d4a7988519742ef..61b8ee4e3e122dd2671f50ea3b432e4a
<plugins>
<plugin>
<groupId>net.md-5</groupId>
@@ -111,10 +127,6 @@
@@ -130,10 +146,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
@@ -96,7 +96,7 @@ index 5f3253b9c4a533e746707d602d4a7988519742ef..61b8ee4e3e122dd2671f50ea3b432e4a
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -164,6 +176,7 @@
@@ -183,6 +195,7 @@
</excludes>
</filter>
</filters>