Update Netty to 4.1.51
Minecraft's Netty version was severely out of date. There has been numerous security fixes, bug fixes, and likely performance fixes since the version Minecraft uses (4.1.25). This fixes some known issues with "Closed Channel" spam. Fixes #3388
This commit is contained in:
Aikar
parent
64cfcf3e4b
commit
c8055836e8
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
|
|||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf0ab41504 100644
|
||||
index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb61295672b11 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -1,15 +1,14 @@
|
||||
|
|
@ -55,7 +55,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf
|
|||
<version>${project.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
@@ -50,6 +55,12 @@
|
||||
@@ -50,6 +55,17 @@
|
||||
<version>7.3.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
|
@ -64,11 +64,16 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf
|
|||
+ <groupId>co.aikar</groupId>
|
||||
+ <artifactId>cleaner</artifactId>
|
||||
+ <version>1.0-SNAPSHOT</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>io.netty</groupId>
|
||||
+ <artifactId>netty-all</artifactId>
|
||||
+ <version>4.1.51.Final-SNAPSHOT</version>
|
||||
+ </dependency>
|
||||
<!-- deprecated API depend -->
|
||||
<dependency>
|
||||
<groupId>com.googlecode.json-simple</groupId>
|
||||
@@ -106,34 +117,22 @@
|
||||
@@ -106,34 +122,22 @@
|
||||
|
||||
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
||||
<build>
|
||||
|
|
@ -114,7 +119,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf
|
|||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
@@ -143,6 +142,7 @@
|
||||
@@ -143,6 +147,7 @@
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
|
|
@ -122,7 +127,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf
|
|||
<archive>
|
||||
<manifest>
|
||||
<addDefaultEntries>false</addDefaultEntries>
|
||||
@@ -150,8 +150,9 @@
|
||||
@@ -150,8 +155,9 @@
|
||||
<manifestEntries>
|
||||
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
||||
<Implementation-Title>CraftBukkit</Implementation-Title>
|
||||
|
|
@ -134,7 +139,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf
|
|||
<Specification-Title>Bukkit</Specification-Title>
|
||||
<Specification-Version>${api.version}</Specification-Version>
|
||||
<Specification-Vendor>Bukkit Team</Specification-Vendor>
|
||||
@@ -190,6 +191,7 @@
|
||||
@@ -190,6 +196,7 @@
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
|
|
@ -142,7 +147,21 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf
|
|||
<createSourcesJar>${shadeSourcesJar}</createSourcesJar>
|
||||
<filters>
|
||||
<filter>
|
||||
@@ -213,10 +215,11 @@
|
||||
@@ -198,6 +205,13 @@
|
||||
<exclude>com/google/common/**</exclude>
|
||||
<exclude>com/google/gson/**</exclude>
|
||||
<exclude>com/google/thirdparty/**</exclude>
|
||||
+ <!-- paper -->
|
||||
+ <exclude>io/netty/**</exclude>
|
||||
+ <exclude>com/brigadier/**</exclude>
|
||||
+ <exclude>META-INF/MANIFEST.MF</exclude>
|
||||
+ <exclude>com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository</exclude>
|
||||
+ <exclude>com.mojang.datafixers.util.Either</exclude>
|
||||
+ <exclude>org.apache.logging.log4j/**</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
</filters>
|
||||
@@ -213,10 +227,11 @@
|
||||
<pattern>jline</pattern>
|
||||
<shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
|
||||
</relocation>
|
||||
|
|
@ -158,7 +177,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..adf32845001fae7a870f588184c2efaf
|
|||
<relocation>
|
||||
<pattern>org.apache.commons.codec</pattern>
|
||||
<shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
|
||||
@@ -258,10 +261,6 @@
|
||||
@@ -258,10 +273,6 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Other changes:
|
|||
configuration
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index adf32845001fae7a870f588184c2efaf0ab41504..d07ec94d3011eca8b986e45a63d0c6392691b273 100644
|
||||
index aec55b0b78fa47d427652d402cfbb61295672b11..48f5ed765cab101633efdcdd9118fd3cb5f97914 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -44,10 +44,27 @@
|
||||
|
|
@ -54,7 +54,7 @@ index adf32845001fae7a870f588184c2efaf0ab41504..d07ec94d3011eca8b986e45a63d0c639
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
@@ -252,10 +269,18 @@
|
||||
@@ -264,10 +281,18 @@
|
||||
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
<resource>META-INF/services/java.sql.Driver</resource>
|
||||
</transformer>
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
|
|||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 60bf6dd28527f6ffcb59779ec9546030245724ca..1ae57e8ab2681e674f97ef3220c5cbf9143c6a7e 100644
|
||||
index 389fdcf45eb1513bd6f7f1f0974ace6c00976c2c..84c54a32af54f8460da3257f4423dfcee558e171 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -128,6 +128,13 @@
|
||||
@@ -133,6 +133,13 @@
|
||||
<version>1.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
|
|
|||
Loading…
Reference in New Issue