OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix netty version to 50 and restore epoll native support

Browse source 
Accidently used the snapshot, as well as needed to exclude the
existing old 25 build of libnetty so that we load the newer build of
epoll instead.

Thanks to 56738 for the catch.
This commit is contained in:
Aikar 2020-05-24 13:07:53 -04:00
parent 10502558e9
commit ea1a909c80
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb61295672b11 100644 index 9fc92e347f24a0210a9190513e93cba3b6772557..3554314526b3f33ad02df2adfd42d45118d75526 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
@ -68,7 +68,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
+ <dependency> + <dependency>
+ <groupId>io.netty</groupId> + <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId> + <artifactId>netty-all</artifactId>
+ <version>4.1.51.Final-SNAPSHOT</version> + <version>4.1.50.Final</version>
+ </dependency> + </dependency>
<!-- deprecated API depend --> <!-- deprecated API depend -->
<dependency> <dependency>
@ -147,12 +147,13 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
<createSourcesJar>${shadeSourcesJar}</createSourcesJar> <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
<filters> <filters>
<filter> <filter>
@@ -198,6 +205,13 @@ @@ -198,6 +205,14 @@
<exclude>com/google/common/**</exclude> <exclude>com/google/common/**</exclude>
<exclude>com/google/gson/**</exclude> <exclude>com/google/gson/**</exclude>
<exclude>com/google/thirdparty/**</exclude> <exclude>com/google/thirdparty/**</exclude>
+ <!-- paper --> + <!-- paper -->
+ <exclude>io/netty/**</exclude> + <exclude>io/netty/**</exclude>
+ <exclude>META-INF/native/libnetty*</exclude>
+ <exclude>com/brigadier/**</exclude> + <exclude>com/brigadier/**</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude> + <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository</exclude> + <exclude>com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository</exclude>
@ -161,7 +162,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
</excludes> </excludes>
</filter> </filter>
</filters> </filters>
@@ -213,10 +227,11 @@ @@ -213,10 +228,11 @@
<pattern>jline</pattern> <pattern>jline</pattern>
<shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern> <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
</relocation> </relocation>
@ -177,7 +178,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
<relocation> <relocation>
<pattern>org.apache.commons.codec</pattern> <pattern>org.apache.commons.codec</pattern>
<shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern> <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
@@ -258,10 +273,6 @@ @@ -258,10 +274,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.8.1</version>