core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (CraftBukkit) (#5652) 

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

CraftBukkit Changes:
5b0e2d2d Move additional dependencies to runtime scope
This commit is contained in:
Nassim 2021-05-16 18:35:49 +02:00 committed by GitHub
parent 2d50c17e2d
commit 99c1d9da6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Spigot-Server-Patches/0001-POM-Changes.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f447ebabaa 100644 index 3fc047371e8f8a626e69697fad549d689c5dce89..a5d87d22cb1588d15e08da3b37e51c5e261c7799 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
@ -97,7 +97,7 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
@@ -64,6 +78,17 @@ @@ -64,12 +78,23 @@
<version>9.1</version> <version>9.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -115,6 +115,13 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
<!-- deprecated API depend --> <!-- deprecated API depend -->
<dependency> <dependency>
<groupId>com.googlecode.json-simple</groupId> <groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
- <scope>runtime</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
@@ -80,7 +105,7 @@ @@ -80,7 +105,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@ -130,7 +137,7 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.8.1</version> - <version>2.8.1</version>
+ <!--<version>2.8.1</version>--> <!--handled by bom--> + <!--<version>2.8.1</version>--> <!--handled by bom-->
<scope>compile</scope> <scope>runtime</scope>
<exclusions> <exclusions>
<!-- included in minecraft-server --> <!-- included in minecraft-server -->
@@ -132,34 +157,22 @@ @@ -132,34 +157,22 @@
@ -160,8 +167,7 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
- <descriptionProperty>spigot.desc</descriptionProperty> - <descriptionProperty>spigot.desc</descriptionProperty>
- </configuration> - </configuration>
- <phase>initialize</phase> - <phase>initialize</phase>
+ <phase>compile</phase> - <goals>
<goals>
- <goal>describe</goal> - <goal>describe</goal>
- </goals> - </goals>
- </execution> - </execution>
@ -173,7 +179,8 @@ index 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f4
- <descriptionProperty>craftbukkit.desc</descriptionProperty> - <descriptionProperty>craftbukkit.desc</descriptionProperty>
- </configuration> - </configuration>
- <phase>initialize</phase> - <phase>initialize</phase>
- <goals> + <phase>compile</phase>
<goals>
- <goal>describe</goal> - <goal>describe</goal>
+ <goal>gitdescribe</goal> + <goal>gitdescribe</goal>
</goals> </goals>

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit b1064c69c444b9447a65ad36b6cff39d9e052263 Subproject commit 5b0e2d2d60fef96b2a0b2c4fb39a58489ecb7596