twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (CraftBukkit) (#5652)

Browse Source 
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 Jahnke
2021-05-16 18:35:49 +02:00
parent cb64e33c20
commit a47ab2dc89
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Spigot-Server-Patches/POM-Changes.patch
View File

@@ -115,6 +115,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<!-- 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>
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@@ -130,7 +137,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<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 -->
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -160,8 +167,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <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 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <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

Submodule work/CraftBukkit updated: b1064c69c4...5b0e2d2d60